Author: xlawrence
Date: Fri Aug 31 12:02:55 2007
New Revision: 18322
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18322&repname=
=3Djahia
Log:
resolve issue http://www.jahia.net/jira/browse/JAHIA-2194: Share with all l=
anguages option in order to turn on/off - the icon trick is really difficul=
t to guess from a end-user perspective - we need to find something else
Added a new icon illustrating the shared feature
Added:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icone=
s/sharedLang_off_no.gif (with props)
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icone=
s/sharedLang_off_yes.gif (with props)
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icone=
s/sharedLang_off_yes_grey.gif (with props)
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icone=
s/sharedLang_on_no.gif (with props)
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icone=
s/sharedLang_on_yes.gif (with props)
Removed:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icone=
s/Boolean_type_linked.gif
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icone=
s/Number_type_linked.gif
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icone=
s/application_type_linked.gif
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icone=
s/big_type_linked.gif
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icone=
s/category_type_linked.gif
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icone=
s/colors_linked.gif
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icone=
s/date_type_linked.gif
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icone=
s/file_type_linked.gif
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icone=
s/page_type_linked.gif
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icone=
s/small_shared_type_linked.gif
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icone=
s/small_type_linked.gif
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/colorsAndSty=
les.css
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/containe=
redit/containeredit.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/containe=
redit/containereditmenu.inc
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/containe=
redit/fieldedit.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources.properties&rev=3D18322&rep=
name=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties Fri Aug 31 12:02:55 2007
@@ -522,7 +522,9 @@
org.jahia.engines.tools.label =3D Tools
org.jahia.engines.noTools.label =3D No tools available
=
-org.jahia.applyToAllLanguages.label =3D Apply to all languages
+org.jahia.applyToAllLanguages.label =3D Copy value into all languages
+org.jahia.applyToSingleLanguage.label =3D DO NOT copy value into all lang=
uages
+org.jahia.sameInAllLanguage.label =3D The value will be the same in all la=
nguages
org.jahia.altApplyAndAddContainer.label =3D Apply the modifications and ad=
d new content object (Ctrl+m)
org.jahia.altApplyAndClose.label =3D Apply modifications and close window =
(Ctrl+enter)
org.jahia.altApplyWithoutClose.label =3D Apply the modifications whithout =
closing the window
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_en.properties&rev=3D18322&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties Fri Aug 31 12:02:55 2007
@@ -522,7 +522,9 @@
org.jahia.engines.tools.label =3D Tools
org.jahia.engines.noTools.label =3D No tools available
=
-org.jahia.applyToAllLanguages.label =3D Apply to all languages
+org.jahia.applyToAllLanguages.label =3D Copy value into all languages
+org.jahia.applyToSingleLanguage.label =3D DO NOT copy value into all lang=
uages
+org.jahia.sameInAllLanguage.label =3D The value will be the same in all la=
nguages
org.jahia.altApplyAndAddContainer.label =3D Apply the modifications and ad=
d new content object (Ctrl+m)
org.jahia.altApplyAndClose.label =3D Apply modifications and close window =
(Ctrl+enter)
org.jahia.altApplyWithoutClose.label =3D Apply the modifications whithout =
closing the window
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_fr.properties&rev=3D18322&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties Fri Aug 31 12:02:55 2007
@@ -117,7 +117,9 @@
org.jahia.altApplyAndClose.label =3D Appliquer les modifications et fermer=
la fen=C3=AAtre (Ctrl+Entr=C3=A9e)
org.jahia.altApplyWithoutClose.label =3D Appliquer les modifications sans =
fermer la fen=C3=AAtre
org.jahia.altCloseWithoutSave.label =3D Fermer la fen=C3=AAtre sans enregi=
strer les modifications (Ctrl+w)
-org.jahia.applyToAllLanguages.label =3D Appliquer =C3=A0 toutes les langues
+org.jahia.applyToAllLanguages.label =3D Copier la valeur dans toutes les l=
angues
+org.jahia.applyToSingleLanguage.label =3D NE PAS copier la valeur dans tou=
tes les langues
+org.jahia.sameInAllLanguage.label =3D La valeur sera la m=C3=AAme dans tou=
tes les langues
org.jahia.bin.Jahia.jahiaWarning.label =3D Avertissement Jahia
org.jahia.bin.Jahia.serverLocked.label =3D D=C3=A9sol=C3=A9 ! Le serv=
eur est verrouill=C3=A9 en mode exclusif et n'est accessible que pour l'adm=
inistrateur.<br><br>Aucun autre acc=C3=A8s n'est autoris=C3=A9. Veuillez es=
sayer ult=C3=A9rieurement.
org.jahia.bin.JahiaErrorDisplay.accessForbidden.label =3D L'acc=C3=A8s =C3=
=A0 cette page est limit=C3=A9. Causes possibles : la page n'existe qu'en m=
ode de travail (staging), vous avez des droits insuffisants ou votre sessio=
n a expir=C3=A9.
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/colors=
AndStyles.css
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/css/colorsAndStyles.css&rev=3D18322&repna=
me=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/colorsAndSty=
les.css (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/colorsAndSty=
les.css Fri Aug 31 12:02:55 2007
@@ -196,7 +196,7 @@
}
=
#wrapper .navBox .button a:link,
- #wrapper .navBox .button a:visited {
+#wrapper .navBox .button a:visited {
text-decoration: none;
background-image: url( bg_button_up.gif );
border: 1px solid;
@@ -516,81 +516,37 @@
}
=
/* icons for shared lang */
-.number_type_linked {
- background: url( "images/icones/Number_type_linked.gif" ) no-repeat 0p=
x 0px;
- height: 24px;
- padding-left: 30px;
- padding-top: 2px;
-}
-
-.small_type_linked {
- background: url( "images/icones/small_type_linked.gif" ) no-repeat 0px=
0px;
- height: 24px;
- padding-left: 30px;
- padding-top: 2px;
-}
-
-.big_type_linked {
- background: url( "images/icones/big_type_linked.gif" ) no-repeat 0px 0=
px;
- height: 24px;
- padding-left: 30px;
- padding-top: 2px;
-}
-
-.date_type_linked {
- background: url( "images/icones/date_type_linked.gif" ) no-repeat 0px =
0px;
- height: 24px;
- padding-left: 30px;
- padding-top: 2px;
-}
-
-.page_type_linked {
- background: url( "images/icones/page_type_linked.gif" ) no-repeat 0px =
0px;
- height: 24px;
- padding-left: 30px;
- padding-top: 2px;
-}
-
-.file_type_linked {
- background: url( "images/icones/file_type_linked.gif" ) no-repeat 0px =
0px;
- height: 24px;
- padding-left: 30px;
- padding-top: 2px;
-}
-
-.app_type_linked {
- background: url( "images/icones/application_type_linked.gif" ) no-repe=
at 0px 0px;
- height: 24px;
- padding-left: 30px;
- padding-top: 2px;
+.sharedLanguageNo:link,
+.sharedLanguageNo:visited,
+.sharedLanguageNo:active {
+ background: url( "images/icones/sharedLang_off_no.gif" ) no-repeat 0px=
0px;
+ text-decoration: none;
+ padding-left: 20px;
+ font-size: 19px;
}
-
-.boolean_type_linked {
- background: url( "images/icones/Boolean_type_linked.gif" ) no-repeat 0=
px 0px;
- height: 24px;
- padding-left: 30px;
- padding-top: 2px;
+.sharedLanguageNo:hover {
+ background: url( "images/icones/sharedLang_on_no.gif" ) no-repeat 0px =
0px;
+ text-decoration: none;
}
=
-.color_type_linked {
- background: url( "images/icones/colors_linked.gif" ) no-repeat 0px 0px;
- height: 24px;
- padding-left: 30px;
- padding-top: 2px;
+.sharedLanguageYes:link,
+.sharedLanguageYes:visited,
+.sharedLanguageYes:active {
+ background: url( "images/icones/sharedLang_off_yes.gif" ) no-repeat 0p=
x 0px;
+ text-decoration: none;
+ padding-left: 20px;
+ font-size: 19px;
}
=
-.category_type_linked {
- background: url( "images/icones/category_type_linked.gif" ) no-repeat =
0px 0px;
- height: 24px;
- padding-left: 30px;
- padding-top: 2px;
+.sharedLanguageYes:hover {
+ background: url( "images/icones/sharedLang_on_yes.gif" ) no-repeat 0px=
0px;
+ text-decoration: none;
}
=
-.small_shared_type_linked {
- background: url( "images/icones/small_shared_type_linked.gif" ) no-rep=
eat 0px 0px;
- height: 24px;
- padding-left: 30px;
- padding-top: 2px;
+.sharedLanguageYesDisabled {
+ background: url( "images/icones/sharedLang_off_yes_grey.gif" ) no-repe=
at 0px 0px;
+ padding-left: 20px;
+ font-size: 19px;
}
=
/* Big Field Type icons */
Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/ic=
ones/sharedLang_off_no.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icones/sharedLang_off_n=
o.gif&rev=3D18322&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
Binary file - no diff available.
Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/ic=
ones/sharedLang_off_yes.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icones/sharedLang_off_y=
es.gif&rev=3D18322&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
Binary file - no diff available.
Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/ic=
ones/sharedLang_off_yes_grey.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icones/sharedLang_off_y=
es_grey.gif&rev=3D18322&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
Binary file - no diff available.
Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/ic=
ones/sharedLang_on_no.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icones/sharedLang_on_no=
.gif&rev=3D18322&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
Binary file - no diff available.
Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/ic=
ones/sharedLang_on_yes.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/images/icones/sharedLang_on_ye=
s.gif&rev=3D18322&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
Binary file - no diff available.
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/co=
ntaineredit/containeredit.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/containeredit/containeredit.jsp&r=
ev=3D18322&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/containe=
redit/containeredit.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/containe=
redit/containeredit.jsp Fri Aug 31 12:02:55 2007
@@ -26,7 +26,7 @@
<%@ page import=3D"org.jahia.params.ProcessingContext"%>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<%!
- private static String getIconClassName(final int type, final boolean s=
mall, final boolean applyChangeToAllLang) {
+ private static String getIconClassName(final int type, final boolean s=
mall) {
final String className;
switch (type) {
case FieldTypes.UNDEFINED:
@@ -85,9 +85,6 @@
className =3D "undefined_type";
break;
}
- if (applyChangeToAllLang) {
- return className + "_linked";
- }
if (small)
return className;
else
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/co=
ntaineredit/containereditmenu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/containeredit/containereditmenu.i=
nc&rev=3D18322&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/containe=
redit/containereditmenu.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/containe=
redit/containereditmenu.inc Fri Aug 31 12:02:55 2007
@@ -134,7 +134,7 @@
while (fieldNames.hasNext()) {
final JahiaField currField =3D feh.getField((Strin=
g) fieldNames.next());
final int type =3D currField.getType();
- final String className =3D getIconClassName(type, =
true, false);
+ final String className =3D getIconClassName(type, =
true);
final boolean isMandatory =3D EngineValidationHelp=
er.isFieldMandatory(theContainer,
currField, jParams);
final String name =3D currField.getDefinition().ge=
tTitle(pageDefinitionID,
@@ -200,7 +200,7 @@
while (fieldNames.hasNext()) {
final JahiaField currField =3D feh.getField((String) f=
ieldNames.next());
final int type =3D currField.getType();
- final String className =3D getIconClassName(type, true=
, false);
+ final String className =3D getIconClassName(type, true=
);
final String name =3D currField.getDefinition().getTit=
le(pageDefinitionID,
elh.getCurrentLocale());
if (isCurrentFieldGroup) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/co=
ntaineredit/fieldedit.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/containeredit/fieldedit.inc&rev=
=3D18322&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/containe=
redit/fieldedit.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/containe=
redit/fieldedit.inc Fri Aug 31 12:02:55 2007
@@ -24,38 +24,40 @@
errorMsg =3D "";
}
if (aField instanceof JahiaAllowApplyChangeToAllLangField) { %>
-
-<% if (localeList.size() > 1 && !readOnlyMode && !aField.isShared() &&
- ServicesRegistry.getInstance().getJahiaACLManagerService().hasWrit=
eAccesOnAllLangs(jParams)) { %>
<script type=3D"text/javascript">
- function switchIcons() {
+ function switchIcons(callingElementID) {
var element =3D document.getElementById("apply_change_to_all_lang_=
<%=3DaField.getID()%>");
+ var callingElement =3D document.getElementById(callingElementID);
if (element) {
var theValue =3D element.value;
if (theValue =3D=3D "true") {
theValue =3D "false";
+ callingElement.className =3D "sharedLanguageNo";
+ callingElement.title =3D '<jahia:engineResourceBundle reso=
urceName=3D"org.jahia.applyToSingleLanguage.label"/>';
} else {
- theValue =3D "true"; =
+ theValue =3D "true";
+ callingElement.className =3D "sharedLanguageYes";
+ callingElement.title =3D '<jahia:engineResourceBundle reso=
urceName=3D"org.jahia.applyToAllLanguages.label"/>';
}
element.value =3D theValue;
- changeField('<%=3DaField.getID()%>');
}
}
</script>
+<h4 class=3D"<%=3DgetIconClassName(aField.getType(), false) %>">
+<% if (localeList.size() > 1 && !readOnlyMode && !aField.isShared() &&
+ ServicesRegistry.getInstance().getJahiaACLManagerService().hasWrit=
eAccesOnAllLangs(jParams)) { %>
+ <a id=3D"switchIcons_<%=3DaField.getID()%>" href=3D"javascript:switchI=
cons('switchIcons_<%=3DaField.getID()%>');" title=3D'<jahia:engineResourceB=
undle resourceName=3D"org.jahia.applyToSingleLanguage.label"/>' class=3D"sh=
aredLanguageNo"> </a>
=
-<h4 <% if (applyChangeToAllLang) { %> title=3D'<jahia:engineResourceBundle=
resourceName=3D"org.jahia.applyToAllLanguages.label"/>' <% } %> onclick=3D=
"switchIcons()" class=3D"<%=3DgetIconClassName(aField.getType(), false, app=
lyChangeToAllLang)%>">
- <% } else { %>
-<h4 <% if (aField.isShared() || applyChangeToAllLang) { %>
- title=3D'<jahia:engineResourceBundle resourceName=3D"org.jahia=
.applyToAllLanguages.label"/>' <% } %>
- class=3D"<%=3DgetIconClassName(aField.getType(), false, applyC=
hangeToAllLang || aField.isShared())%>">
- <% } %>
- <%=3DaField.getDefinition().getTitle(pageDefID, elh.getCurrentLoca=
le())%>
- <%
- if (EngineValidationHelper.isFieldMandatory(theContainer, aFie=
ld, jParams)) {
- %>
+<% } else { %>
+ <% if (aField.isShared()) { %>
+ <span title=3D"<jahia:engineResourceBundle resourceName=3D'org.jahia.s=
ameInAllLanguage.label'/>" class=3D"sharedLanguageYesDisabled"> </span>
+ <% } %>
+ <% } %>
+ <%=3DaField.getDefinition().getTitle(pageDefID, elh.getCurrentLoca=
le()) %>
+ <% if (EngineValidationHelper.isFieldMandatory(theContainer, aFiel=
d, jParams)) { %>
<span class=3D"errorbold">(*)</span>
- <%}%>
- </h4>
+ <% } %>
+</h4>
<input id=3D"apply_change_to_all_lang_<%=3DaField.getID()%>" type=3D"h=
idden"
name=3D"apply_change_to_all_lang_<%=3DaField.getID()%>" value=
=3D"<%=3DapplyChangeToAllLang%>"/>
<% if (errorMsg !=3D null && errorMsg.length() > 0) { %>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
