diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_menu.css | 14 | ||||
| -rw-r--r-- | view/css/mod_mitem.css | 16 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 6 | ||||
| -rwxr-xr-x | view/tpl/field_input.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/menuedit.tpl | 48 | ||||
| -rw-r--r-- | view/tpl/menulist.tpl | 42 | ||||
| -rw-r--r-- | view/tpl/mitemedit.tpl | 61 | ||||
| -rw-r--r-- | view/tpl/mitemlist.tpl | 38 | ||||
| -rw-r--r-- | view/tpl/usermenu.tpl | 2 |
9 files changed, 138 insertions, 93 deletions
diff --git a/view/css/mod_menu.css b/view/css/mod_menu.css index 6123ea56b..930bd834d 100644 --- a/view/css/mod_menu.css +++ b/view/css/mod_menu.css @@ -1,3 +1,11 @@ -#menulist > li { - margin-top: 15px; -}
\ No newline at end of file +#menu-list-table { + width: 100%; +} + +#menu-list-table th:nth-child(2){ + white-space: nowrap; +} + +.menu-list-tool { + padding: 7px 10px; +} diff --git a/view/css/mod_mitem.css b/view/css/mod_mitem.css index 3a33ae955..0718096e9 100644 --- a/view/css/mod_mitem.css +++ b/view/css/mod_mitem.css @@ -1,11 +1,13 @@ -.menu-item-list { - list-style-type: none; +#mitem-list-table { + width: 100%; } -.mitem-edit { - margin-right: 15px; +#mitem-list-table th:nth-child(1), +#mitem-list-table td:nth-child(1){ + padding: 7px 3px 7px 10px; + white-space: nowrap; } -.menu-item-list li { - margin-bottom: 15px; -}
\ No newline at end of file +.mitem-list-tool { + padding: 7px 10px; +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 8c9eddd3b..ece73d213 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1102,8 +1102,6 @@ nav .acpopup { .required { color: #ff0000; - font-size: 1.8rem; - margin-left: 5px; } @@ -1934,7 +1932,9 @@ nav .dropdown-menu { background-color: $item_colour; } -[id^="webpage-list-item-"]:hover td { +[id^="webpage-list-item-"]:hover td, +[id^="menu-list-item-"]:hover td, +[id^="mitem-list-item-"]:hover td { background-color: $item_colour; } diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index 4dfa83699..128bbfbe1 100755 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,6 +1,6 @@ <div class='form-group field input'> - <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> - <input class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} + <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label> + <input class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}> <span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span> <div class="clear"></div> </div> diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index 9ea184269..b3704e86e 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -1,24 +1,28 @@ - -<h2>{{$header}}</h2> - -{{if $menu_id}} -<a href="mitem/{{$menu_id}}" title="{{$hintedit}}">{{$editcontents}}</a> -{{/if}} - -<form id="menuedit" action="menu{{if $menu_id}}/{{$menu_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" > - -{{if $menu_id}} -<input type="hidden" name="menu_id" value="{{$menu_id}}" /> -{{/if}} -{{if $menu_system}} -<input type="hidden" name="menu_system" value="{{$menu_system}}" /> +{{if $header}} +<div class="section-title-wrapper"> + {{if $menu_id}} + <div class="pull-right"> + <a href="mitem/{{$menu_id}}" title="{{$hintedit}}" class="btn btn-xs btn-success"><i class="icon-edit"></i> {{$editcontents}}</a> + </div> + {{/if}} + <h2>{{$header}}</h2> + <div class="clear"></div> +</div> {{/if}} - -{{include file="field_input.tpl" field=$menu_name}} -{{include file="field_input.tpl" field=$menu_desc}} -{{include file="field_checkbox.tpl" field=$menu_bookmark}} -<div class="menuedit-submit-wrapper" > -<input type="submit" name="submit" class="menuedit-submit" value="{{$submit}}" /> +<div id="menu-creator" class="section-content-tools-wrapper" style="display: {{$display}};"> + <form id="menuedit" action="menu{{if $menu_id}}/{{$menu_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" > + {{if $menu_id}} + <input type="hidden" name="menu_id" value="{{$menu_id}}" /> + {{/if}} + {{if $menu_system}} + <input type="hidden" name="menu_system" value="{{$menu_system}}" /> + {{/if}} + {{include file="field_input.tpl" field=$menu_name}} + {{include file="field_input.tpl" field=$menu_desc}} + {{include file="field_checkbox.tpl" field=$menu_bookmark}} + <div class="menuedit-submit-wrapper form-group pull-right" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> + <div class="clear"></div> + </form> </div> - -</form> diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index 679732c0f..1d3d70757 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -1,16 +1,32 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$title}}</h1> -<a href="menu/new{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintnew}}">{{$hintnew}}</a> -<br> +<div class="section-title-wrapper"> + <div class="pull-right"> + <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-creator');"><i class="icon-edit"></i> {{$hintnew}}</button> + </div> + <h2>{{$title}}</h2> + <div class="clear"></div> +</div> + +{{$create}} {{if $menus }} -<ul id="menulist"> -{{foreach $menus as $m }} -<li> -<a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> -<a href="menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintdrop}}"><i class="icon-trash drop-icons design-icons design-remove-icon btn btn-default"></i></a> {{if $m.bookmark}}<i class="icon-bookmark" title="{{$bmark}}" ></i> {{/if}}<a href="mitem/{{$m.menu_id}}/new{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a> -</li> -{{/foreach}} -</ul> +<div id="menulist-content-wrapper" class="section-content-wrapper-np"> + <table id="menu-list-table"> + <tr> + <th width="1%"></th> + <th width="1%">{{$nametitle}}</th> + <th width="96%">{{$desctitle}}</th> + <th width="1%"></th> + <th width="1%"></th> + </tr> + {{foreach $menus as $m }} + <tr id="menu-list-item-{{$m.menu_id}}"> + <td width="1%">{{if $m.bookmark}}<i class="icon-bookmark menu-list-tool" title="{{$bmark}}" ></i>{{/if}}</td> + <td width="1%"><a href="mitem/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td> + <td width="96%">{{$m.menu_desc}}</td> + <td width="1%" class="menu-list-tool"><a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td> + <td width="1%" class="menu-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td> + </tr> + {{/foreach}} + </table> +</div> {{/if}} -</div>
\ No newline at end of file diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index a18fbb0ef..5fb8f0a9e 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -1,32 +1,33 @@ - -<h2>{{$header}}</h2> - -<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}" method="post" > - -<input type="hidden" name="menu_id" value="{{$menu_id}}" /> - -{{if $mitem_id}} -<input type="hidden" name="mitem_id" value="{{$mitem_id}}" /> -{{/if}} - -{{include file="field_input.tpl" field=$mitem_desc}} -{{include file="field_input.tpl" field=$mitem_link}} -{{include file="field_input.tpl" field=$mitem_order}} -{{include file="field_checkbox.tpl" field=$usezid}} -{{include file="field_checkbox.tpl" field=$newwin}} - -<div id="settings-default-perms" class="settings-default-perms" > - <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> - {{$aclselect}} - <div id="settings-default-perms-menu-end"></div> +{{if $header}} +<div class="section-title-wrapper"> + <h2>{{$header}}</h2> </div> -<br/> -<div id="settings-default-perms-end"></div> - - - -<div class="mitemedit-submit-wrapper" > -<input id="dbtn-submit" type="submit" name="submit" class="mitemedit-submit" value="{{$submit}}" /> +{{/if}} +<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};"> + <form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}" method="post" > + + <input type="hidden" name="menu_id" value="{{$menu_id}}" /> + + {{if $mitem_id}} + <input type="hidden" name="mitem_id" value="{{$mitem_id}}" /> + {{/if}} + + {{include file="field_input.tpl" field=$mitem_desc}} + {{include file="field_input.tpl" field=$mitem_link}} + {{include file="field_input.tpl" field=$mitem_order}} + {{include file="field_checkbox.tpl" field=$usezid}} + {{include file="field_checkbox.tpl" field=$newwin}} + + <div id="settings-default-perms" class="settings-default-perms form-group"> + <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> + {{$aclselect}} + </div> + <div class="mitemedit-submit-wrapper" > + {{if $submit_more}} + <input type="submit" name="submit-more" class="mitemedit-submit" value="{{$submit_more}}" /> + {{/if}} + <input type="submit" name="submit" class="mitemedit-submit" value="{{$submit}}" /> + </div> + + </form> </div> - -</form> diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl index dc5b0e9f9..68dd225ee 100644 --- a/view/tpl/mitemlist.tpl +++ b/view/tpl/mitemlist.tpl @@ -1,18 +1,32 @@ -<h1>{{$title}}</h1> -<h2>{{$menudesc}} ({{$menuname}})</h2> +<div class="section-title-wrapper"> + <div class="pull-right"> + <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-element-creator');"><i class="icon-edit"></i> {{$hintnew}}</button> + </div> + <h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2> + <div class="clear"></div> +</div> -<a href="menu/{{$menu_id}}" title="{{$hintmenu}}">{{$edmenu}}</a><br /> -<a href="mitem/{{$menu_id}}/new" title="{{$hintnew}}">{{$hintnew}}</a> - -<br /> -<br /> +{{$create}} {{if $mlist }} -<ul id="mitemlist" class="menu-item-list"> -{{foreach $mlist as $m }} -<li><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil mitem-edit btn btn-default"></i></a><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}/drop" title={{$hintdrop}}><i class="icon-trash btn btn-default"></i></a> <a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintcontent}}">{{$m.mitem_desc}}</a> ({{$m.mitem_link}})</li> -{{/foreach}} -</ul> +<div id="mitemlist-content-wrapper" class="section-content-wrapper-np"> + <table id="mitem-list-table"> + <tr> + <th width="1%">{{$nametitle}}</th> + <th width="97%">{{$targettitle}}</th> + <th width="1%"></th> + <th width="1%"></th> + </tr> + {{foreach $mlist as $m }} + <tr id="mitem-list-item-{{$m.mitem_id}}"> + <td width="1%">{{$m.mitem_desc}}</td> + <td width="97%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td> + <td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil"></i></a></td> + <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="icon-trash drop-icons"></i></a></td> + </tr> + {{/foreach}} + </table> +</div> {{/if}} diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl index b05f785a8..57caf25fc 100644 --- a/view/tpl/usermenu.tpl +++ b/view/tpl/usermenu.tpl @@ -5,7 +5,7 @@ {{if $items }} <ul class="pmenu-body{{if !$class}} nav nav-pills nav-stacked{{/if}}"> {{foreach $items as $mitem }} - <li class="pmenu-item"><a href="{{$mitem.mitem_link}}" {{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}</a></li> + <li id="pmenu-item-{{$mitem.mitem_id}}" class="pmenu-item"><a href="{{$mitem.mitem_link}}" {{if $mitem.newwin}}target="_blank"{{/if}}>{{$mitem.mitem_desc}}</a></li> {{/foreach }} </ul> {{/if}} |