Merge https://github.com/redmatrix/redmatrix into pending_merge

4 files changed, 29 insertions, 10 deletions

diff --git a/view/css/mod_menu.css b/view/css/mod_menu.css
index 930bd834d..7f0f40246 100644
--- a/view/css/mod_menu.css
+++ b/view/css/mod_menu.css
@@ -2,7 +2,20 @@
 	width: 100%;
 }
 
-#menu-list-table th:nth-child(2){
+#menu-list-table th:nth-child(2),
+#menu-list-table th:nth-child(3) {
+	white-space: nowrap;
+}
+
+#menu-list-table th:nth-child(7),
+#menu-list-table td:nth-child(7) {
+	padding: 7px 3px;
+	white-space: nowrap;
+}
+
+#menu-list-table th:nth-child(8),
+#menu-list-table td:nth-child(8) {
+	padding: 7px 10px 7px 7px;
 	white-space: nowrap;
 }
 
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl
index da3172434..7fc17471c 100644
--- a/view/tpl/menuedit.tpl
+++ b/view/tpl/menuedit.tpl
@@ -22,7 +22,7 @@
 
 		{{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>
+			<button type="submit" name="submit" class="btn btn-primary">{{$submit}}&nbsp;<i class="icon-caret-right"></i></button>
 		</div>
 		<div class="clear"></div>
 	</form>
diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl
index 1d3d70757..888dc6e6d 100644
--- a/view/tpl/menulist.tpl
+++ b/view/tpl/menulist.tpl
@@ -14,17 +14,23 @@
 		<tr>
 			<th width="1%"></th>
 			<th width="1%">{{$nametitle}}</th>
-			<th width="96%">{{$desctitle}}</th>
+			<th width="93%">{{$desctitle}}</th>
 			<th width="1%"></th>
 			<th width="1%"></th>
+			<th width="1%"></th>
+			<th width="1%" class="hidden-xs">{{$created}}</th>
+			<th width="1%" class="hidden-xs">{{$edited}}</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>
+			<td>{{if $m.bookmark}}<i class="icon-bookmark menu-list-tool" title="{{$bmark}}" ></i>{{/if}}</td>
+			<td><a href="mitem/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td>
+			<td>{{$m.menu_desc}}</td>
+			<td 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 class="menu-list-tool"><a href="rpost?attachment={{$m.element}}" title="{{$share}}"><i class="icon-share"></i></a></td>
+			<td 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>
+			<td class="hidden-xs">{{$m.menu_created}}</td>
+			<td class="hidden-xs">{{$m.menu_edited}}</td>
 		</tr>
 		{{/foreach}}
 	</table>
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
index 8b8afa24c..cdc022c5c 100644
--- a/view/tpl/mitemedit.tpl
+++ b/view/tpl/mitemedit.tpl
@@ -21,13 +21,13 @@
 		{{include file="field_input.tpl" field=$mitem_order}}
 		{{include file="field_checkbox.tpl" field=$usezid}}
 		{{include file="field_checkbox.tpl" field=$newwin}}
-		<div class="pull-right btn-group form-group">
+		<div class="pull-right form-group">
 			<div class="btn-group">
 				<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
 					<i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
 				</button>
 				{{if $submit_more}}
-				<button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}}&nbsp;<i id="jot-perms-icon" class="icon-caret-right"></i></button>
+				<button class="btn btn-primary btn-sm" type="submit" name="submit-more" value="{{$submit_more}}">{{$submit_more}}&nbsp;<i class="icon-caret-right"></i></button>
 				{{/if}}
 				<button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
 			</div>