mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-02 20:02:29 +01:00
Added third custom light blue theme
Fixed issues with displaying correct language string on the language dropdown choice selection
This commit is contained in:
parent
0fe9322895
commit
16cf4d5289
@ -517,6 +517,7 @@ label.template.limits=Template Limits
|
||||
label.template=Template
|
||||
label.theme.default=Default Theme
|
||||
label.theme.grey=Custom - Grey
|
||||
label.theme.lightblue=Custom - Light Blue
|
||||
label.thursday=Thursday
|
||||
label.time=Time
|
||||
label.timezone=Timezone
|
||||
|
||||
@ -511,8 +511,9 @@ label.tags = Etiquetas
|
||||
label.target.iqn = Objetivo IQN
|
||||
label.template.limits = Plantilla Límites
|
||||
label.template = plantilla
|
||||
label.theme.default = tema por defecto
|
||||
label.theme.grey = Personal - Gris
|
||||
label.theme.default =Tema Por Defecto
|
||||
label.theme.grey =Personal - Gris
|
||||
label.theme.lightblue=Personal - Azul
|
||||
label.thursday = Jueves
|
||||
label.time = Tiempo
|
||||
label.timezone = Zona horaria
|
||||
|
||||
@ -512,7 +512,8 @@ label.target.iqn =ターゲットのIQN
|
||||
label.template.limits =テンプレートの制限
|
||||
label.template =テンプレート
|
||||
label.theme.default =デフォルトテーマ
|
||||
label.theme.grey =カスタム - グレー
|
||||
label.theme.grey =カスタム - グレー
|
||||
label.theme.lightblue=カスタム - ライトブルー
|
||||
label.thursday =木曜日
|
||||
label.time =時間
|
||||
label.timezone =タイムゾーン
|
||||
|
||||
@ -512,7 +512,8 @@ label.target.iqn =目标IQN
|
||||
label.template.limits =模板限制
|
||||
label.template =模板
|
||||
label.theme.default =默认主题
|
||||
label.theme.grey =自定义 - 灰色
|
||||
label.theme.grey =自定义 - 灰色
|
||||
label.theme.lightblue=自定义 - 浅蓝
|
||||
label.thursday =星期四
|
||||
label.time =时间
|
||||
label.timezone =时区
|
||||
|
||||
@ -154,7 +154,8 @@
|
||||
<div id="theme_menu" class="loginoptions_dropdown" style="display:none;">
|
||||
<ul>
|
||||
<li id="theme_default"><fmt:message key="label.theme.default"/></li>
|
||||
<li id="custom/custom1/css/custom1.css"><fmt:message key="label.theme.grey"/></li>
|
||||
<li id="custom1"><fmt:message key="label.theme.grey"/></li>
|
||||
<li id="custom2"><fmt:message key="label.theme.lightblue"/></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -42,12 +42,13 @@ $(document).ready(function() {
|
||||
// Setup custom theme
|
||||
var $currentTheme = null;
|
||||
if ($.cookie("theme") != null) {
|
||||
var theme = $.cookie("theme");
|
||||
$currentTheme = $("<link>").appendTo("head").attr({
|
||||
rel: "stylesheet",
|
||||
type: "text/css",
|
||||
href: $.cookie("theme")
|
||||
href: "custom/"+theme+"/css/"+theme+".css"
|
||||
});
|
||||
$("#theme_button p").text($.cookie("theme.name"));
|
||||
$("#theme_button p").text($("#theme_button #theme_menu #"+theme).text());
|
||||
}
|
||||
$("#theme_button").click(function(event) {
|
||||
var $menu = $(this).find("#theme_menu");
|
||||
@ -70,17 +71,15 @@ $(document).ready(function() {
|
||||
$currentTheme = $("<link>").appendTo("head").attr({
|
||||
rel: "stylesheet",
|
||||
type: "text/css",
|
||||
href: id
|
||||
href: "custom/"+id+"/css/"+id+".css"
|
||||
});
|
||||
name = target.text();
|
||||
$.cookie("theme.name", name);
|
||||
$.cookie("theme", id);
|
||||
} else {
|
||||
if ($currentTheme != null) {
|
||||
$currentTheme.remove();
|
||||
}
|
||||
$.cookie("theme", null);
|
||||
$.cookie("theme.name", null);
|
||||
name = "Default Theme";
|
||||
}
|
||||
$("#theme_button p").text(name);
|
||||
@ -90,7 +89,7 @@ $(document).ready(function() {
|
||||
|
||||
// Setup Language option
|
||||
if ($.cookie("lang") != null) {
|
||||
$("#lang_button p").text($("#lang_button #lang_menu #"+$.cookie("lang")));
|
||||
$("#lang_button p").text($("#lang_button #lang_menu #"+$.cookie("lang")).text());
|
||||
}
|
||||
|
||||
$("#lang_button").click(function(event) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user