aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/mod_blocks.css10
-rw-r--r--view/css/mod_layouts.css33
-rw-r--r--view/css/mod_webpages.css4
-rw-r--r--view/js/main.js1
-rw-r--r--view/theme/redbasic/css/style.css1
-rw-r--r--view/tpl/blocklist.tpl10
-rw-r--r--view/tpl/layoutlist.tpl62
-rwxr-xr-xview/tpl/photosajax.tpl2
8 files changed, 102 insertions, 21 deletions
diff --git a/view/css/mod_blocks.css b/view/css/mod_blocks.css
index c930f5dc8..36a12e1d1 100644
--- a/view/css/mod_blocks.css
+++ b/view/css/mod_blocks.css
@@ -15,14 +15,18 @@
padding: 7px 3px 7px 10px;
}
-#block-list-table th:nth-child(5),
-#block-list-table td:nth-child(5){
- padding: 7px 3px;
+#block-list-table th:nth-child(2){
white-space: nowrap;
}
#block-list-table th:nth-child(6),
#block-list-table td:nth-child(6){
+ padding: 7px 3px;
+ white-space: nowrap;
+}
+
+#block-list-table th:nth-child(7),
+#block-list-table td:nth-child(7){
padding: 7px 10px 7px 7px;
white-space: nowrap;
}
diff --git a/view/css/mod_layouts.css b/view/css/mod_layouts.css
index 7f65713e7..8e0a945bf 100644
--- a/view/css/mod_layouts.css
+++ b/view/css/mod_layouts.css
@@ -1,3 +1,36 @@
#layout-editor {
display: none;
}
+
+#layout-list-table {
+ width: 100%;
+}
+
+#layout-list-table th:nth-child(1){
+ padding: 7px 3px 7px 10px;
+ white-space: nowrap;
+}
+
+#layout-list-table td:nth-child(1){
+ padding: 7px 3px 7px 10px;
+}
+
+#layout-list-table th:nth-child(2){
+ white-space: nowrap;
+}
+
+#layout-list-table th:nth-child(6),
+#layout-list-table td:nth-child(6){
+ padding: 7px 3px;
+ white-space: nowrap;
+}
+
+#layout-list-table th:nth-child(7),
+#layout-list-table td:nth-child(7){
+ padding: 7px 10px 7px 7px;
+ white-space: nowrap;
+}
+
+.webpage-list-tool {
+ padding: 7px 10px;
+}
diff --git a/view/css/mod_webpages.css b/view/css/mod_webpages.css
index d88657c69..1c6ec4aea 100644
--- a/view/css/mod_webpages.css
+++ b/view/css/mod_webpages.css
@@ -15,6 +15,10 @@
padding: 7px 3px 7px 10px;
}
+#webpage-list-table th:nth-child(2){
+ white-space: nowrap;
+}
+
#webpage-list-table th:nth-child(7),
#webpage-list-table td:nth-child(7){
padding: 7px 3px;
diff --git a/view/js/main.js b/view/js/main.js
index d1e61dc24..35944e13f 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -743,7 +743,6 @@ function justifyPhotos() {
$('#photo-album-contents').justifiedGallery({
margins: 3,
border: 0,
- ignoreElement: '#page-end',
sizeRangeSuffixes: {
'lt100': '-2',
'lt240': '-2',
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 28d443c74..a5e5dffdb 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1938,6 +1938,7 @@ nav .dropdown-menu {
[id^="webpage-list-item-"]:hover td,
[id^="block-list-item-"]:hover td,
+[id^="layout-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/blocklist.tpl b/view/tpl/blocklist.tpl
index f599aade7..85e4865ea 100644
--- a/view/tpl/blocklist.tpl
+++ b/view/tpl/blocklist.tpl
@@ -16,7 +16,8 @@
<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
<table id="block-list-table">
<tr>
- <th width="97%">{{$name}}</th>
+ <th width="1%">{{$name}}</th>
+ <th width="94%">{{$blocktitle}}</th>
<th width="1%"></th>
<th width="1%"></th>
<th width="1%"></th>
@@ -28,11 +29,14 @@
<tr id="block-list-item-{{$item.url}}">
<td>
{{if $view}}
- <a href="block/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a>
+ <a href="block/{{$channel}}/{{$item.name}}" title="{{$view}}">{{$item.name}}</a>
{{else}}
- {{$item.title}}
+ {{$item.name}}
{{/if}}
</td>
+ <td>
+ {{$item.title}}
+ </td>
<td class="webpage-list-tool">
{{if $edit}}
<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl
index cd146377d..ab7408eae 100644
--- a/view/tpl/layoutlist.tpl
+++ b/view/tpl/layoutlist.tpl
@@ -15,19 +15,55 @@
{{/if}}
{{if $pages}}
- <div id="pagelist-content-wrapper" class="generic-content-wrapper">
+<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
+ <table id="layout-list-table">
+ <tr>
+ <th width="1%">{{$name}}</th>
+ <th width="94%">{{$descr}}</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 $pages as $key => $items}}
- {{foreach $items as $item}}
- <div class="page-list-item">
- {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> {{/if}}
- {{if $view}}<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon btn btn-default"></i></a> {{/if}}
- {{if $share}}<a href="layouts/{{$channel}}/share/{{$item.mid}}" title="{{$share}}"><i class="icon-share design-icons btn btn-default"></i></a> {{/if}}
- {{*if $preview}}<a href="page/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon"></i></a> {{/if*}}
- {{$item.title}}
- </div>
- {{/foreach}}
+ {{foreach $items as $item}}
+ <tr id="layout-list-item-{{$item.url}}">
+ <td>
+ {{if $view}}
+ <a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a>
+ {{else}}
+ {{$item.title}}
+ {{/if}}
+ </td>
+ <td>
+ {{$item.descr}}
+ </td>
+ <td class="webpage-list-tool">
+ {{if $edit}}
+ <a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
+ {{/if}}
+ </td>
+ <td class="webpage-list-tool">
+ {{if $item.bb_element}}
+ <a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a>
+ {{/if}}
+ </td>
+ <td class="webpage-list-tool">
+ {{if $edit}}
+ <a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#layout-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a>
+ {{/if}}
+ </td>
+ <td class="hidden-xs">
+ {{$item.created}}
+ </td>
+ <td class="hidden-xs">
+ {{$item.edited}}
+ </td>
+ </tr>
{{/foreach}}
- </div>
-
- <div class="clear"></div>
+ {{/foreach}}
+ </table>
+</div>
+<div class="clear"></div>
{{/if}}
diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl
index 632aab2b3..705cb6c75 100755
--- a/view/tpl/photosajax.tpl
+++ b/view/tpl/photosajax.tpl
@@ -1,4 +1,4 @@
{{foreach $photos as $photo}}
- {{include file="photo_top.tpl"}}
+{{include file="photo_top.tpl"}}
{{/foreach}}
<script>justifyPhotosAjax()</script>