From de84f48e2fd52a3a35af26895bd70132b1e92e5e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 19 Jun 2015 12:44:11 +0200 Subject: bring some more generic-content-wrappers and fix some of them --- include/RedDAV/RedBrowser.php | 7 +-- view/tpl/blocklist.tpl | 126 ++++++++++++++++++------------------- view/tpl/cloud_directory.tpl | 2 +- view/tpl/conv_item.tpl | 2 +- view/tpl/conv_list.tpl | 2 +- view/tpl/conversation.tpl | 2 +- view/tpl/layoutlist.tpl | 130 ++++++++++++++++++++------------------- view/tpl/menulist.tpl | 70 +++++++++++---------- view/tpl/photo_album.tpl | 44 ++++++------- view/tpl/photos_recent.tpl | 28 +++++---- view/tpl/search_item.tpl | 2 +- view/tpl/webpagelist.tpl | 140 +++++++++++++++++++++--------------------- 12 files changed, 282 insertions(+), 273 deletions(-) diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php index a0330d7cc..d74bba220 100644 --- a/include/RedDAV/RedBrowser.php +++ b/include/RedDAV/RedBrowser.php @@ -247,7 +247,7 @@ class RedBrowser extends DAV\Browser\Plugin { $this->server->broadcastEvent('onHTMLActionsPanel', array($parent, &$output)); } - $html .= replace_macros(get_markup_template('cloud_header.tpl'), array( + $html .= replace_macros(get_markup_template('cloud.tpl'), array( '$header' => t('Files') . ": " . $this->escapeHTML($path) . "/", '$quota' => $quota, '$total' => t('Total'), @@ -255,10 +255,7 @@ class RedBrowser extends DAV\Browser\Plugin { '$shared' => t('Shared'), '$create' => t('Create'), '$upload' => t('Upload'), - '$is_owner' => $is_owner - )); - - $html .= replace_macros(get_markup_template('cloud_directory.tpl'), array( + '$is_owner' => $is_owner, '$parentpath' => $parentpath, '$entries' => $f, '$name' => t('Name'), diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl index 85e4865ea..27dbcbf0c 100644 --- a/view/tpl/blocklist.tpl +++ b/view/tpl/blocklist.tpl @@ -1,67 +1,69 @@ -
+
+
+ {{if $editor}} +
+ +
+ {{/if}} +

{{$title}}

+
+
{{if $editor}} -
- +
+ {{$editor}}
{{/if}} -

{{$title}}

+ {{if $pages}} +
+ + + + + + + + + + + {{foreach $pages as $key => $items}} + {{foreach $items as $item}} + + + + + + + + + + {{/foreach}} + {{/foreach}} +
{{$name}}{{$blocktitle}}
+ {{if $view}} + {{$item.name}} + {{else}} + {{$item.name}} + {{/if}} + + {{$item.title}} + + {{if $edit}} + + {{/if}} + + {{if $item.bb_element}} + + {{/if}} + + {{if $edit}} + + {{/if}} +
+
+ {{/if}}
-{{if $editor}} -
- {{$editor}} -
-{{/if}} -{{if $pages}} -
- - - - - - - - - - - {{foreach $pages as $key => $items}} - {{foreach $items as $item}} - - - - - - - - - - {{/foreach}} - {{/foreach}} -
{{$name}}{{$blocktitle}}
- {{if $view}} - {{$item.name}} - {{else}} - {{$item.name}} - {{/if}} - - {{$item.title}} - - {{if $edit}} - - {{/if}} - - {{if $item.bb_element}} - - {{/if}} - - {{if $edit}} - - {{/if}} -
-
-
-{{/if}} diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index c1d03da83..0c7892c25 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,4 +1,4 @@ -
+
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index e0acc25ae..27632d770 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -4,7 +4,7 @@
- - - - - - - - - - {{foreach $pages as $key => $items}} - {{foreach $items as $item}} - - - - - - - - - - {{/foreach}} - {{/foreach}} -
{{$name}}{{$descr}}
- {{if $view}} - {{$item.title}} - {{else}} - {{$item.title}} - {{/if}} - - {{$item.descr}} - - {{if $edit}} - - {{/if}} - - {{if $item.bb_element}} - - {{/if}} - - {{if $edit}} - - {{/if}} -
+ {{if $pages}} +
+ + + + + + + + + + + {{foreach $pages as $key => $items}} + {{foreach $items as $item}} + + + + + + + + + + {{/foreach}} + {{/foreach}} +
{{$name}}{{$descr}}
+ {{if $view}} + {{$item.title}} + {{else}} + {{$item.title}} + {{/if}} + + {{$item.descr}} + + {{if $edit}} + + {{/if}} + + {{if $item.bb_element}} + + {{/if}} + + {{if $edit}} + + {{/if}} +
+
+
+ {{/if}}
-
-{{/if}} diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index 888dc6e6d..743165cc3 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -1,38 +1,40 @@ -
-
- +
+
+
+ +
+

{{$title}}

+
-

{{$title}}

-
-
-{{$create}} + {{$create}} -{{if $menus }} -
- - - - - - - - - - - - {{foreach $menus as $m }} - - - - - - - - - - - {{/foreach}} - + {{if $menus }} +
+ + + + + + + + + + + + {{foreach $menus as $m }} + + + + + + + + + + + {{/foreach}} + +
+ {{/if}}
-{{/if}} diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 5506b01f2..0ce9c36a8 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,27 +1,29 @@ -
-
- -
- {{if $album_edit.1}} - - {{/if}} - {{if $can_post}} - - {{/if}} +
+
+
+ +
+ {{if $album_edit.1}} + + {{/if}} + {{if $can_post}} + + {{/if}} +
-
-

{{$album}}

+

{{$album}}

-
-
-{{$upload_form}} -{{$album_edit.1}} -
- {{foreach $photos as $photo}} - {{include file="photo_top.tpl"}} - {{/foreach}} -
+
+
+ {{$upload_form}} + {{$album_edit.1}} +
+ {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} +
+
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 7727abcea..15faa4a34 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -1,16 +1,18 @@ -
- {{if $can_post}} - - {{/if}} -

{{$title}}

-
-
-{{$upload_form}} -
- {{foreach $photos as $photo}} - {{include file="photo_top.tpl"}} - {{/foreach}} -
+
+
+ {{if $can_post}} + + {{/if}} +

{{$title}}

+
+
+ {{$upload_form}} +
+ {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} +
+
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index d5a608c82..dee33f1b3 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -1,4 +1,4 @@ -
+
diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 77fb09492..864705121 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -1,74 +1,76 @@ -
+
+
+ {{if $editor}} +
+ +
+ {{/if}} +

{{$listtitle}}

+
+
{{if $editor}} -
- +
+ {{$editor}} +
+ {{/if}} + {{if $pages}} +
+ + + + + + + + + + + + {{foreach $pages as $key => $items}} + {{foreach $items as $item}} + + + + + + + + + + + {{/foreach}} + {{/foreach}} +
{{$pagelink_txt}}{{$title_txt}}
+ {{if $view}} + {{$item.pagetitle}} + {{else}} + {{$item.pagetitle}} + {{/if}} + + {{$item.title}} + + {{if $item.lockstate=='lock'}} + + + {{/if}} + + {{if $edit}} + + {{/if}} + + {{if $item.bb_element}} + + {{/if}} + + {{if $edit}} + + {{/if}} +
{{/if}} -

{{$listtitle}}

-{{if $editor}} -
- {{$editor}} -
-{{/if}} -{{if $pages}} -
- - - - - - - - - - - - {{foreach $pages as $key => $items}} - {{foreach $items as $item}} - - - - - - - - - - - {{/foreach}} - {{/foreach}} -
{{$pagelink_txt}}{{$title_txt}}
- {{if $view}} - {{$item.pagetitle}} - {{else}} - {{$item.pagetitle}} - {{/if}} - - {{$item.title}} - - {{if $item.lockstate=='lock'}} - - - {{/if}} - - {{if $edit}} - - {{/if}} - - {{if $item.bb_element}} - - {{/if}} - - {{if $edit}} - - {{/if}} -
-
-
-{{/if}} -- cgit v1.2.3 From 1432b1e83f522f453d9777045cd710442a65d2ea Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 19 Jun 2015 12:45:18 +0200 Subject: cloud.tpl --- view/tpl/cloud.tpl | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 view/tpl/cloud.tpl diff --git a/view/tpl/cloud.tpl b/view/tpl/cloud.tpl new file mode 100644 index 000000000..d1567af9f --- /dev/null +++ b/view/tpl/cloud.tpl @@ -0,0 +1,4 @@ +
+{{include file="cloud_header.tpl"}} +{{include file="cloud_directory.tpl"}} +
-- cgit v1.2.3 From 8b563951ff9019e6a0c3a459ad5b768826a2017c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 19 Jun 2015 15:49:06 +0200 Subject: more generic-content-wrapper and some css fixes --- view/theme/redbasic/css/style.css | 14 +++++++++--- view/tpl/photo_view.tpl | 17 +++++++------- view/tpl/sharedwithme.tpl | 48 ++++++++++++++++++++------------------- 3 files changed, 44 insertions(+), 35 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 946e2d7d7..ad203867c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1889,7 +1889,6 @@ nav .dropdown-menu { color: #31708f; background-color: #d9edf7; margin-bottom: 3px; - border-radius: $radiuspx; text-align: center; } @@ -1898,7 +1897,6 @@ nav .dropdown-menu { color: #8a6d3b; background-color: #fcf8e3; margin-bottom: 3px; - border-radius: $radiuspx; text-align: center; } @@ -1907,10 +1905,20 @@ nav .dropdown-menu { color: #a94442; background-color: #f2dede; margin-bottom: 3px; - border-radius: $radiuspx; text-align: center; } +.section-content-tools-wrapper .section-content-info-wrapper, +.section-content-wrapper .section-content-info-wrapper, +.section-content-tools-wrapper .section-content-warning-wrapper, +.section-content-wrapper .section-content-warning-wrapper, +.section-content-tools-wrapper .section-content-danger-wrapper, +.section-content-wrapper .section-content-danger-wrapper { + margin-bottom: 0px; + border-radius: $radiuspx; +} + + .section-content-wrapper { padding: 7px 10px; background-color: $comment_item_colour; diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 1054d5e3a..63d5ad778 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -1,6 +1,5 @@
-
@@ -155,17 +154,17 @@ {{/if}}
-
-{{$comments}} + {{$comments}} -{{if $commentbox}} -
- {{$commentbox}} -
-{{/if}} + {{if $commentbox}} +
+ {{$commentbox}} +
+ {{/if}} -
+
+
{{$paginate}} diff --git a/view/tpl/sharedwithme.tpl b/view/tpl/sharedwithme.tpl index cb365ed05..4ffacc241 100644 --- a/view/tpl/sharedwithme.tpl +++ b/view/tpl/sharedwithme.tpl @@ -1,24 +1,26 @@ -
-  {{$dropall}} -

{{$header}}

-
-
- - - - - - - - - {{foreach $items as $item}} - - - - - - - - {{/foreach}} -
{{$name}}
{{$item.objfilename}}{{if $item.unseen}} {{$label_new}}{{/if}}
+
+
+  {{$dropall}} +

{{$header}}

+
+
+ + + + + + + + + {{foreach $items as $item}} + + + + + + + + {{/foreach}} +
{{$name}}
{{$item.objfilename}}{{if $item.unseen}} {{$label_new}}{{/if}}
+
-- cgit v1.2.3