diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_chat.css | 8 | ||||
| -rw-r--r-- | view/css/mod_connedit.css | 14 | ||||
| -rw-r--r-- | view/css/mod_settings.css | 14 | ||||
| -rw-r--r-- | view/theme/redbasic/php/config.php | 14 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 38 | ||||
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 37 | ||||
| -rw-r--r-- | view/tpl/chat.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/menuedit.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 5 |
9 files changed, 108 insertions, 28 deletions
diff --git a/view/css/mod_chat.css b/view/css/mod_chat.css index 7f33f2c48..ce6e59af1 100644 --- a/view/css/mod_chat.css +++ b/view/css/mod_chat.css @@ -1,23 +1,23 @@ - .chatContainer { + #chatContainer { height: 100%; width: 100%; } - .chatTopBar { + #chatTopBar { float: left; height: 400px; width: 650px; overflow-y: auto; } - .chatUsers { + #chatUsers { float: right; width: 120px; height: 100%; border: 1px solid #000; } - .chatBottomBar { + #chatBottomBar { position: relative; bottom: 0; height: 150px; diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css index c460fec28..f6da96433 100644 --- a/view/css/mod_connedit.css +++ b/view/css/mod_connedit.css @@ -135,3 +135,17 @@ .contact-entry-end { clear: both; } + +#abook-advanced-panel, #abook-advanced { + opacity: 0.3; + filter:alpha(opacity=30); +} + +#abook-advanced-panel:hover, #abook-advanced:hover { + opacity: 1.0; + filter:alpha(opacity=100); +} + +#abook-advanced { + margin-top: 15px; +}
\ No newline at end of file diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css index 601cb2e0e..2049d9bc6 100644 --- a/view/css/mod_settings.css +++ b/view/css/mod_settings.css @@ -1,3 +1,17 @@ +#settings-permissions-wrapper, #settings-perm-advanced { + opacity: 0.3; + filter:alpha(opacity=30); +} + +#settings-permissions-wrapper:hover, #settings-perm-advanced:hover { + opacity: 1.0; + filter:alpha(opacity=100); +} + +#settings-perm-advanced { + margin-top: 15px; +} + #settings-permissions-wrapper .field { margin-bottom: 10px; } diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index d6adf5381..68a72fffd 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -74,9 +74,17 @@ function redbasic_form(&$a, $arr) { $nav_colours = array ( '' => t('Scheme Default'), - 'red' => t('red'), - 'black' => t('black'), - 'silver' => t('silver'), + 'red' => 'red', + 'pink' => 'pink', + 'green' => 'green', + 'blue' => 'blue', + 'purple' => 'purple', + 'black' => 'black', + 'orange' => 'orange', + 'brown' => 'brown', + 'grey' => 'grey', + 'gold' => 'gold', + 'silver' => t('silver'), ); if(feature_enabled(local_user(),'expert')) diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 981aaddb2..8d5c23a03 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,5 +1,7 @@ <?php -// Get the UID of the channel owner + +if(! $a->install) { + // Get the UID of the channel owner $uid = get_theme_uid(); if($uid) @@ -32,6 +34,8 @@ $top_photo=get_pconfig($uid,'redbasic','top_photo'); $reply_photo=get_pconfig($uid,'redbasic','reply_photo'); +} + // Now load the scheme. If a value is changed above, we'll keep the settings // If not, we'll keep those defined by the schema // Setting $scheme to '' wasn't working for some reason, so we'll check it's @@ -133,6 +137,38 @@ $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver"; $search_background = '#EEEEEE'; } + if($nav_colour === "pink") { + $nav_bg_1 = $nav_bg_3 = "#FFC1CA"; + $nav_bg_2 = $nav_bg_4 = "#FFC1CA"; + } + if($nav_colour === "green") { + $nav_bg_1 = $nav_bg_3 = "#5CD65C"; + $nav_bg_2 = $nav_bg_4 = "#5CD65C"; + } + if($nav_colour === "blue") { + $nav_bg_1 = $nav_bg_3 = "#1872a2"; + $nav_bg_2 = $nav_bg_4 = "#1872a2"; + } + if($nav_colour === "purple") { + $nav_bg_1 = $nav_bg_3 = "#551A8B"; + $nav_bg_2 = $nav_bg_4 = "#551A8B"; + } + if($nav_colour === "orange") { + $nav_bg_1 = $nav_bg_3 = "#FF3D0D"; + $nav_bg_2 = $nav_bg_4 = "#FF3D0D"; + } + if($nav_colour === "brown") { + $nav_bg_1 = $nav_bg_3 = "#330000"; + $nav_bg_2 = $nav_bg_4 = "#330000"; + } + if($nav_colour === "grey") { + $nav_bg_1 = $nav_bg_3 = "#2e2f2e"; + $nav_bg_2 = $nav_bg_4 = "#2e2f2e"; + } + if($nav_colour === "gold") { + $nav_bg_1 = $nav_bg_3 = "#FFAA00"; + $nav_bg_2 = $nav_bg_4 = "#FFAA00"; + } // Apply the settings diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 590213fd3..265a1a953 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -31,6 +31,22 @@ + +{{if $is_pending}} +<div class="abook-pending-contact"> +{{include file="field_checkbox.tpl" field=$unapproved}} +</div> +{{/if}} + +{{if $multiprofs }} +<div> +<h3>{{$lbl_vis1}}</h3> +<div>{{$lbl_vis2}}</div> + +{{$profile_select}} +</div> +{{/if}} + <h3>{{$permlbl}}</h3> <div id="perm-desc" class="descriptive-text">{{$permnote}}</div> @@ -38,20 +54,16 @@ <input type="hidden" name="contact_id" value="{{$contact_id}}"> <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" /> -{{if $noperms}} +{{* {{if $noperms}} <div id="noperm-msg" class="warning-text">{{$noperms}}</div> <div id="noperm-text" class="descriptive-text">{{$noperm_desc}}</div> {{/if}} +*}} -{{if $is_pending}} -<div class="abook-pending-contact"> -{{include file="field_checkbox.tpl" field=$unapproved}} -</div> -{{/if}} <br /> -<b>{{$quick}}</b> +<h3>{{$quick}}</h3> <ul> {{if $self}} <li><span class="fakelink" onclick="connectForum(); // $('#abook-edit-form').submit();">{{$forum}}</span></li> @@ -62,6 +74,9 @@ <li><span class="fakelink" onclick="connectFollowOnly(); // $('#abook-edit-form').submit();">{{$follow}}</span></li> </ul> +<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> + + <div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div> <div id="abook-advanced-panel" style="display: block;"> @@ -76,14 +91,6 @@ </div> -{{if $multiprofs }} -<div> -<h3>{{$lbl_vis1}}</h3> -<div>{{$lbl_vis2}}</div> - -{{$profile_select}} -</div> -{{/if}} <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index eb98063fa..e4cd1d20b 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -47,8 +47,8 @@ $('#chat-form').submit(function(ev) { function load_chats() { - $.get("chatsvc?f=&room_id=" + room_id + '&last=' + last_chat,function(data) { - if(data.success) { + $.get("chatsvc?f=&room_id=" + room_id + '&last=' + last_chat + ((stopped) ? '&stopped=1' : ''),function(data) { + if(data.success && (! stopped)) { update_inroom(data.inroom); update_chats(data.chats); } diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index ea9e775e2..324dbe426 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -13,7 +13,7 @@ {{include file="field_input.tpl" field=$menu_name}} {{include file="field_input.tpl" field=$menu_desc}} - +{{include file="field_checkbox.tpl" field=$menu_bookmark}} <div class="menuedit-submit-wrapper" > <input type="submit" name="submit" class="menuedit-submit" value="{{$submit}}" /> </div> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index b1a4f956d..c4b89a543 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -25,15 +25,16 @@ {{include file="field_checkbox.tpl" field=$hide_presence}} -<div id="settings-privacy-macros">{{$lbl_pmacro}}</div> +<h3 id="settings-privacy-macros">{{$lbl_pmacro}}</h3> <ul> -<li><a href="#" onclick="channel_privacy_macro(3); return false" id="settings_pmacro3">{{$pmacro3}}</a></li> <li><a href="#" onclick="channel_privacy_macro(2); return false" id="settings_pmacro2">{{$pmacro2}}</a></li> <li><a href="#" onclick="channel_privacy_macro(1); return false" id="settings_pmacro1">{{$pmacro1}}</a></li> +<li><a href="#" onclick="channel_privacy_macro(3); return false" id="settings_pmacro3">{{$pmacro3}}</a></li> <li><a href="#" onclick="channel_privacy_macro(0); return false" id="settings_pmacro0">{{$pmacro0}}</a></li> </ul> +<h3 id="settings-perm-advanced">{{$lbl_p2macro}}</h3> <div id="settings-permissions-wrapper"> {{foreach $permiss_arr as $permit}} |