From ea6e86fecc901c0e64b74a1e6fc87499df93af1d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 1 Mar 2015 21:45:49 +0100 Subject: more settings work --- view/theme/redbasic/css/style.css | 33 +++- view/tpl/settings.tpl | 314 +++++++++++++++++++------------------- view/tpl/settings_nick_set.tpl | 4 +- 3 files changed, 191 insertions(+), 160 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f049e10dc..8c4b8eb81 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1912,17 +1912,30 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{ margin-bottom: 3px; } -.section-title-wrapper h2 { +.section-title-wrapper h2, +.section-subtitle-wrapper h3 { margin-top: 0px; margin-bottom: 0px; } +.section-subtitle-wrapper { + padding: 7px 10px; + background-color: $item_colour; + margin-bottom: 3px; +} + .section-content-tools-wrapper { padding: 7px 10px; background-color: $comment_item_colour; - margin-bottom: 3px; + margin-bottom: 3px } +.section-content-info-wrapper { + padding: 21px 10px; + color: #31708f; + background-color: #d9edf7; + margin-bottom: 3px; +} .section-content-wrapper { padding: 7px 10px; background-color: $comment_item_colour; @@ -1950,6 +1963,18 @@ nav ul li .notify-unseen /* bootstrap overrides */ +.panel { + background-color: transparent; + border: 0px solid transparent; + border-radius: 0px; + -webkit-box-shadow: 0 0px 0px rgba(0, 0, 0, .0); + box-shadow: 0 0px 0px rgba(0, 0, 0, .0); +} + +.panel-group .panel + .panel { + margin-top: 0px; +} + blockquote { font-size: $font_size; font-style: italic; @@ -2251,7 +2276,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { /* Turn checkboxes into switches */ .field.checkbox > div { - position: relative; width: 50px; + position: relative; width: 60px; -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none; display:inline-block; } @@ -2296,7 +2321,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { display: block; width: 15px; margin:4px; background: #A1A1A1; border-radius: 10px; - position: absolute; top: 0; bottom: 0; right: 26px; + position: absolute; top: 0; bottom: 0; right: 36px; -moz-transition: all 0.3s ease-in 0s; -webkit-transition: all 0.3s ease-in 0s; -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s; } diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index b41bf87b9..20f2618a0 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -1,158 +1,164 @@
-
-

{{$ptitle}}

-
-
- -{{$nickname_block}} - -
- - -

{{$h_basic}}

- -{{include file="field_input.tpl" field=$username}} -{{include file="field_select_grouped.tpl" field=$timezone}} -{{include file="field_input.tpl" field=$defloc}} -{{include file="field_checkbox.tpl" field=$allowloc}} - -{{include file="field_checkbox.tpl" field=$adult}} - -
- -
- - -

{{$h_prv}}

- -{{include file="field_select_grouped.tpl" field=$role}} - -
-{{include file="field_checkbox.tpl" field=$hide_presence}} - - - -
- -{{foreach $permiss_arr as $permit}} - {{include file="field_select.tpl" field=$permit}} -{{/foreach}} -
- +
+ +

{{$ptitle}}

+
-
- -
- - {{$aclselect}} -
-
-
-
- -{{$group_select}} - -{{$profile_in_dir}} - -
- -
- - - -{{$suggestme}} - -{{include file="field_checkbox.tpl" field=$blocktags}} - - -{{include file="field_input.tpl" field=$expire}} - -
- - -
- -
- - - -

{{$h_not}}

-
- -
{{$activity_options}}
-
-{{*not yet implemented *}} -{{*include file="field_checkbox.tpl" field=$post_joingroup*}} -{{include file="field_checkbox.tpl" field=$post_newfriend}} -{{include file="field_checkbox.tpl" field=$post_profilechange}} -
- - -
{{$lbl_not}}
- -
-{{include file="field_intcheckbox.tpl" field=$notify1}} -{{include file="field_intcheckbox.tpl" field=$notify2}} -{{include file="field_intcheckbox.tpl" field=$notify3}} -{{include file="field_intcheckbox.tpl" field=$notify4}} -{{include file="field_intcheckbox.tpl" field=$notify5}} -{{include file="field_intcheckbox.tpl" field=$notify6}} -{{include file="field_intcheckbox.tpl" field=$notify7}} -{{include file="field_intcheckbox.tpl" field=$notify8}} -
- -
{{$lbl_vnot}}
- -
-{{include file="field_intcheckbox.tpl" field=$vnotify1}} -{{include file="field_intcheckbox.tpl" field=$vnotify2}} -{{include file="field_intcheckbox.tpl" field=$vnotify3}} -{{include file="field_intcheckbox.tpl" field=$vnotify4}} -{{include file="field_intcheckbox.tpl" field=$vnotify5}} -{{include file="field_intcheckbox.tpl" field=$vnotify6}} -{{include file="field_intcheckbox.tpl" field=$vnotify10}} -{{include file="field_intcheckbox.tpl" field=$vnotify7}} -{{include file="field_intcheckbox.tpl" field=$vnotify8}} -{{include file="field_intcheckbox.tpl" field=$vnotify9}} -{{include file="field_intcheckbox.tpl" field=$vnotify11}} -{{include file="field_intcheckbox.tpl" field=$always_show_in_notices}} - -{{*include file="field_intcheckbox.tpl" field=$vnotify11*}} -
- -{{include file="field_input.tpl" field=$evdays}} - - - -
- -
- -
- - -{{if $menus}} -

{{$lbl_misc}}

- - - -
{{$menu_desc}}
-
- -
-
- -
-
-{{/if}} - - -
+ {{$nickname_block}} + + + + + + +
+
+ +
+
+ {{include file="field_input.tpl" field=$username}} + {{include file="field_select_grouped.tpl" field=$timezone}} + {{include file="field_input.tpl" field=$defloc}} + {{include file="field_checkbox.tpl" field=$allowloc}} + {{include file="field_checkbox.tpl" field=$adult}} +
+ +
+
+
+
+
+ +
+
+ {{include file="field_select_grouped.tpl" field=$role}} + +
+ {{include file="field_checkbox.tpl" field=$hide_presence}} + + +
+ + {{foreach $permiss_arr as $permit}} + {{include file="field_select.tpl" field=$permit}} + {{/foreach}} +
+ +
+
+ +
+ + {{$aclselect}} +
+
+
+ {{$group_select}} + {{$profile_in_dir}} +
+
+ {{$suggestme}} + {{include file="field_checkbox.tpl" field=$blocktags}} + {{include file="field_input.tpl" field=$expire}} +
+
+ +
+
+
+
+
+ +
+
+
+
{{$activity_options}}
+
+ {{*not yet implemented *}} + {{*include file="field_checkbox.tpl" field=$post_joingroup*}} + {{include file="field_checkbox.tpl" field=$post_newfriend}} + {{include file="field_checkbox.tpl" field=$post_profilechange}} +
+
{{$lbl_not}}
+
+ {{include file="field_intcheckbox.tpl" field=$notify1}} + {{include file="field_intcheckbox.tpl" field=$notify2}} + {{include file="field_intcheckbox.tpl" field=$notify3}} + {{include file="field_intcheckbox.tpl" field=$notify4}} + {{include file="field_intcheckbox.tpl" field=$notify5}} + {{include file="field_intcheckbox.tpl" field=$notify6}} + {{include file="field_intcheckbox.tpl" field=$notify7}} + {{include file="field_intcheckbox.tpl" field=$notify8}} +
+
{{$lbl_vnot}}
+
+ {{include file="field_intcheckbox.tpl" field=$vnotify1}} + {{include file="field_intcheckbox.tpl" field=$vnotify2}} + {{include file="field_intcheckbox.tpl" field=$vnotify3}} + {{include file="field_intcheckbox.tpl" field=$vnotify4}} + {{include file="field_intcheckbox.tpl" field=$vnotify5}} + {{include file="field_intcheckbox.tpl" field=$vnotify6}} + {{include file="field_intcheckbox.tpl" field=$vnotify10}} + {{include file="field_intcheckbox.tpl" field=$vnotify7}} + {{include file="field_intcheckbox.tpl" field=$vnotify8}} + {{include file="field_intcheckbox.tpl" field=$vnotify9}} + {{include file="field_intcheckbox.tpl" field=$vnotify11}} + {{include file="field_intcheckbox.tpl" field=$always_show_in_notices}} + + {{*include file="field_intcheckbox.tpl" field=$vnotify11*}} +
+ {{include file="field_input.tpl" field=$evdays}} +
+
+ +
+
+
+
+ {{if $menus}} +
+ +
+
+
+ + +
+
+ +
+
+
+
+ {{/if}} +
diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl index 5d9f17e9e..2460952fe 100755 --- a/view/tpl/settings_nick_set.tpl +++ b/view/tpl/settings_nick_set.tpl @@ -1,4 +1,4 @@ -
- +
-- cgit v1.2.3