Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Integrated new translations to UI, ffixed css for dialogs

  • Loading branch information...
commit 981383fe7f76f2b57ba874d28b4c8909d9fd4901 1 parent 15c7bcf
@marioestrada marioestrada authored
View
46 dialogs.css
@@ -386,11 +386,17 @@
overflow: hidden;
position: absolute;
top: 85px;
- bottom: 30px;
+ height: 0;
+ bottom: auto;
left: 0;
right: 0;
pointer-events: none;
}
+.panel-hider.open{
+ height: auto;
+ bottom: 30px;
+ pointer-events: auto;
+}
.panel-hider .dlg-window{
position: absolute;
display: block;
@@ -409,18 +415,15 @@
-ms-box-shadow: none;
-o-box-shadow: none;
box-shadow: none;
- -webkit-transition: top 0.25s linear;
+/* -webkit-transition: top 0.25s linear;
-moz-transition: top 0.25s linear;
-ms-transition: top 0.25s linear;
-o-transition: top 0.25s linear;
- transition: top 0.25s linear;
+ transition: top 0.25s linear;*/
}
-.panel-hider.open{
- pointer-events: auto;
-}
-.panel-hider.open .dlg-window{
+/*.panel-hider.open .dlg-window{
top: 0;
-}
+}*/
/**************************************************
* DIALOG: Settings
@@ -724,10 +727,13 @@ input[id="gui.dlrate_menu"] {
/* float: left;*/
}
#dlgSettings input.btn{
+ cursor: pointer;
height: 21px;
width: auto;
min-width: 70px;
- padding: 0 3px;
+ padding: 0 5px;
+ color: #333;
+ text-shadow: 0 1px #fff;
-webkit-border-radius: 4px !important;
-moz-border-radius: 4px !important;
-ms-border-radius: 4px !important;
@@ -739,6 +745,9 @@ input[id="gui.dlrate_menu"] {
-o-box-shadow: 0 1px 3px rgba(0,0,0,0.1);
box-shadow: 0 1px 3px rgba(0,0,0,0.1);
}
+#dlgSettings input.btn:hover{
+ border-color: #888;
+}
#dlgSettings input.tbox{
text-indent: 4px;
height: 19px;
@@ -783,11 +792,24 @@ input[id="gui.dlrate_menu"] {
background: none;
border: 0;
margin: 0;
- top: 8px;
+ top: 6px;
right: 10px;
}
-#dlgSettings .dlg-foot input.btn{
- margin-bottom: 10px;
+#dlgSettings .dlg-foot .btn{
+ height: 25px;
+ padding: 0 10px;
+ font-weight: bold;
+}
+#DLG_SETTINGS_CLOSE{
+ opacity: 0.8;
+ height: 16px;
+ width: 16px;
+ float: right;
+ margin: 5px 5px 0 10px;
+ background: url(./images/panel_close.png);
+}
+#DLG_SETTINGS_CLOSE:hover{
+ opacity: 1;
}
#total_uploaded_history,
View
BIN  images/panel_close.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
3  lang/_.js
@@ -466,6 +466,9 @@ var LANG_CONST = [
, "DLG_ABOUT_VERSION_USER_AGENT"
, "DLG_ABOUT_UPNP_EXTERNAL_ADDRESS"
, "DLG_ABOUT_UI_REVISION"
+
+ , "DLG_SETTINGS_SAVE"
+ , "DLG_SETTINGS_MENU_TITLE"
].invert();
View
3  lang/en.js
@@ -465,7 +465,8 @@ var LANG_STR = [
, "UPnP external address:"
, "UI Revision"
- , "Save"
+ , "Save settings"
+ , "Settings"
];
/* README : If you add any strings *Please consider updating fallback.js */
View
3  lang/es.js
@@ -464,5 +464,6 @@ var LANG_STR = [
, "Dirección externa de UPnP:"
, "Revisión de UI"
- , "Guardar"
+ , "Guardar ajustes"
+ , "Ajustes"
];
View
3  lang/fallback.js
@@ -467,5 +467,6 @@ var LANG_STR_fallback = [
, "UPnP external address:"
, "UI Revision"
- , "Save"
+ , "Save settings"
+ , "Settings"
];
View
40 main.js
@@ -999,26 +999,37 @@ function setupSettings() {
// -- OK Button
- $("DLG_SETTINGS_03").addEvent("click", function() {
- //DialogManager.hide("Settings");
+ // $("DLG_SETTINGS_03").addEvent("click", function() {
+ // //DialogManager.hide("Settings");
+ // utWebUI.hideSettings();
+ // utWebUI.setSettings();
+ // });
+
+ // -- Save Button
+ $("DLG_SETTINGS_SAVE").addEvent("click", function() {
utWebUI.hideSettings();
utWebUI.setSettings();
});
+
+ $("DLG_SETTINGS_CLOSE").addEvent("click", function(e) {
+ e.preventDefault();
+ utWebUI.hideSettings();
+ });
// -- Cancel Button
- $("DLG_SETTINGS_04").addEvent("click", function(ev) {
- utWebUI.hideSettings(true);
- //$("dlgSettings").getElement(".dlg-close").fireEvent("click", ev);
- // Fire the "Close" button's click handler to make sure
- // controls are restored if necessary
- });
+ // $("DLG_SETTINGS_04").addEvent("click", function(ev) {
+ // utWebUI.hideSettings(true);
+ // //$("dlgSettings").getElement(".dlg-close").fireEvent("click", ev);
+ // // Fire the "Close" button's click handler to make sure
+ // // controls are restored if necessary
+ // });
// -- Apply Button
- $("DLG_SETTINGS_05").addEvent("click", function(ev) {
- utWebUI.setSettings();
- });
+ // $("DLG_SETTINGS_05").addEvent("click", function(ev) {
+ // utWebUI.setSettings();
+ // });
// -- Close Button
@@ -1966,10 +1977,15 @@ function loadSettingStrings() {
// -- Buttons
_loadStrings("value", [
- "DLG_SETTINGS_4_CONN_04" // "Random"
+ "DLG_SETTINGS_SAVE" // "Save settings"
+ , "DLG_SETTINGS_4_CONN_04" // "Random"
, "DLG_SETTINGS_7_TRANSFERCAP_12" // "Reset History"
, "DLG_SETTINGS_A_ADVANCED_05" // "Set"
]);
+
+ _loadStrings("text", [
+ "DLG_SETTINGS_MENU_TITLE" // "Settings"
+ ]);
// -- Comboboxes
_loadComboboxStrings("gui.dblclick_seed", L_("ST_CBO_UI_DBLCLK_TOR").split("||"), utWebUI.settings["gui.dblclick_seed"]);
View
24 webui.js
@@ -2844,19 +2844,29 @@ var utWebUI = {
},
"showSettings": function() {
- var hider = jQuery("#settingsHider");
- hider.addClass('open');
- // hider.children('.dlg-window').animate({ top: '+=100%' }, 250);
+ this.animateToggle(true);
+ //DialogManager.show("Settings");
},
"hideSettings": function(load_settings) {
if(load_settings)
utWebUI.loadSettings();
- var hider = jQuery("#settingsHider");
- hider.removeClass('open');
- // hider.children('.dlg-window').animate({ top: '-=100%' }, 250);
- //DialogManager.show("Settings");
+ this.animateToggle(false);
+ },
+
+ "animateToggle": function(show) {
+ var _top = show ? '0%' : '-100%';
+
+ if(show)
+ jQuery("#settingsHider").addClass('open');
+
+ jQuery('#dlgSettings').animate(
+ { top: _top }, 350, 'linear',
+ function(){
+ jQuery("#settingsHider").toggleClass('open', show);
+ }
+ );
},
"searchExecute": function() {
Please sign in to comment.
Something went wrong with that request. Please try again.