Skip to content

Commit

Permalink
re-grouping buttons, monotonizing zmi-zpt
Browse files Browse the repository at this point in the history
  • Loading branch information
@drfho
drfho committed Feb 4, 2025
1 parent 3e60d05 commit 7268cfe
Show file tree
Hide file tree
Showing 7 changed files with 121 additions and 124 deletions.
3 changes: 0 additions & 3 deletions Products/zms/plugins/www/zmi.core.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -520,9 +520,6 @@ footer .back-to-top.hide {
margin-top: -2px;
display: inline-block;
}
.btn-group.managing, .btn-group.packaging {
margin-right:0.2rem;
}
.center h1 {
line-height:1.4em;
font-size:x-large;
Expand Down
4 changes: 0 additions & 4 deletions Products/zms/plugins/www/zmi.core.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,6 @@ nav .nav-tabs .nav-link.active {
opacity:0.5;
}

.btn-group.managing, .btn-group.packaging {
margin-right:0.2em;
}

.center h1 {
line-height:1.4em;
font-size:x-large;
Expand Down
162 changes: 83 additions & 79 deletions Products/zms/zpt/ZMS/manage_users.zpt
View file

Large diffs are not rendered by default.

14 changes: 8 additions & 6 deletions Products/zms/zpt/ZMSFormatProvider/manage_charformats.zpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</div><!-- .form-group -->
<div class="form-group row">
<label for="_icon_clazz" class="col-sm-2 control-label mandatory"><span>Icon</span></label>
<div class="col-sm-9"><input type="text" id="_icon_clazz" name="_icon_clazz" class="form-control form-control-sm zmi-input-icon-clazz""/></div>
<div class="col-sm-10"><input type="text" id="_icon_clazz" name="_icon_clazz" class="form-control form-control-sm zmi-input-icon-clazz" placeholder="fas fa-bold" value="fas fa-bold"/></div>
</div><!-- .form-group -->
<div class="form-group row">
<label for="_display" class="col-sm-2 control-label mandatory"><span tal:content="python:here.getZMILangStr('ATTR_DISPLAY')">Display</span></label>
Expand Down Expand Up @@ -130,11 +130,13 @@
</div>
</th>
<th>
<div class="btn-group">
<button class="btn btn-primary" tal:attributes="title python:here.getZMILangStr('BTN_INSERT')+'...'" onclick="zmiModal('#insertObj',{title:$(this).attr('title')});return false"><i class="fas fa-plus"></i></button>
<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_DELETE')+'...'" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'});return false"><i class="fas fa-times"></i></button>
<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_IMPORT')+'...'" onclick="zmiModal($('#importConf'),{title:$(this).attr('title')});return false"><i class="fas fa-upload"></i></button>
<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')+'...'" onclick="zmiExportBtnClick(this);return false"><i class="fas fa-download"></i></button>
<div class="btn-group managing mr-1">
<button type="button" class="btn btn-primary" tal:attributes="title python:here.getZMILangStr('BTN_INSERT')+'...'" onclick="zmiModal('#insertObj',{title:$(this).attr('title')});return false"><i class="fas fa-plus"></i></button>
<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_DELETE')+'...'" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'});return false"><i class="fas fa-times"></i></button>
</div>
<div class="btn-group managing mr-1">
<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_IMPORT')+'...'" onclick="zmiModal($('#importConf'),{title:$(this).attr('title')});return false"><i class="fas fa-upload"></i></button>
<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')+'...'" onclick="zmiExportBtnClick(this);return false"><i class="fas fa-download"></i></button>
</div>
</th>
</tr>
Expand Down
12 changes: 7 additions & 5 deletions Products/zms/zpt/ZMSFormatProvider/manage_textformats.zpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,13 @@
</div>
</th>
<th colspan="2">
<div class="btn-group">
<button class="btn btn-primary" tal:attributes="title python:here.getZMILangStr('BTN_INSERT')+'...'" onclick="zmiModal('#insertObj',{title:$(this).attr('title')});return false"><i class="fas fa-plus"></i></button>
<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_DELETE')+'...'" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'});return false"><i class="fas fa-times"></i></button>
<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_IMPORT')+'...'" onclick="zmiModal('#importConf',{title:$(this).attr('title')});return false"><i class="fas fa-upload"></i></button>
<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')+'...'" onclick="zmiExportBtnClick(this);return false"><i class="fas fa-download"></i></button>
<div class="btn-group managing mr-1">
<button type="button" class="btn btn-primary" tal:attributes="title python:here.getZMILangStr('BTN_INSERT')+'...'" onclick="zmiModal('#insertObj',{title:$(this).attr('title')});return false"><i class="fas fa-plus"></i></button>
<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_DELETE')+'...'" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'});return false"><i class="fas fa-times"></i></button>
</div>
<div class="btn-group managing mr-1">
<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_IMPORT')+'...'" onclick="zmiModal('#importConf',{title:$(this).attr('title')});return false"><i class="fas fa-upload"></i></button>
<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')+'...'" onclick="zmiExportBtnClick(this);return false"><i class="fas fa-download"></i></button>
</div>
</th>
</tr>
Expand Down
20 changes: 9 additions & 11 deletions Products/zms/zpt/ZMSMetacmdProvider/manage_main.zpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,17 +247,15 @@
</div>
</th>
<th colspan="5" class="w-100">
<div class="btn-toolbar" role="toolbar">
<div class="btn-group managing">
<button class="btn btn-primary" tal:attributes="title python:here.getZMILangStr('BTN_INSERT')+'...'" onclick="zmiModal('#insertObj',{title:$(this).attr('title')});return false"><i class="fas fa-plus"></i></button>
<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_DELETE')+'...'" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'});return false"><i class="fas fa-times"></i></button>
</div><!-- .btn-group -->
<div class="btn-group packaging">
<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_ACQUIRE')+'...'" onclick="$ZMI.iframe('manage_main_acquire',{lang:getZMILang()},{iframe:true,height:'600',title:$(this).attr('title')});return false" tal:condition="python:here.getPortalMaster() is not None"><i class="fas fa-share"></i></button>
<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_IMPORT')+'...'" onclick="zmiModal('#importConf',{title:$(this).attr('title')});return false"><i class="fas fa-upload"></i></button>
<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')+'...'" onclick="zmiExportBtnClick(this);return false"><i class="fas fa-download"></i></button>
</div><!-- .btn-group -->
</div><!-- .btn-toolbar -->
<div class="btn-group managing mr-1">
<button type="button" class="btn btn-primary" tal:attributes="title python:here.getZMILangStr('BTN_INSERT')+'...'" onclick="zmiModal('#insertObj',{title:$(this).attr('title')});return false"><i class="fas fa-plus"></i></button>
<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_DELETE')+'...'" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'});return false"><i class="fas fa-times"></i></button>
</div><!-- .btn-group -->
<div class="btn-group managing mr-1">
<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_ACQUIRE')+'...'" onclick="$ZMI.iframe('manage_main_acquire',{lang:getZMILang()},{iframe:true,height:'600',title:$(this).attr('title')});return false" tal:condition="python:here.getPortalMaster() is not None"><i class="fas fa-share"></i></button>
<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_IMPORT')+'...'" onclick="zmiModal('#importConf',{title:$(this).attr('title')});return false"><i class="fas fa-upload"></i></button>
<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')+'...'" onclick="zmiExportBtnClick(this);return false"><i class="fas fa-download"></i></button>
</div><!-- .btn-group -->
</th>
</tr>
<tr>
Expand Down
30 changes: 14 additions & 16 deletions Products/zms/zpt/ZMSMetamodelProvider/manage_main.zpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,21 +516,19 @@
</div>
</th>
<th colspan="2" class="meta-toolbar">
<div class="btn-toolbar" role="toolbar">
<div class="btn-group managing">
<button class="btn btn-primary" tal:attributes="title python:here.getZMILangStr('BTN_INSERT')+'...'" onclick="zmiModal('#insertObj',{title:$(this).attr('title')});return false"><i class="fas fa-plus"></i></button>
<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_DELETE')+'...'" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'});return false"><i class="fas fa-times"></i></button>
</div><!-- .btn-group -->
<div class="btn-group packaging">
<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_ACQUIRE')+'...'" onclick="$ZMI.iframe('manage_main_acquire',{lang:getZMILang()},{iframe:true,height:'600',title:$(this).attr('title')});return false" tal:condition="python:here.getPortalMaster() is not None"><i class="fas fa-share"></i></button>
<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_IMPORT')+'...'" onclick="$ZMI.iframe('manage_main_import',{lang:getZMILang()},{iframe:true,height:'600',title:$(this).attr('title')});return false"><i class="fas fa-upload"></i></button>
<button class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')+'...'" onclick="return zmiExportBtnClick(this);"><i class="fas fa-download"></i></button>
</div><!-- .btn-group -->
<span class="btn-group">
<i class="fas fa-filter tablefilter p-2" onclick="$('#tablefilter').focus().addClass('visited')"></i>
<input id="tablefilter" name="tablefilter" class="form-control" type="text" title="Filter object list by entering a name." />
</span>
</div><!-- .btn-toolbar -->
<div class="btn-group managing mr-1">
<button type="button" class="btn btn-primary" tal:attributes="title python:here.getZMILangStr('BTN_INSERT')+'...'" onclick="zmiModal('#insertObj',{title:$(this).attr('title')});return false"><i class="fas fa-plus"></i></button>
<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_DELETE')+'...'" onclick="zmiDeleteObjBtnClick(this,{btn:'BTN_DELETE',key:'obj'});return false"><i class="fas fa-times"></i></button>
</div><!-- .btn-group -->
<div class="btn-group managing mr-1">
<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_ACQUIRE')+'...'" onclick="$ZMI.iframe('manage_main_acquire',{lang:getZMILang()},{iframe:true,height:'600',title:$(this).attr('title')});return false" tal:condition="python:here.getPortalMaster() is not None"><i class="fas fa-share"></i></button>
<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_IMPORT')+'...'" onclick="$ZMI.iframe('manage_main_import',{lang:getZMILang()},{iframe:true,height:'600',title:$(this).attr('title')});return false"><i class="fas fa-upload"></i></button>
<button type="button" class="btn btn-secondary" tal:attributes="title python:here.getZMILangStr('BTN_EXPORT')+'...'" onclick="return zmiExportBtnClick(this);"><i class="fas fa-download"></i></button>
</div><!-- .btn-group -->
<div class="btn-group filtering">
<i class="fas fa-filter tablefilter p-2" onclick="$('#tablefilter').focus().addClass('visited')"></i>
<input id="tablefilter" name="tablefilter" class="form-control" type="text" title="Filter object list by entering a name." />
</div>
</th>
</tr>
</thead>
Expand Down Expand Up @@ -1058,7 +1056,7 @@
transition: width 0.5s ease-in-out;
}
.zmi .fa-filter.tablefilter {
margin: 0.1rem -2.25rem 0 1.25rem;
margin: 0.1rem -2.25rem 0 0.25rem;
opacity:.3;
cursor:pointer;
}
Expand Down

0 comments on commit 7268cfe

Please sign in to comment.