From c9c4e128a410fffdf3811c44f5d00057a5f03af3 Mon Sep 17 00:00:00 2001 From: manolobevia Date: Tue, 21 Jun 2011 22:15:45 +0000 Subject: [PATCH 1/9] NIHVIVO-2740: This fix layout issues in Chrome for PC and Mac --- webapp/web/css/individual/individual.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/webapp/web/css/individual/individual.css b/webapp/web/css/individual/individual.css index 4e890b093..7d76641b4 100644 --- a/webapp/web/css/individual/individual.css +++ b/webapp/web/css/individual/individual.css @@ -4,7 +4,6 @@ #admin { font-size: .8em; padding-top: 0; - padding-right: 40px; } #admin h3 { display: inline-block; @@ -210,7 +209,7 @@ h1.fn .preferred-title { } /* <------ INDIVIDUAL VISUALIZATION */ #visualization { - padding: 0 0 20px 30px; + padding: 0 0 20px 20px; padding-top: 0; float: right; background-color: #fff; From deeada041384c56cef28c922f5a1e2199e3257c6 Mon Sep 17 00:00:00 2001 From: ryounes Date: Tue, 21 Jun 2011 23:22:53 +0000 Subject: [PATCH 2/9] NIHVIVO-2746 Adjust role descriptors on role forms --- .../mannlib/vitro/webapp/utils/TitleCase.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/TitleCase.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/TitleCase.java index 9a82ef919..16db7e8de 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/TitleCase.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/TitleCase.java @@ -17,8 +17,12 @@ presents some admirably clear rules for capitalizing titles: (1) a, an, and the, (2) two and three letter conjunctions (and, or, nor, for, but, so, yet), (3) prepositions. - Exceptions: The first and last words are always capitalized even - if they are among the above three groups. + Exceptions: The first word is always capitalized even + if it is among the above three groups. For the last word, we can specify the + option to always capitalize it or to treat it like a medial word. The original + method always capitalized the final word, so to support the old method calls + we have defined another method to provide this as default behavior. + But consider the case: "It Waits Underneath the Sea" @@ -34,14 +38,19 @@ The default entries on the exception list are: to of by at for but in with has de von The observant may note that the last row is not composed of English words. The honorary -"de" has been included in honor of "Honoré de Balzac". And "von" was added for the sake +"de" has been included in honor of "Honore' de Balzac". And "von" was added for the sake of equal time. */ public class TitleCase { static String ignore[] = {"a","an","the","and","or","nor","for","but","so","yet", "to","of","by","at","for","but","in","with","has","de","von"}; + + public static String toTitleCase(String in) { + // Support old behavior without modifying method calls + return toTitleCase(in, true); + } - public static String toTitleCase(String in){ + public static String toTitleCase(String in, boolean alwaysCapitalizeLast){ if( in == null || in.length() ==0 ) return in; @@ -55,9 +64,12 @@ public class TitleCase { while(st.hasMoreTokens()){ String token = st.nextToken(); - //always capatize first and last - if( count == 1 || count == last ){ + // always capitalize first + if ( count == 1 || + // always capitalize last, unless we've asked not to + ( alwaysCapitalizeLast && count == last ) ) { out.append(capitalizeWord(token)); + } else { //check if on ignored list From a394d7aa0d31374b0376215237ead19308f4ec6b Mon Sep 17 00:00:00 2001 From: manolobevia Date: Wed, 22 Jun 2011 00:24:59 +0000 Subject: [PATCH 3/9] NIHVIVO-2739: Styled feedback messages when users edit their accounts using "My account" link --- webapp/web/images/iconConfirmation.png | Bin 1240 -> 1210 bytes .../body/accounts/userAccounts-myAccount.ftl | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/webapp/web/images/iconConfirmation.png b/webapp/web/images/iconConfirmation.png index a3993988a0a79bacc708e7aa77061c200bc8f570..1f17fb10b92a8bdc56b5e711aa8c28f4e5dcd1ab 100644 GIT binary patch delta 1152 zcmV-`1b_S33Azc8Nq<~PL_t(|+N4%%Oq*30e!fd7ZGpll3f-+M)RX`^18lfCH!*XY zED9#-3<}d98d#W#N@Dh7aWP(q(LYOwOJ@9`aXRK?kt{>~$qKl+af!}4pipE1vclS~ z^xpcOmVUNSzAf=2C*Qd~?{l8>zVG>X{Ld1NMrEtm`ine3=YL*s^wCq*QPnID`=~BZ zouL|(+b_xhtLalJWMFIM%P1>&2%A;8$Y*l_58Mlrun%=%l;gNj8v2XaI_}#5fp5(! zKuv8s>hu+OiWi|;xn{$oKt(-5x5v=m*NJX2)JH~syQcvH-&X!C4(@mZM@1#H9LID{ ze@dDY3ryHm|9=^_k6yrOG9u9MAQ_6JH9+8%Rj=U1>Q~Xm@yL(^Pm~DF^R)Ki2DEDO zk=OeH*p7i!1_<0(vIqOC8qvzY;~pXp9wwd~1caht2t=lM7hbA)9dmRNFP&nTt>Kf_ zn|Hp6W~Mh|E?3yJHw0vgIe2=@QPk)U(V&PZ2fm^K&3|-%kC73DWPsS~Nt#-X4yJp_ z5(5u2{gv2fXh(zTbG%l526e_`bP5F&naF#h4No${$tN(C?8eTOvaoh?pMm?sOd1aR z4K3Jfcw3r##&{fA3SF#SScV<+DNZ(^*XmK0qAvk2h2m^O>>>$0M4AVvzk6dN4i+DW z$g2}n(0?=bK0HBJte2UC4MpWJl1yrzpw+ z!1JaKsKh*p%&$|QqQ}+&U)Up!Jz$PSem3(W&4Xs-O0qE5B4)LlT2OELge19(4C?R0K(5c7L)YK$VJWyo>r$P;=Yp4I6`qn^zKKR3bha?w6feD$5qB7*-fVgzrr<2!}Ezn3W0f(7rm1wiET@4Y|&?@ zb{od;48@qI17}iOPT>+u;W4t+P2_q_h<^@z2|uL?e*Gh;p(AsN`-o7U`Nus9>*6K+ zK6@577y6+T<8$fCL?60_&*OWN$Ci@p=(7Kym^im?GYTo`HA>l#XRhmqb>VWnFRqe2 zS(?j~O*^T1ZLRlU@aGS~1%2?D_o12P`$UQmdHDo5GlYv5+VL?pt!usqbP5({{dshf z2yK|!b{H?@6rw^7*yn_Oq#IpVzrhdG9U*W}N^)H5(I+FDSVlBHj>^&lsL~d}pv=a) zm>c@wcF$tkX2JE5A8}>*O}3`ZzW4E0p{0+3Dtqv=lKv`KAWakSyxjhO1sDKKGM{wh SF!}%h00004tL_t(|+Kg6fY?DF-mklyhMKJA1{%_+aHjq;fE#|!=i!)WFZo8Y)rOpg$)f8bPUSc zb)~iadi6c$qc`>yILS$xbI$iX&-=XRyl4%TxX1B4k^GQPV#rr6iFkX>3T$8Q)PQdU&IS_@ zi}UZ$c{gmXR(y*jR_CA52-1A6z0ZYr?x@ogW$d^q0f~qwwcOm_4s$~tPk?a__@p z#sVTx44H+DzoNl}?&h6nvp}42`+lkOHuF$G{wNVz$tt( zvgjG@av!(61$v%2*6MWiEP^s=kNA>%6cjQ$0mn3pIP`c&vFKKrAK ztmx-!d&ghFv8laWfZky0sTsljCk~PNlYhB#y+vT^UwfnzI~Fg>C7qMg!zwpb!a+A` z!haM7A$RKvN;geerm{VP=)f>m()Ah46+7BZCh%$B0QLv2(!o51Mv5dD^Wn7bC|4*H zX^#y2%p@@6!JE_*2Iuz!YI%VGp8n}K>P`W&NX~(=2PBKoZN1D^cJ}l+;Md>rUVk!) zkM$dl_9|v)e0XeMA9f8-&~2l4Ase;C <#if confirmMessage?has_content> -