From c6a75f407db0ab68a562442483b0f6402e34c0da Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 24 Apr 2015 11:36:49 +0200 Subject: webpages layout fixes --- view/css/mod_layouts.css | 29 ++++++++++++++++++++ view/theme/redbasic/css/style.css | 1 + view/tpl/layoutlist.tpl | 58 ++++++++++++++++++++++++++++++--------- 3 files changed, 75 insertions(+), 13 deletions(-) (limited to 'view') diff --git a/view/css/mod_layouts.css b/view/css/mod_layouts.css index 7f65713e7..5a3c86733 100644 --- a/view/css/mod_layouts.css +++ b/view/css/mod_layouts.css @@ -1,3 +1,32 @@ #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(5), +#layout-list-table td:nth-child(5){ + padding: 7px 3px; + white-space: nowrap; +} + +#layout-list-table th:nth-child(6), +#layout-list-table td:nth-child(6){ + padding: 7px 10px 7px 7px; + white-space: nowrap; +} + +.webpage-list-tool { + padding: 7px 10px; +} 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/layoutlist.tpl b/view/tpl/layoutlist.tpl index cd146377d..6812cf95b 100644 --- a/view/tpl/layoutlist.tpl +++ b/view/tpl/layoutlist.tpl @@ -15,19 +15,51 @@ {{/if}} {{if $pages}} -
+
+ + + + + + + + + {{foreach $pages as $key => $items}} - {{foreach $items as $item}} -
- {{if $edit}} {{/if}} - {{if $view}} {{/if}} - {{if $share}} {{/if}} - {{*if $preview}} {{/if*}} - {{$item.title}} -
- {{/foreach}} + {{foreach $items as $item}} + + + + + + + + {{/foreach}} - - -
+ {{/foreach}} +
{{$name}}
+ {{if $view}} + {{$item.title}} + {{else}} + {{$item.title}} + {{/if}} + + {{if $edit}} + + {{/if}} + + {{if $item.bb_element}} + + {{/if}} + + {{if $edit}} + + {{/if}} +
+
+
{{/if}} -- cgit v1.2.3 From b7f6cceaea464df81fac872d2d7b863bd02746de Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 24 Apr 2015 22:37:22 +0200 Subject: provide block titles in blocklist --- view/css/mod_blocks.css | 8 ++++---- view/tpl/blocklist.tpl | 10 +++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'view') diff --git a/view/css/mod_blocks.css b/view/css/mod_blocks.css index c930f5dc8..e17d19750 100644 --- a/view/css/mod_blocks.css +++ b/view/css/mod_blocks.css @@ -15,14 +15,14 @@ padding: 7px 3px 7px 10px; } -#block-list-table th:nth-child(5), -#block-list-table td:nth-child(5){ +#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(6), -#block-list-table td:nth-child(6){ +#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/tpl/blocklist.tpl b/view/tpl/blocklist.tpl index f599aade7..f653ef59d 100644 --- a/view/tpl/blocklist.tpl +++ b/view/tpl/blocklist.tpl @@ -16,7 +16,8 @@
- + + @@ -28,11 +29,14 @@ +
{{$name}}{{$name}}{{$blocktitle}}
{{if $view}} - {{$item.title}} + {{$item.name}} {{else}} - {{$item.title}} + {{$item.name}} {{/if}} + {{$item.title}} + {{if $edit}} -- cgit v1.2.3 From fcaa980a3f8c0c8a98ba6912826b694371cdd26a Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 24 Apr 2015 22:51:59 +0200 Subject: css fixes --- view/css/mod_blocks.css | 4 ++++ view/css/mod_webpages.css | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'view') diff --git a/view/css/mod_blocks.css b/view/css/mod_blocks.css index e17d19750..36a12e1d1 100644 --- a/view/css/mod_blocks.css +++ b/view/css/mod_blocks.css @@ -15,6 +15,10 @@ padding: 7px 3px 7px 10px; } +#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; 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; -- cgit v1.2.3 From 31b5b06e42415ffaf98ca09ca8641ae64e67280f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 25 Apr 2015 22:35:24 +0200 Subject: Provide webpage layout description --- view/css/mod_layouts.css | 10 +++++++--- view/tpl/layoutlist.tpl | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'view') diff --git a/view/css/mod_layouts.css b/view/css/mod_layouts.css index 5a3c86733..8e0a945bf 100644 --- a/view/css/mod_layouts.css +++ b/view/css/mod_layouts.css @@ -15,14 +15,18 @@ padding: 7px 3px 7px 10px; } -#layout-list-table th:nth-child(5), -#layout-list-table td:nth-child(5){ - padding: 7px 3px; +#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; } diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl index 6812cf95b..ab7408eae 100644 --- a/view/tpl/layoutlist.tpl +++ b/view/tpl/layoutlist.tpl @@ -18,7 +18,8 @@
- + + @@ -35,6 +36,9 @@ {{$item.title}} {{/if}} +
{{$name}}{{$name}}{{$descr}} + {{$item.descr}} + {{if $edit}} -- cgit v1.2.3 From d6152d809affb557fa0cec346eee3bc6e09922f4 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 28 Apr 2015 22:06:09 +0200 Subject: revert some changes in justified gallery --- view/js/main.js | 1 - 1 file changed, 1 deletion(-) (limited to 'view') 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', -- cgit v1.2.3 From 8711c223f32b234a69c4cc76ce14030172384bc8 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 28 Apr 2015 13:14:15 -0700 Subject: version update --- view/tpl/photosajax.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') 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}} -- cgit v1.2.3 From 2376d2140ab6eeb8a44d7582a52978520844e229 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 29 Apr 2015 21:43:41 +0200 Subject: fix block view --- view/tpl/blocklist.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl index f653ef59d..85e4865ea 100644 --- a/view/tpl/blocklist.tpl +++ b/view/tpl/blocklist.tpl @@ -29,7 +29,7 @@
{{if $view}} - {{$item.name}} + {{$item.name}} {{else}} {{$item.name}} {{/if}} -- cgit v1.2.3