From 6cd5826d214701071c0ea14a0be16284afc926b4 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 17 Sep 2015 15:05:40 +0200 Subject: Revert "moved submit button to the bottom in settings.tpl" This reverts commit 1500691cc22443aac9bb6af409f8bbd64787a9e9. --- view/tpl/settings.tpl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'view') diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 3a6e8b7a3..ab62ede45 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -26,6 +26,9 @@ {{include file="field_input.tpl" field=$photo_path}} {{include file="field_input.tpl" field=$attach_path}} +
+ +
@@ -75,6 +78,9 @@ {{include file="field_checkbox.tpl" field=$blocktags}} {{include file="field_input.tpl" field=$expire}} +
+ +
@@ -124,14 +130,10 @@ {{include file="field_input.tpl" field=$evdays}} - - - -
-
{{if $menus}} -- cgit v1.2.3 From 1cf404177dc3824096e724308f4e26716b6e2c8d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 17 Sep 2015 19:25:13 +0200 Subject: quickfix for private messages - needs a lot more work --- view/tpl/mail_display.tpl | 22 +++++++++++++--------- view/tpl/mail_head.tpl | 13 ++++++++++--- view/tpl/mail_list.tpl | 14 ++++++-------- 3 files changed, 29 insertions(+), 20 deletions(-) (limited to 'view') diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl index 523a9160a..062710f1d 100755 --- a/view/tpl/mail_display.tpl +++ b/view/tpl/mail_display.tpl @@ -1,12 +1,16 @@ -

{{$prvmsg_header}}

-{{foreach $mails as $mail}} - {{include file="mail_conv.tpl"}} -{{/foreach}} +
+

{{$prvmsg_header}}

+
+
+ {{foreach $mails as $mail}} + {{include file="mail_conv.tpl"}} + {{/foreach}} -{{if $canreply}} -{{include file="prv_message.tpl"}} -{{else}} -{{$unknown_text}} -{{/if}} + {{if $canreply}} + {{include file="prv_message.tpl"}} + {{else}} + {{$unknown_text}} + {{/if}} +
diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl index 1cd7145e7..7bc854fff 100755 --- a/view/tpl/mail_head.tpl +++ b/view/tpl/mail_head.tpl @@ -1,3 +1,10 @@ -

{{$messages}}

- -{{$tab_content}} +
+
+

{{$header}}

+
+
+ {{foreach $messages as $message}} + {{include file="mail_list.tpl"}} + {{/foreach}} +
+
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 1d499e12f..e75fae15c 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,8 +1,6 @@ -
- {{$from_name}} - {{$from_name}} - {{$subject}} - {{$date}} - -
 
-
+{{$message.from_name}} +{{$message.from_name}} +{{$message.subject}} +{{$message.date}} + +
-- cgit v1.2.3 From c6c18261a0d1d66188951c28b9abbe441c278bb4 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 17 Sep 2015 19:33:44 +0200 Subject: missing refernce to array --- view/tpl/mail_list.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index e75fae15c..e3f8ef75c 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -2,5 +2,5 @@ {{$message.from_name}} {{$message.subject}} {{$message.date}} - +
-- cgit v1.2.3 From 4090843fef6defa88bee36c4547b418f1e818139 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Thu, 17 Sep 2015 22:39:48 +0200 Subject: Converse width for a few related (old) schemas back to 1024px / Name default theme to Focus / Non expert custom display settings above expert display settings, so people can better find them. --- view/theme/redbasic/php/config.php | 2 +- view/theme/redbasic/schema/dark.php | 3 +++ view/theme/redbasic/schema/simple_black_on_white.php | 3 +++ view/theme/redbasic/schema/simple_green_on_black.php | 2 ++ view/theme/redbasic/schema/simple_white_on_black.php | 2 ++ view/theme/redbasic/tpl/theme_settings.tpl | 9 ++++----- 6 files changed, 15 insertions(+), 6 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 6ab8acde6..6bea5bddb 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -79,7 +79,7 @@ function theme_post(&$a) { function redbasic_form(&$a, $arr) { $scheme_choices = array(); - $scheme_choices["---"] = t("Light (Hubzilla default)"); + $scheme_choices["---"] = t("Focus (Hubzilla default)"); $files = glob('view/theme/redbasic/schema/*.php'); if($files) { foreach($files as $file) { diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 92e703325..af4b122f1 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -34,5 +34,8 @@ $toolicon_activecolour = '#fff'; if (! $font_colour) $font_colour = "#ccc"; + if (! $converse_width) + $converse_width = "1024"; + diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php index 6853a0ed5..554e832f0 100644 --- a/view/theme/redbasic/schema/simple_black_on_white.php +++ b/view/theme/redbasic/schema/simple_black_on_white.php @@ -34,6 +34,9 @@ $comment_border_colour = "rgba(255,255,255,0.8)"; if (! $font_colour) $font_colour = "#000"; + if (! $converse_width) + $converse_width = "1024"; + diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php index 2660624d6..8192180db 100644 --- a/view/theme/redbasic/schema/simple_green_on_black.php +++ b/view/theme/redbasic/schema/simple_green_on_black.php @@ -34,3 +34,5 @@ $comment_border_colour = "rgba(0,0,0,0.8)"; if (! $font_colour) $font_colour = "#46D43F"; + if (! $converse_width) + $converse_width = "1024"; diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php index a76709ac9..b64f60bbe 100644 --- a/view/theme/redbasic/schema/simple_white_on_black.php +++ b/view/theme/redbasic/schema/simple_white_on_black.php @@ -34,3 +34,5 @@ $comment_border_colour = "rgba(0,0,0,0.8)"; if (! $font_colour) $font_colour = "#fff"; + if (! $converse_width) + $converse_width = "1024"; diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index bfb489abd..4f5b69beb 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,4 +1,7 @@ {{include file="field_select.tpl" field=$schema}} +{{include file="field_checkbox.tpl" field=$align_left}} +{{include file="field_checkbox.tpl" field=$narrow_navbar}} +{{include file="field_input.tpl" field=$converse_width}} {{if $expert}} {{include file="field_colorinput.tpl" field=$nav_bg}} {{include file="field_colorinput.tpl" field=$nav_gradient_top}} @@ -26,11 +29,7 @@ {{include file="field_input.tpl" field=$shadow}} {{include file="field_input.tpl" field=$top_photo}} {{include file="field_input.tpl" field=$reply_photo}} -{{/if}} -{{include file="field_input.tpl" field=$converse_width}} -{{include file="field_checkbox.tpl" field=$align_left}} -{{include file="field_checkbox.tpl" field=$narrow_navbar}} -{{if $expert}} +