From 5be93e252e93589d6836f55583123442d2aba573 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sat, 7 Feb 2015 14:02:02 +0100 Subject: [PATCH] Lots of work on RTL styles; CSS cleanup --- Site5/Controls/v5/Base/FileUpload.ascx | 2 +- Site5/Controls/v5/Base/MainMenu.ascx.cs | 17 ++++- Site5/Images/Flags/Arabic-24px.png | Bin 0 -> 1008 bytes Site5/Images/Flags/Arabic-64px.png | Bin 0 -> 2806 bytes Site5/MainMenu-v5.xml | 3 +- Site5/Master-v5.master.cs | 9 ++- Site5/Pages/v5/User/SelectLanguage.aspx.cs | 11 ++- Site5/Style/Images/menu-arrow-left-white.png | Bin 0 -> 306 bytes Site5/Style/Images/menu-arrow-left.png | Bin 616 -> 415 bytes Site5/Style/Images/menu-arrow-right-white.png | Bin 0 -> 299 bytes Site5/Style/Images/menu-arrow-right.png | Bin 616 -> 402 bytes Site5/Style/style-v5.css | 70 +++++++++++++++--- Site5/Style/superfish.css | 34 ++++----- Site5/Style/v5-easyui-elements.css | 6 ++ 14 files changed, 111 insertions(+), 41 deletions(-) create mode 100644 Site5/Images/Flags/Arabic-24px.png create mode 100644 Site5/Images/Flags/Arabic-64px.png create mode 100644 Site5/Style/Images/menu-arrow-left-white.png create mode 100644 Site5/Style/Images/menu-arrow-right-white.png 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 0000000000000000000000000000000000000000..715ad408a04c8b9c1f02670304f87d5e9288c553 GIT binary patch literal 1008 zcmVe zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00US_L_t(Y$L*C*Xk1kk#((#{ z>&zrfCB`%+6&}P+YkfIW;h?^=XG3v&Et_0CVBML5TiVzo4 zM3jOSsUW3l!I)GN)9BcliPOw`GwvjxLlN^Ik$S*M7?vu@xYe}U-)UB!%*z~L)=jkP;l0P0_KKz%K-1z|fmdfV zDPgpRF$QD!$F{s2ap(R?Ui;tzL9ps;Fj_;C65flkrKMT6bS3z}<2N2$R|aYF0~$_I zksfs8qZjMG^dep&&i^up6%kZ5Gm&)#=Lqzc2qpIt^ z(9gg4gm32;cyP}M1>4G?#U-i)Ns{24YX|r%6A_}Qj;z^RE|)m;!U1+4*vnIojk5io zn>lv!1Zj&)R1oI~l4g_CrHBa5xjzxBDl=!k=9!nrs7DP{m8JO^_B_0o)NW$x@KL6w z-(zRzW*&cflv1VK_I1u-qc|pxpkW)-Yc+m4JI|(T`zdr3+R~evp5*=G$2s`ODD~eL z8GHRzUYU54!Tvrx**`nqzLn=Eo}*f=(35Kt$1!n3uxXMY65_q5*@#(bMC3X;2m;d% zFtYy%CXXKB{%7xH>HBlIWo525Off8CLrZ|C(x?#lJ`NQ(KmuMp;vCkAAd;ydj$@)) znE;QfZ#Ph`ql;ZbLsWmwvwdJ29#78Z5D}6_LJ)=wU3WXXhwr1a%j#T*ybK zjuCej*t&TOHZZKLT;TMXldLo>oxXs?(k5q7X{rPEb z>)pV_JL3d|gvQ{~gj}+l@tmdMMS4C84rlFlVTP>S4SJlSg*dTfG05oYbJ3jkw eo`%b~H2wgeP&j1^Njil90000e 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 IM6N<$f_sxdcmMzZ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..37c90f7bc6e2c7e8b157205b5790c0c86c626cff GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRr!3HExu9B$%Qfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#J`+2ag?M1W zLV0FMhJw4NZ$Nk>pEyv_EKe855R21qFBxVrB?=triF+JBVktRk(ZZS)jRStcR zC2gAB4P*V3%C;T!J9GY!=yuMB(YODGe?GWprnzyvk%7Sl>5%IcAsTa%W~Rj55j4&z zbP86gJH}NlUiabC{1*$i?#^r7pI1{}{QuTLm6OqvTqhk@3Ef`T`B!TGjR!ZZZaiFB v(rIc}ka0Zo*S-I;@fCZY3tyFpzn{)MwR4V|`Gn0tS2B3I`njxgN@xNAJlt_t literal 0 HcmV?d00001 diff --git a/Site5/Style/Images/menu-arrow-left.png b/Site5/Style/Images/menu-arrow-left.png index 51e672957e4a2897f497531b34935655cc8dffc1..633a7eddbab2f563f58470707708829ce3cd007d 100644 GIT binary patch delta 339 zcmV-Z0j&P$1fK&TiBL{Q4GJ0x0000DNk~Le0000G0000M2nGNE0LiKxe32nD2Nom` z3F|8pky|K#2T4RhR5;7+lFchbVHAg-^LFRb7@C?$Ns=uK3uP|+WE34u^kM5&+WDu>n$TXgVF-}Ldv{H0tyS8 zb-blp5wnUjqd+sNKX(f^;m-7Zw1dxvjELz~=mE_EQdQOJR*ACTKfd8-8*_OPmVklZ zg%9|yFWe3u{{&P(lUshaJ~Jdnk3iC>?GE>Y5`c*VxISF`I4e$_I_t)OOGGMXm|Fhe l{2;gk)#&O#OWLtodw3}K*z>t!dahlzkAR5&wt@Bg-qj+ zrS)ycpjf6jI6r*xG)&9!{}d2^pQ~``FA6MMSl9x8I%&C@AM(oCxBGQ9Z%1Iqpw5rj zjmy{kkk57TWE1p>A&(GTR*j#hRo4Gh6;C%Xse#Rc*iE(mq_a@0g=!Te7(oCm#H33> z!(5=>03uaP0t^S1C{_&Unhm$a^}DwQEv;`mdZhr39hVx62V7qg3vC#6UyqS?`ilk+ z%A(PKD&hqOC4?GADHU*CRqEShGb(;Pw_a%%9Xf-Gpe@9bnPe*~k245Bqq*k_Q1QfD z6p331DL^r>4zS96?|7Uucv-jjaB>ixog7>QkC(e*ycN8*h%F@7n@>6-z#P~DHv8uE z{mYBI^0uS>l`G)1(cJr3FwPXJs=5JI8@*0w972%g43jMEFF+R&sxO-fZ04roJQid} z`zu$W#_c$Yo&(1~2P2#|2!Ihx+fi(5X0j&8yDVpz#(yM@<})`V56j-Y{+GjyrTwQq f(Yv^d|1f?6B*ML{B$y+300000NkvXXu0mjfwnFao 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 0000000000000000000000000000000000000000..28adc96695b96db271557b78660aec464d184803 GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRr!3HExu9B$%Qfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#J`+2axmI68^LC(+WQl7;iF1B#Zfaf$gL6@8Vo7R> zLV0FMhJw4NZ$Nk>pEyv_WKS2z5R21qFB)bsF^aT2j8wdJW9fzs0wOG|-7<%~K3G^f zpL-Cv<+Dmsx^~&5zdm{`kyt+-1v;Qm6cVT!^LOo!Y>xrBwyNgP-wqJ;;kKm zX*+&BZ<6nsJxj(`Q{K(m$6&>61<#O@iBF7AYMl(9lo6hRcmzwhnFxj;Nn2v}?(BwA=A7UIbTMTBr*V`VA9 z`YZz0(eA1fVk)t?*483vuS@W6@UHL{j2u{8jOS!`=UHqba%7j?^RT)P1_s_^elzcT zGXwl5F)Pq$ZX1jjm$5h=?!A3s{}tqA1+LwCdXdi~My=TCddv>?fh zM9wHsBd{at?dZ|PTBEsZW)DgWYZP1sCv~TVNxtjD^T90$1VMF_+b6{`_)Es z+swwJJ5Q=`Tmv)!;HQIEC{m}ghN$wjjCa|fdk=r=$-*Hib%2*nJJe6-3_z}x0WxnF z>(AbQ-4y@A2Pkg8RS&vdkjMrAMUj|SN zq_6;b0QxSDTUKPh+u8UvP1j_D7Q`~wA4D$FT-x|>m3uDSl`HwI4F7_#Pv)Bpeg07*qoM6N<$f=wRvx&QzG 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 {