xlawrence 2005/11/28 11:01:27 CET
Modified files:
core/src/conf/java JahiaEnginesResources.properties
JahiaEnginesResources_en.properties
JahiaEnginesResources_fr.properties
core/src/webapp/jsp/jahia/css colorsAndStyles.css
core/src/webapp/jsp/jahia/engines/containeredit
containeredit.jsp
core/src/webapp/jsp/jahia/engines/shared page_field.jsp
Added files:
core/src/webapp/jsp/jahia/css/images/icones
Boolean_type_big.gif
Number_type_big.gif
application_type_big.gif
big_type_big.gif
category_type_big.gif
colors_big.gif
date_type_big.gif
file_type_big.gif
page_type_big.gif
small_shared_type_big.gif
small_type_big.gif
Log:
- Added icons for field types in the engines
- Fixed bundles for the page Field
Revision Changes Path
1.45 +3 -3 jahia/core/src/conf/java/JahiaEnginesResources.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaEnginesResources.properties.diff?r1=1.44&r2=1.45&f=h
1.35 +3 -3
jahia/core/src/conf/java/JahiaEnginesResources_en.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaEnginesResources_en.properties.diff?r1=1.34&r2=1.35&f=h
1.45 +3 -3
jahia/core/src/conf/java/JahiaEnginesResources_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/conf/java/JahiaEnginesResources_fr.properties.diff?r1=1.44&r2=1.45&f=h
1.23 +80 -1 jahia/core/src/webapp/jsp/jahia/css/colorsAndStyles.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/colorsAndStyles.css.diff?r1=1.22&r2=1.23&f=h
1.1 +2 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/Boolean_type_big.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/Boolean_type_big.gif?rev=1.1&content-type=text/plain
1.1 +5 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/Number_type_big.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/Number_type_big.gif?rev=1.1&content-type=text/plain
1.1 +5 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/application_type_big.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/application_type_big.gif?rev=1.1&content-type=text/plain
1.1 +6 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/big_type_big.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/big_type_big.gif?rev=1.1&content-type=text/plain
1.1 +5 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/category_type_big.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/category_type_big.gif?rev=1.1&content-type=text/plain
1.1 +4 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/colors_big.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/colors_big.gif?rev=1.1&content-type=text/plain
1.1 +6 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/date_type_big.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/date_type_big.gif?rev=1.1&content-type=text/plain
1.1 +5 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/file_type_big.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/file_type_big.gif?rev=1.1&content-type=text/plain
1.1 +8 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/page_type_big.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/page_type_big.gif?rev=1.1&content-type=text/plain
1.1 +6 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/small_shared_type_big.gif
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/small_shared_type_big.gif?rev=1.1&content-type=text/plain
1.1 +1 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/small_type_big.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/small_type_big.gif?rev=1.1&content-type=text/plain
1.17 +2 -2
jahia/core/src/webapp/jsp/jahia/engines/containeredit/containeredit.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/containeredit/containeredit.jsp.diff?r1=1.16&r2=1.17&f=h
1.17 +2 -22
jahia/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp.diff?r1=1.16&r2=1.17&f=h
Index: JahiaEnginesResources.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/JahiaEnginesResources.properties,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- JahiaEnginesResources.properties 25 Nov 2005 17:53:15 -0000 1.44
+++ JahiaEnginesResources.properties 28 Nov 2005 10:01:24 -0000 1.45
@@ -829,9 +829,9 @@
org.jahia.engines.shared.Page_Field.exitingJahiaPage.label
= Existing Jahia Page (move)
org.jahia.engines.shared.Page_Field.exitingJahiaPageLink.label
= Existing Jahia Page (link)
org.jahia.engines.shared.Page_Field.ifThisPageIsChanged.label
= If this page is changed to a linked (<b>link</b> or <b>URL</b> below) page
type, the entire original page content will no <i>longer be available</i> until
you change back to a direct page type
-org.jahia.engines.shared.Page_Field.jahiaPageCreation.label
= Link creation
-org.jahia.engines.shared.Page_Field.jahiaPageEdition.label
= Link edition
-org.jahia.engines.shared.Page_Field.jahiaPageTitle.label
= Jahia page title (in the language set above)
+org.jahia.engines.shared.Page_Field.jahiaPageCreation.label
= Link/Page creation
+org.jahia.engines.shared.Page_Field.jahiaPageEdition.label
= Link/Page edition
+org.jahia.engines.shared.Page_Field.jahiaPageTitle.label
= Link/Page title
org.jahia.engines.shared.Page_Field.languages.label
= Languages
org.jahia.engines.shared.Page_Field.linkExistingPage.label
= <b>Link</b> to an existing Jahia page
org.jahia.engines.shared.Page_Field.linkOnly.label
= link only
Index: JahiaEnginesResources_en.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/JahiaEnginesResources_en.properties,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- JahiaEnginesResources_en.properties 25 Nov 2005 17:53:15 -0000
1.34
+++ JahiaEnginesResources_en.properties 28 Nov 2005 10:01:24 -0000
1.35
@@ -557,9 +557,9 @@
org.jahia.engines.shared.Page_Field.exitingJahiaPage.label
= Existing Jahia Page (move)
org.jahia.engines.shared.Page_Field.exitingJahiaPageLink.label
= Existing Jahia Page (link)
org.jahia.engines.shared.Page_Field.ifThisPageIsChanged.label
= If this page is changed to a linked (<b>link</b> or <b>URL</b> below) page
type, the entire original page content will no <i>longer be available</i> until
you change back to a direct page type
-org.jahia.engines.shared.Page_Field.jahiaPageCreation.label
= Link creation
-org.jahia.engines.shared.Page_Field.jahiaPageEdition.label
= Link edition
-org.jahia.engines.shared.Page_Field.jahiaPageTitle.label
= Jahia page title (in the language set above)
+org.jahia.engines.shared.Page_Field.jahiaPageCreation.label
= Link/Page creation
+org.jahia.engines.shared.Page_Field.jahiaPageEdition.label
= Link/Page edition
+org.jahia.engines.shared.Page_Field.jahiaPageTitle.label
= Link/Page title
org.jahia.engines.shared.Page_Field.languages.label
= Languages
org.jahia.engines.shared.Page_Field.linkExistingPage.label
= <b>Link</b> to an existing Jahia page
org.jahia.engines.shared.Page_Field.linkOnly.label
= link only
Index: JahiaEnginesResources_fr.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/conf/java/JahiaEnginesResources_fr.properties,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- JahiaEnginesResources_fr.properties 25 Nov 2005 17:53:15 -0000
1.44
+++ JahiaEnginesResources_fr.properties 28 Nov 2005 10:01:24 -0000
1.45
@@ -447,9 +447,9 @@
org.jahia.engines.shared.Page_Field.exitingJahiaPage.label
= Page déjà existante
(déplacer)
org.jahia.engines.shared.Page_Field.exitingJahiaPageLink.label
= Page déjà existante (lien)
org.jahia.engines.shared.Page_Field.ifThisPageIsChanged.label
= Si cette page est modifiée (<b>lien</b> ou <b>URL</b> ci-dessous) en
page de type lien, tout le contenu de la page originale sera
<i>inaccessible</i> jusqu'à ce qu'elle soit à nouveau
modifiée en type "page directe"
-org.jahia.engines.shared.Page_Field.jahiaPageCreation.label
= Création d'un lien
-org.jahia.engines.shared.Page_Field.jahiaPageEdition.label
= Edition d'un lien
-org.jahia.engines.shared.Page_Field.jahiaPageTitle.label
= Titre de la page Jahia (dans la langue sélectionnée
précédemment)
+org.jahia.engines.shared.Page_Field.jahiaPageCreation.label
= Création d'un lien ou d'une page
+org.jahia.engines.shared.Page_Field.jahiaPageEdition.label
= Edition d'un lien ou d'une page
+org.jahia.engines.shared.Page_Field.jahiaPageTitle.label
= Titre du lien ou de la page
org.jahia.engines.shared.Page_Field.languages.label
= langues
org.jahia.engines.shared.Page_Field.linkExistingPage.label
= <b>Lier</b> à une page Jahia existante
org.jahia.engines.shared.Page_Field.linkOnly.label
= link only
Index: colorsAndStyles.css
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/css/colorsAndStyles.css,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- colorsAndStyles.css 25 Nov 2005 09:48:56 -0000 1.22
+++ colorsAndStyles.css 28 Nov 2005 10:01:24 -0000 1.23
@@ -390,4 +390,83 @@
.small_shared_type {
background: url( "images/icones/small_shared_type.gif" ) no-repeat 10px
4px;
padding-left: 20px;
-}
\ No newline at end of file
+}
+
+/* Big Field Type icons */
+.number_type_big {
+ background: url( "images/icones/Number_type_big.gif" ) no-repeat 0px 0px;
+ height: 24px;
+ padding-left: 30px;
+ padding-top: 2px;
+}
+
+.small_type_big {
+ background: url( "images/icones/small_type_big.gif" ) no-repeat 0px 0px;
+ height: 24px;
+ padding-left: 30px;
+ padding-top: 2px;
+}
+
+.big_type_big {
+ background: url( "images/icones/big_type_big.gif" ) no-repeat 0px 0px;
+ height: 24px;
+ padding-left: 30px;
+ padding-top: 2px;
+}
+
+.date_type_big {
+ background: url( "images/icones/date_type_big.gif" ) no-repeat 0px 0px;
+ height: 24px;
+ padding-left: 30px;
+ padding-top: 2px;
+}
+
+.page_type_big {
+ background: url( "images/icones/page_type_big.gif" ) no-repeat 0px 0px;
+ height: 24px;
+ padding-left: 30px;
+ padding-top: 2px;
+}
+
+.file_type_big {
+ background: url( "images/icones/file_type_big.gif" ) no-repeat 0px 0px;
+ height: 24px;
+ padding-left: 30px;
+ padding-top: 2px;
+}
+
+.app_type_big {
+ background: url( "images/icones/application_type_big.gif" ) no-repeat
0px 0px;
+ height: 24px;
+ padding-left: 30px;
+ padding-top: 2px;
+}
+
+.boolean_type_big {
+ background: url( "images/icones/Boolean_type_big.gif" ) no-repeat 0px
0px;
+ height: 24px;
+ padding-left: 30px;
+ padding-top: 2px;
+}
+
+.color_type_big {
+ background: url( "images/icones/colors_big.gif" ) no-repeat 0px 0px;
+ height: 24px;
+ padding-left: 30px;
+ padding-top: 2px;
+}
+
+.category_type_big {
+ background: url( "images/icones/category_type_big.gif" ) no-repeat 0px
0px;
+ height: 24px;
+ padding-left: 30px;
+ padding-top: 2px;
+}
+
+.small_shared_type_big {
+ background: url( "images/icones/small_shared_type_big.gif" ) no-repeat
0px 0px;
+ height: 24px;
+ padding-left: 30px;
+ padding-top: 2px;
+}
+
Index: containeredit.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/containeredit/containeredit.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- containeredit.jsp 26 Nov 2005 17:28:54 -0000 1.16
+++ containeredit.jsp 28 Nov 2005 10:01:25 -0000 1.17
@@ -178,7 +178,7 @@
}
if (aField instanceof JahiaAllowApplyChangeToAllLangField) { %>
-<h4><%=aField.getDefinition().getTitle(pageDefID, elh.getCurrentLocale())%>
+<h4 class="<%=getIconClassName(aField.getType(),
false)%>"><%=aField.getDefinition().getTitle(pageDefID,
elh.getCurrentLocale())%>
<%
if (EngineValidationHelper.isFieldMandatory(theContainer, aField,
jParams)) {
%>
@@ -213,7 +213,7 @@
}
%>
<% if (theField instanceof JahiaAllowApplyChangeToAllLangField) { %>
-<h4><%=theField.getDefinition().getTitle(pageDefID, elh.getCurrentLocale())
%>
+<h4 class="<%=getIconClassName(theField.getType(),
false)%>"><%=theField.getDefinition().getTitle(pageDefID,
elh.getCurrentLocale()) %>
<%
if (EngineValidationHelper.isFieldMandatory(theContainer, theField,
jParams)) {
%>
Index: page_field.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- page_field.jsp 25 Nov 2005 16:21:27 -0000 1.16
+++ page_field.jsp 28 Nov 2005 10:01:25 -0000 1.17
@@ -239,7 +239,7 @@
</script>
-<h4>
+<h4 class="page_type_big">
<% if (isNewPage) { %>
<jahia:engineResourceBundle
resourceName="org.jahia.engines.shared.Page_Field.jahiaPageCreation.label"/>
<% } else { %>
@@ -470,27 +470,4 @@
document.mainForm.elements["page_title"].select();
}
setfocus();
-</script>
-<%
- /**
- * $Log: page_field.jsp,v $
- * Revision 1.16 2005/11/25 16:21:27 xlawrence
- * Some GUI fixes when displaying validation error messages
- *
- * Revision 1.15 2005/11/24 18:13:28 xlawrence
- * - Added visual support for mandatory fields (Engine menu and Fields)
- * - Added method the EVH to easiyl know if a field is mandatory using
the validation framework
- * - Some CSS adaptation
- *
- * Revision 1.14 2005/11/09 15:04:14 xlawrence
- * JAHIA-516
- * - Corrected javascript problem when trying to change a page field
into a Linked page. The URL contained 2 "?"
- *
- * Revision 1.13 2005/10/21 14:02:37 dpillot
- * http://www.jahia.net/jira/browse/JAHIA-341
- *
- * Revision 1.12 2005/10/21 14:02:00 dpillot
- * http://www.jahia.net/jira/browse/JAHIA-341
- *
- */
-%>
\ No newline at end of file
+</script>
\ No newline at end of file
Index: Boolean_type_big.gif
===================================================================
<<Binary file>>
Index: Number_type_big.gif
===================================================================
<<Binary file>>
Index: application_type_big.gif
===================================================================
<<Binary file>>
Index: big_type_big.gif
===================================================================
<<Binary file>>
Index: category_type_big.gif
===================================================================
<<Binary file>>
Index: colors_big.gif
===================================================================
<<Binary file>>
Index: date_type_big.gif
===================================================================
<<Binary file>>
Index: file_type_big.gif
===================================================================
<<Binary file>>
Index: page_type_big.gif
===================================================================
<<Binary file>>
Index: small_shared_type_big.gif
===================================================================
<<Binary file>>
Index: small_type_big.gif
===================================================================
<<Binary file>>
