Skip to content

Commit

Permalink
fixed workflow-editor and missing icon
Browse files Browse the repository at this point in the history
svn path=/ZMS/branches/zms4/; revision=5530
  • Loading branch information
zmsdev committed Apr 7, 2020
1 parent c108546 commit 6cb7261
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Products/zms/zpt/ZMSObject/input_elements.zpt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<div class="dropdown-menu dropdown-menu-right">
<tal:block tal:condition="python:len(here.getObjChildren(metaObjAttr['id'],request))==0">
<a class="dropdown-item" tal:attributes="href python:'manage_initObjChild?id=%s&type=%s&lang=%s&manage_target=%s'%(metaObjAttr['id'],metaObjAttr['type'],request['lang'],request['URL'])">
<i class="fas fa-plus-sign"></i>
<i class="fas fa-plus-square"></i>
<tal:block tal:content="python:here.getZMILangStr('BTN_INSERT')">Insert</tal:block>
</a>
</tal:block>
Expand Down
2 changes: 1 addition & 1 deletion Products/zms/zpt/ZMSObject/input_fields.zpt
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
<div class="zmi-action btn-group dropleft">
<span class="d-none zmi-sort-id" tal:content="python:9990">the sort-id</span>
<button class="btn btn-secondary split-left"></button>
<button class="btn btn-secondary split-right dropdown-toggle" data-toggle="dropdown"><i class="fas fa-plus-sign"></i></button>
<button class="btn btn-secondary split-right dropdown-toggle" data-toggle="dropdown"><i class="fas fa-plus-square"></i></button>
</div><!-- .btn-group -->
</div><!-- .col-sm-10 -->
</li><!-- .zmi-item -->
Expand Down
4 changes: 2 additions & 2 deletions Products/zms/zpt/ZMSSqlDb/input_form.zpt
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
<div class="pull-left">
<div class="btn-group-vertical" tal:on-error="python:'ERROR: %s'%str(metaObjAttr)">
<a class="btn btn-primary btn-sm" href="javascript:;" tal:attributes="onclick python:'$ZMI.iframe(\'%s/manage_zmi_lazy_select_form\',{id:\'%s\',qentity:\'%s\',\'primary_key\':\'%s\',\'qcolumns:list\':\'%s\',\'actions:list\':\'multiselect\'},{iframe:true,height:400,title:getZMILangStr(\'BTN_INSERT\')+\': %s\'})'%(here.absolute_url(),metaObjAttr['id'],metaObjAttr['dst']['fk']['tablename'],str(metaObjAttr['dst']['fk']['fieldname']).replace('\'','\\\''),str(metaObjAttr['dst']['fk']['displayfield']).replace('\'','\\\''),elLabel)"
><i class="fas fa-plus-sign"></i></a>
><i class="fas fa-plus-square"></i></a>
<a class="btn btn-secondary btn-sm" href="javascript:;" tal:attributes="onclick python:'$ZMI.removeFromMultiselect(document.getElementById(\'%s\'))'%elName"
><i class="fas fa-minus-sign"></i></a>
<a class="btn btn-secondary btn-sm" href="javascript:;" tal:attributes="onclick python:'$(\'select#%s option\').prop(\'selected\',true)'%elName"
Expand Down Expand Up @@ -181,7 +181,7 @@
<div class="pull-left">
<label class="control-label">&nbsp;</label>
<div>
<span class="btn btn-primary" tal:attributes="onclick python:'zmiMultimultiselect(\'%s\')'%metaObjAttr['id']"><i class="fas fa-plus-sign"></i></span>
<span class="btn btn-primary" tal:attributes="onclick python:'zmiMultimultiselect(\'%s\')'%metaObjAttr['id']"><i class="fas fa-plus-square"></i></span>
</div>
</div><!-- .pull-left -->
<div class="clearfix"></div><!-- .clearfix -->
Expand Down
2 changes: 1 addition & 1 deletion Products/zms/zpt/common/zmi_ace_editor.zpt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
ob python:options['ob'];
text python:options.get('text');
height python:options.get('height','20em')">
<tal:block tal:condition="python:text is None"><tal:block tal:define="global text python:zopeutil.readObject(here,ob.id())"></tal:block></tal:block>
<tal:block tal:condition="python:text is None"><tal:block tal:define="global text python:zopeutil.readObject(here,ob.getId())"></tal:block></tal:block>
<tal:block tal:condition="python:ob is not None and ob.meta_type in ['Script (Python)']" tal:define="errors python:[x.replace(' ','&nbsp\073') for x in text.split('##') if x.startswith(' ')][1:]">
<div class="alert alert-danger mx-0 alert-dismissible fade show" role="alert" tal:condition="python:len(errors)>0 and errors[0].find('Errors:')>=0" tal:content="structure python:'<br/>'.join(errors)">the errors</div>
<div class="alert alert-warning mx-0 alert-dismissible fade show" role="alert" tal:condition="python:len(errors)>0 and errors[0].find('Warnings:')>=0" tal:content="structure python:'<br/>'.join(errors)">the warnings</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
><span class="zmi-state" tal:condition="python:wfActivity.get('icon_clazz')" tal:attributes="class python:' '.join(['zmi-state']+text_clazz); title title"><i tal:attributes="class python:' '.join(icon_clazz)"></i></span
></tal:block
></tal:block
><span class="zmi-state zmi-state-success" tal:condition="python:'STATE_NEW' in objStates"><i class="fas fa-plus-sign"></i>&nbsp;<tal:block tal:content="python:here.getZMILangStr('STATE_NEW')"></tal:block></span
><span class="zmi-state zmi-state-success" tal:condition="python:'STATE_NEW' in objStates"><i class="fas far-plus-square"></i>&nbsp;<tal:block tal:content="python:here.getZMILangStr('STATE_NEW')"></tal:block></span
><span class="zmi-state zmi-state-info" tal:condition="python:'STATE_MODIFIED' in objStates"><i class="fas fa-pencil-alt"></i>&nbsp;<tal:block tal:content="python:here.getZMILangStr('STATE_MODIFIED')"></tal:block></span
><span class="zmi-state zmi-state-default" tal:condition="python:len(wfStates)>0 and here.isVersionContainer() and here.hasObjModifiedChildren(request)"><i class="fas fa-edit"></i>&nbsp;<tal:block tal:content="python:here.getZMILangStr('STATE_MODIFIED')"></tal:block></span
><span class="zmi-state zmi-state-danger" tal:condition="python:'STATE_DELETED' in objStates"><i class="fas fa-trash"></i>&nbsp;<tal:block tal:content="python:here.getZMILangStr('STATE_DELETED')"></tal:block></span
Expand Down

0 comments on commit 6cb7261

Please sign in to comment.