dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minimized Theme: Rearrange Logout and Domain Selector icons to match Enhanced theme, add ability to show domain name in menu bar.

This commit is contained in:
Nate Jones 2014-09-04 08:42:25 +00:00
parent 6b03a112e0
commit 9aa7c1f85a
4 changed files with 56 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/default_settings/default_setting_edit.php
View File

@ -309,10 +309,10 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$dir_label = str_replace('_', ' ', $dir_name); $dir_label = str_replace('_', ' ', $dir_name);
$dir_label = str_replace('-', ' ', $dir_label); $dir_label = str_replace('-', ' ', $dir_label);
if ($dir_name == $row['default_setting_value']) { if ($dir_name == $row['default_setting_value']) {
echo " <option value='$dir_name' selected='selected'>$dir_label</option>\n"; echo " <option value='$dir_name' selected='selected'>".ucwords($dir_label)."</option>\n";
} }
else { else {
echo " <option value='$dir_name'>$dir_label</option>\n"; echo " <option value='$dir_name'>".ucwords($dir_label)."</option>\n";
} }
} }
} }
@ -452,6 +452,16 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " <option value='fine' ".(($row['default_setting_value'] == 'fine') ? 'selected' : null).">".$text['label-fine']."</option>"; echo " <option value='fine' ".(($row['default_setting_value'] == 'fine') ? 'selected' : null).">".$text['label-fine']."</option>";
echo " <option value='superfine' ".(($row['default_setting_value'] == 'superfine') ? 'selected' : null).">".$text['label-superfine']."</option>"; echo " <option value='superfine' ".(($row['default_setting_value'] == 'superfine') ? 'selected' : null).">".$text['label-superfine']."</option>";
echo " </select>"; echo " </select>";
} elseif ($category == "theme" && $subcategory == "domain_visible" && $name == "text" ) {
echo " <select class='formfld' name='default_setting_value'>\n";
echo " <option value='false' ".(($row['default_setting_value'] == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
echo " <option value='true' ".(($row['default_setting_value'] == "true") ? "selected='selected'" : null).">".$text['label-true']."</option>\n";
echo " </select>\n";
} elseif ($category == "theme" && $subcategory == "cache" && $name == "boolean" ) {
echo " <select class='formfld' name='default_setting_value'>\n";
echo " <option value='true' ".(($row['default_setting_value'] == "true") ? "selected='selected'" : null).">".$text['label-true']."</option>\n";
echo " <option value='false' ".(($row['default_setting_value'] == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
echo " </select>\n";
} }
else { else {
echo " <input class='formfld' type='text' name='default_setting_value' maxlength='255' value=\"".$row['default_setting_value']."\">\n"; echo " <input class='formfld' type='text' name='default_setting_value' maxlength='255' value=\"".$row['default_setting_value']."\">\n";

3
core/default_settings/default_settings.php
View File

@ -391,6 +391,9 @@ if (permission_exists("domain_select") && permission_exists("domain_setting_add"
echo $sub_row["menu_language"]." - ".$sub_row["menu_name"]."\n"; echo $sub_row["menu_language"]." - ".$sub_row["menu_name"]."\n";
} }
} }
elseif ($category == "domain" && $subcategory == "template" && $name == "name" ) {
echo " ".ucwords($row['default_setting_value']);
}
elseif ($category == "email" && $subcategory == "smtp_password" && $name == "var" ) { elseif ($category == "email" && $subcategory == "smtp_password" && $name == "var" ) {
echo " ******** &nbsp;\n"; echo " ******** &nbsp;\n";
} }

2
themes/enhanced/template.php
View File

@ -266,6 +266,7 @@ input.btn:hover, input.button:hover, img.list_control_icon:hover {
-moz-box-shadow: 0 0 5px #cddaf0; -moz-box-shadow: 0 0 5px #cddaf0;
opacity: 1.0; opacity: 1.0;
-moz-opacity: 1.0; -moz-opacity: 1.0;
cursor: pointer;
} }
input.txt, textarea.txt, select.txt, .formfld { input.txt, textarea.txt, select.txt, .formfld {
@ -865,7 +866,6 @@ legend {
#domain_selector_domain { #domain_selector_domain {
display: <?php echo ($_SESSION['theme']['domain_visible']['text'] != 'true') ? 'none' : 'inline-block'; ?>; display: <?php echo ($_SESSION['theme']['domain_visible']['text'] != 'true') ? 'none' : 'inline-block'; ?>;
white-space: nowrap; white-space: nowrap;
margin-top: 10px;
padding: 2px <?php echo ($_SESSION['theme']['domain_background_opacity']['text'] != '' && $_SESSION['theme']['domain_background_opacity']['text'] != 0) ? 7 : 0; ?>px 1px 7px; padding: 2px <?php echo ($_SESSION['theme']['domain_background_opacity']['text'] != '' && $_SESSION['theme']['domain_background_opacity']['text'] != 0) ? 7 : 0; ?>px 1px 7px;
margin-top: -1px; margin-top: -1px;
background-color: rgba(<?php echo hex2rgb($_SESSION['theme']['domain_background_color']['text'],','); ?>, <?php echo ($_SESSION['theme']['domain_background_opacity']['text'] != '') ? $_SESSION['theme']['domain_background_opacity']['text'] : 0; ?>); background-color: rgba(<?php echo hex2rgb($_SESSION['theme']['domain_background_color']['text'],','); ?>, <?php echo ($_SESSION['theme']['domain_background_opacity']['text'] != '') ? $_SESSION['theme']['domain_background_opacity']['text'] : 0; ?>);

56
themes/minimized/template.php
View File

@ -266,6 +266,7 @@ input.btn:hover, input.button:hover, img.list_control_icon:hover {
-moz-box-shadow: 0 0 5px #cddaf0; -moz-box-shadow: 0 0 5px #cddaf0;
opacity: 1.0; opacity: 1.0;
-moz-opacity: 1.0; -moz-opacity: 1.0;
cursor: pointer;
} }
input.txt, textarea.txt, select.txt, .formfld { input.txt, textarea.txt, select.txt, .formfld {
@ -579,9 +580,9 @@ legend {
-webkit-border-radius: 0px 0px 4px 4px; -webkit-border-radius: 0px 0px 4px 4px;
-moz-border-radius: 0px 0px 4px 4px; -moz-border-radius: 0px 0px 4px 4px;
border-radius: 0px 0px 4px 4px; border-radius: 0px 0px 4px 4px;
-webkit-box-shadow: 0 1px 4px #aaa; -webkit-box-shadow: 0 3px 5px #777;
-moz-box-shadow: 0 1px 4px #aaa; -moz-box-shadow: 0 3px 5px #777;
box-shadow: 0 1px 4px #aaa; box-shadow: 0 3px 5px #777;
} }
.menu_bg { .menu_bg {
@ -823,10 +824,11 @@ legend {
#logout_icon { #logout_icon {
filter: alpha(opacity=80); filter: alpha(opacity=80);
opacity: 0.9; opacity: 0.85;
-moz-opacity: 0.9; -moz-opacity: 0.85;
-khtml-opacity: 0.9; -khtml-opacity: 0.85;
margin: 0px 15px 0px 17px; margin-left: 8px;
margin-right: 18px;
} }
#logout_icon:hover { #logout_icon:hover {
@ -839,10 +841,10 @@ legend {
#domain_selector_icon { #domain_selector_icon {
filter: alpha(opacity=80); filter: alpha(opacity=80);
opacity: 0.9; opacity: 0.85;
-moz-opacity: 0.9; -moz-opacity: 0.85;
-khtml-opacity: 0.9; -khtml-opacity: 0.85;
margin: 0px 20px 0px 0px; padding-left: 10px;
} }
#domain_selector_icon:hover { #domain_selector_icon:hover {
@ -853,6 +855,26 @@ legend {
cursor: pointer; cursor: pointer;
} }
#domain_selector_domain {
display: <?php echo ($_SESSION['theme']['domain_visible']['text'] != 'true') ? 'none' : 'inline-block'; ?>;
white-space: nowrap;
padding: 2px 0px 1px 7px;
margin-top: 2px;
font-size: 12px;
opacity: 0.8;
-moz-opacity: 0.8;
-khtml-opacity: 0.8;
color: #fff;
}
#domain_selector_domain:hover {
filter: alpha(opacity=100);
opacity: 1;
-moz-opacity: 1;
-khtml-opacity: 1;
cursor: pointer;
}
#domains_container { #domains_container {
z-index: 99990; z-index: 99990;
position: absolute; position: absolute;
@ -963,6 +985,8 @@ legend {
$(document).ready(function() { $(document).ready(function() {
$("#message_text").mouseover(function() { $(this).hide(); $("#message_container").hide(); }); $("#message_text").mouseover(function() { $(this).hide(); $("#message_container").hide(); });
$("#domain_selector_domain").click(function() { show_domains(); });
$("#domain_selector_icon").click(function() { show_domains(); }); $("#domain_selector_icon").click(function() { show_domains(); });
$("#domains_hide").click(function() { hide_domains(); }); $("#domains_hide").click(function() { hide_domains(); });
@ -1102,17 +1126,17 @@ legend {
<td width="100%"><!--{menu}--></td> <td width="100%"><!--{menu}--></td>
<td style='white-space: nowrap;'> <td style='white-space: nowrap;'>
<?php <?php
//domain selector icon
if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
echo "<span id='domain_selector_domain'>".$_SESSION['domain_name']."</span><img id='domain_selector_icon' src='".PROJECT_PATH."/themes/minimized/images/icon_domain_selector.png' style='width: 28px; height: 23px; border: none;' title='".$_SESSION['domain_name']." &#10;".$text['theme-label-open_selector']."' align='absmiddle'>";
}
//logout icon //logout icon
if ($_SESSION['username'] != '') { if ($_SESSION['username'] != '') {
$username_full = $_SESSION['username'].((count($_SESSION['domains']) > 1) ? "@".$_SESSION["user_context"] : null); $username_full = $_SESSION['username'].((count($_SESSION['domains']) > 1) ? "@".$_SESSION["user_context"] : null);
echo "<a href='".PROJECT_PATH."/logout.php' onclick=\"return confirm('".$text['theme-confirm-logout']."');\"><img id='logout_icon' src='".PROJECT_PATH."/themes/minimized/images/icon_logout.png' style='width: 28px; height: 23px; border: none;' title='".$text['theme-label-logout']." ".$username_full."' align='absmiddle'></a>"; echo "<a href='".PROJECT_PATH."/logout.php' onclick=\"return confirm('".$text['theme-confirm-logout']."');\"><img id='logout_icon' src='".PROJECT_PATH."/themes/minimized/images/icon_logout.png' style='width: 28px; height: 23px; border: none;' title='".$text['theme-label-logout']." ".$username_full."' align='absmiddle'></a>";
unset($username_full); unset($username_full);
} }
//domain selector icon
if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
echo "<img id='domain_selector_icon' src='".PROJECT_PATH."/themes/minimized/images/icon_domain_selector.png' style='width: 28px; height: 23px; border: none;' title='".$_SESSION['domain_name']." &#10;".$text['theme-label-open_selector']."' align='absmiddle'>";
}
?> ?>
</td> </td>
</tr> </tr>