diff --git a/Site5/Controls/v5/Base/FileUpload.ascx b/Site5/Controls/v5/Base/FileUpload.ascx index 20c09030..9d94e2cd 100644 --- a/Site5/Controls/v5/Base/FileUpload.ascx +++ b/Site5/Controls/v5/Base/FileUpload.ascx @@ -64,5 +64,5 @@ -
/>
​
+
/>
​
diff --git a/Site5/Controls/v5/Base/MainMenu.ascx.cs b/Site5/Controls/v5/Base/MainMenu.ascx.cs index 7b78c7a3..232f6b93 100644 --- a/Site5/Controls/v5/Base/MainMenu.ascx.cs +++ b/Site5/Controls/v5/Base/MainMenu.ascx.cs @@ -70,10 +70,12 @@ namespace Swarmops.Controls.Base localizedText = localizedText.Replace ("[Regular]", _regularLocalized); // TODO IF APPLICABLE - add other [Regulars] [Regularship] etc. localizedText = Server.HtmlEncode (localizedText); // muy importante + string cssClass = String.Empty; if (menuItem.Type == MenuItemType.BuildNumber) { localizedText = Swarmops.Logic.Support.Formatting.SwarmopsVersion; + cssClass = " class=\"buildId\""; } string iconSize = "40px"; @@ -100,11 +102,20 @@ namespace Swarmops.Controls.Base imageUrl = "/Images/PageIcons/transparency-16px.png"; // doesn't matter in slightest if browser resizes to 20px } - output.Write ("{1}", imageUrl, - localizedText); + output.Write ("{1}", imageUrl, + localizedText, cssClass); break; case MenuItemType.Submenu: - output.Write ("" + localizedText + ""); + if (string.IsNullOrEmpty (menuItem.ImageUrl)) + { + output.Write ("" + localizedText + ""); + } + else + { + output.Write( + "{2}", + menuItem.ImageUrl, prettyNavUrl, localizedText, iconSize); + } break; case MenuItemType.Separator: output.Write (" 
"); diff --git a/Site5/Images/Flags/Arabic-24px.png b/Site5/Images/Flags/Arabic-24px.png new file mode 100644 index 00000000..715ad408 Binary files /dev/null and b/Site5/Images/Flags/Arabic-24px.png differ diff --git a/Site5/Images/Flags/Arabic-64px.png b/Site5/Images/Flags/Arabic-64px.png new file mode 100644 index 00000000..fbbcfd50 Binary files /dev/null and b/Site5/Images/Flags/Arabic-64px.png differ diff --git a/Site5/MainMenu-v5.xml b/Site5/MainMenu-v5.xml index 2d3bd3dd..ed0c15a7 100644 --- a/Site5/MainMenu-v5.xml +++ b/Site5/MainMenu-v5.xml @@ -355,6 +355,7 @@ Ledgers_TaxForms 3 + iconshock-invoice Submenu @@ -362,7 +363,7 @@ Ledgers_TaxForms_Payroll 3 - + iconshock-invoice /Pages/v5/Ledgers/TaxForms/PayrollForms.aspx Link diff --git a/Site5/Master-v5.master.cs b/Site5/Master-v5.master.cs index 5c565c8c..91c3ab8d 100644 --- a/Site5/Master-v5.master.cs +++ b/Site5/Master-v5.master.cs @@ -54,12 +54,8 @@ namespace Swarmops { // Event subscriptions - // this.LanguageSelector.LanguageChanged += new EventHandler(LanguageSelector_LanguageChanged); - // Titles and other page elements - this.IconPage.ImageUrl = "/Images/PageIcons/" + CurrentPageIcon + "-40px.png"; - this.LabelPageTitle.Text = CurrentPageTitle; Page.Title = "Swarmops - " + CurrentPageTitle; this.ExternalScriptEasyUI.Controls = EasyUIControlsUsed.ToString(); @@ -212,6 +208,11 @@ namespace Swarmops flagName = cultureStringLower.Substring (3); } + if (cultureStringLower.StartsWith ("ar")) + { + flagName = "Arabic"; + } + if (cultureStringLower == "af-za") // "South African Afrikaans", a special placeholder for localization code { flagName = "txl"; diff --git a/Site5/Pages/v5/User/SelectLanguage.aspx.cs b/Site5/Pages/v5/User/SelectLanguage.aspx.cs index 2c2e25bc..c57c3fb7 100644 --- a/Site5/Pages/v5/User/SelectLanguage.aspx.cs +++ b/Site5/Pages/v5/User/SelectLanguage.aspx.cs @@ -37,7 +37,6 @@ namespace Swarmops.Frontend.Pages.v5.User foreach (string cultureId in availableCultures) { LanguageParameters newLanguage = new LanguageParameters(); - newLanguage.IconUrl = "/Images/Flags/" + cultureId.Substring (3, 2).ToLowerInvariant() + "-64px.png"; newLanguage.CultureId = cultureId; CultureInfo culture = CultureInfo.CreateSpecificCulture (cultureId); newLanguage.DisplayName = culture.NativeName; @@ -49,10 +48,14 @@ namespace Swarmops.Frontend.Pages.v5.User newLanguage.IconUrl = "/Images/Flags/uk-64px.png"; // use "uk" for en-GB and en-US rather than "gb" or "us" } - if (cultureId.StartsWith("ar")) + else if (cultureId.StartsWith ("ar")) { - newLanguage.IconUrl = "/Images/Flags/ae-64px.png"; - // crowdin's generic culture is ar-SA but we're not showing the SA flag + newLanguage.IconUrl = "/Images/Flags/Arabic-64px.png"; + // crowdin's generic culture is ar-SA but Arabic is not country specific + } + else + { + newLanguage.IconUrl = "/Images/Flags/" + cultureId.Substring(3, 2).ToLowerInvariant() + "-64px.png"; } if (culture.TextInfo.IsRightToLeft) { diff --git a/Site5/Style/Images/menu-arrow-left-white.png b/Site5/Style/Images/menu-arrow-left-white.png new file mode 100644 index 00000000..37c90f7b Binary files /dev/null and b/Site5/Style/Images/menu-arrow-left-white.png differ diff --git a/Site5/Style/Images/menu-arrow-left.png b/Site5/Style/Images/menu-arrow-left.png index 51e67295..633a7edd 100644 Binary files a/Site5/Style/Images/menu-arrow-left.png and b/Site5/Style/Images/menu-arrow-left.png differ diff --git a/Site5/Style/Images/menu-arrow-right-white.png b/Site5/Style/Images/menu-arrow-right-white.png new file mode 100644 index 00000000..28adc966 Binary files /dev/null and b/Site5/Style/Images/menu-arrow-right-white.png differ diff --git a/Site5/Style/Images/menu-arrow-right.png b/Site5/Style/Images/menu-arrow-right.png index 552745d4..1b60ff1b 100644 Binary files a/Site5/Style/Images/menu-arrow-right.png and b/Site5/Style/Images/menu-arrow-right.png differ diff --git a/Site5/Style/style-v5.css b/Site5/Style/style-v5.css index 51d5d691..46681175 100644 --- a/Site5/Style/style-v5.css +++ b/Site5/Style/style-v5.css @@ -206,6 +206,16 @@ body.rtl .searchbox input { font-weight: normal; } +body.rtl #ctl00_MainMenu { + left: inherit; + right: 20px; +} + +body.rtl span.buildId { + direction: ltr; /* parentheses freak out unless specified LTR */ +} + + /* BARS AND BOXEN */ @@ -228,6 +238,8 @@ body.rtl .mainbar { body.rtl .sidebar { float: left; + margin-left: inherit; + margin-right: 20px; } .box @@ -450,9 +462,7 @@ span.loginalphabetasign background: #EA8511; border: 1px solid #EA8511; box-shadow: 1px 1px 4px #7F5500; - background: -moz-linear-gradient(top, #FFC145, #F0AB22); - background: -webkit-linear-gradient(top, #FFC145, #F0AB22); - background: linear-gradient(top, #FFC145, #F0AB22); + background: linear-gradient(#FFC145, #F0AB22); text-shadow: #FFEDC8 0px 0px 3px, #FFEDC8 0px 0px 3px; border-color: #C78B15; position: relative; @@ -461,6 +471,12 @@ span.loginalphabetasign cursor: pointer; } +body.rtl .buttonAccentColor { + float:left; + left: inherit; + right: -1px; +} + .buttonAccentColor:hover, .buttonAccentColor:active { text-shadow: #FFF4E4 0px 0px 5px, #FFF4E4 0px 0px 5px, #FFF4E4 0px 0px 5px; @@ -472,10 +488,13 @@ span.loginalphabetasign left: -2px; box-shadow: 2px 2px 4px #7F5500; background: #FFC34D; - background: -moz-linear-gradient(top, #FFD580, #FFC34D); - background: -webkit-linear-gradient(top, #FFD580, #FFC34D); - background: linear-gradient(top, #FFD580, #FFC34D); + background: linear-gradient(#FFD580, #FFC34D); +} +body.rtl .buttonAccentColor:hover, +body.rtl .buttonAccentColor:focus { + left: inherit; + right: -2px; } @@ -505,6 +524,11 @@ span.loginalphabetasign -moz-border-radius: 4px; } +body.rtl .button-orange { + padding: 2px 20px 2px 4px; + background-position: right; +} + .button-orange:hover { text-shadow: #FFEDC8 0px 1px 3px, #FFBC37 0px 1px 3px; @@ -539,8 +563,7 @@ span.loginalphabetasign .entryFields { background: #A2BEFF; - background: -webkit-gradient(linear, left top, left bottom, from(#B0C8FF), to(#86A6F0)); - background: -moz-gradient(linear, left top, left bottom, from(#B0C8FF), to(#86A6F0)); + background: linear-gradient(#B0C8FF, #86A6F0); border-radius: 6px; line-height: 40px; float:right; @@ -553,11 +576,15 @@ span.loginalphabetasign font-size: 24px; width: 330px; - -webkit-box-shadow: 0 1px 3px 1px #1C397E; - -moz-box-shadow: 0 1px 3px 1px #1C397E; box-shadow: 0 1px 3px 1px #1C397E; } +body.rtl .entryFields { + float: left; + padding-left: 8px; + padding-right: 10px; +} + .entryFields input, .entryFields textarea, .entryFields select { @@ -595,6 +622,11 @@ span.loginalphabetasign overflow-x: hidden; } +body.rtl .entryLabels { + padding-left: inherit; + padding-right: 15px; +} + .content .entryLabels h2 { font-size: 130%; @@ -790,6 +822,10 @@ div#page-icon-encaps box-shadow: 0 1px 3px rgba(0, 0, 0, .4); } +body.rtl .sidebar h2 { + float: right; +} + .sidebar h2.blue { background-color: #A2BEFF; @@ -821,6 +857,11 @@ div#page-icon-encaps position: absolute; } +body.rtl .sidebar h2 span.arrow { + left: inherit; + right: 10px; +} + .sidebar h2.blue span.arrow { border-color: #86A6F0 transparent transparent transparent; @@ -1001,6 +1042,15 @@ input.ButtonSwarmopsUpload:active { } +.buttonUploadFile { + height:36px; + padding-top:4px; + float: left; +} + +body.rtl .buttonUploadFile { + float: right; +} .ImageFlag diff --git a/Site5/Style/superfish.css b/Site5/Style/superfish.css index 492f7c86..faec0951 100644 --- a/Site5/Style/superfish.css +++ b/Site5/Style/superfish.css @@ -143,14 +143,11 @@ body.rtl .sf-menu ul li img } .sf-menu li.Submenu li.Submenu { /* default: LTR website */ - background: #FF00FF url('/Style/submenu-rightarrow.png') no-repeat right top; /* testing selector */ - padding-left: 20px; /* no icon */ + background: #E4ECFF url('/Style/Images/menu-arrow-right.png') no-repeat right top; } body.rtl .sf-menu li.Submenu li.Submenu { /* Right-to-left override */ - background: #FF0044 url('/Style/submenu-leftarrow.png') no-repeat right top; /* testing selector */ - padding-left: inherit; - padding-right: 20px; /* no icon */ + background: #E4ECFF url('/Style/Images/menu-arrow-left.png') no-repeat left top; } /* -- commented out @@ -158,34 +155,35 @@ body.rtl .sf-menu li.Submenu li.Submenu { /* Right-to-left override */ background: #FF00FF; }*/ -.sf-menu li:not(.Separator):hover, .sf-menu li.sfHover +.sf-menu li:not(.Separator):hover, +.sf-menu li.sfHover { /* Same as Sidebar.Orange */ background-color: #FFBC37; - background: -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFC145', endColorstr='#F0AB22'); /* MSIE */ - background: -moz-linear-gradient(top, #FFC145, #F0AB22); /* Mozilla */ - background: -webkit-gradient(linear, left top, left bottom, from(#FFC145), to(#F0AB22)); /* Chrome, Safari */ - -webkit-transition: none; - -webkit-transition: none; - transition: none; + background: linear-gradient(#FFC145, #F0AB22); transition: none; box-shadow: #C78B15 0 0px 2px 0px inset; /* text-shadow: #C78B15 0px 0px 3px, #C78B15 0px 0px 3px; */ } + .sf-menu ul li:not(.Separator):hover, .sf-menu ul li.sfHover { background-color: #FFBC37; - background: -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFC145', endColorstr='#F0AB22'); /* MSIE */ - background: -moz-linear-gradient(top, #FFC145, #F0AB22); /* Mozilla */ - background: -webkit-gradient(linear, left top, left bottom, from(#FFC145), to(#F0AB22)); /* Chrome, Safari */ + background: linear-gradient(#FFC145, #F0AB22); /* only transition out, not in */ - -webkit-transition: none; - -webkit-transition: none; - transition: none; transition: none; } +.sf-menu li.Submenu li.Submenu:hover { + background: #FFBC37 url('/Style/Images/menu-arrow-right-white.png') no-repeat right top; /* how combine gradient with image? */ +} + +body.rtl .sf-menu li.Submenu li.Submenu:hover { + background: #FFBC37 url('/Style/Images/menu-arrow-left-white.png') no-repeat left top; /* how combine gradient with image? */ +} + + /*** arrows (for all except IE7) **/ .sf-menu ul ul.sf-arrows .sf-with-ul { padding-right: 2.5em; diff --git a/Site5/Style/v5-easyui-elements.css b/Site5/Style/v5-easyui-elements.css index 710194d7..17f07096 100644 --- a/Site5/Style/v5-easyui-elements.css +++ b/Site5/Style/v5-easyui-elements.css @@ -34,6 +34,12 @@ filter:alpha(opacity=40); } +body.rtl .combo-arrow { + left: inherit; + right: 3px; +} + + /* overrides when controls are used in page headers as part of a H2 */ .content h2 span span.combo {