Author: dpillot
Date: Fri Sep 21 15:25:55 2007
New Revision: 18623
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18623&repname=
=3Djahia
Log:
http://www.jahia.net/jira/browse/JAHIA-2163
the back link was (as commonly) on the top left gauge icon, it seems not en=
ough(?) so i've added a more explicit button
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/processing/displ=
aylog.jsp
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=3D18623&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 Sep 21 15:25:55 2007
@@ -1539,6 +1539,7 @@
org.jahia.engines.importexport.import.languages =3D Languages do not match=
, {0} is not defined for this site.
=
##process Display
+org.jahia.engines.processDisplay.back =3D Back to Process
org.jahia.engines.processDisplay.label =3D Process
org.jahia.engines.processDisplay.title =3D Process Display
org.jahia.engines.processDisplay.subtitle =3D Process Monitor
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=3D18623&=
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 Sep 21 15:25:55 2007
@@ -1657,4 +1657,5 @@
org.jahia.engines.processDisplay.error.errors=3Derrors logs
org.jahia.engines.processDisplay.error.see=3Dto see the
org.jahia.engines.processDisplay.warning.warnings=3Dwarnings logs
-org.jahia.engines.processDisplay.allmessages.message=3Dsee all logs
\ No newline at end of file
+org.jahia.engines.processDisplay.allmessages.message=3Dsee all logs
+org.jahia.engines.processDisplay.back=3DBack to Process
\ No newline at end of file
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=3D18623&=
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 Sep 21 15:25:55 2007
@@ -1217,3 +1217,4 @@
workflowWarningsActive =3D /jsp/jahia/engines/images/icons/workflow/warnin=
gs_active.gif
workflowdefault =3D /jsp/jahia/engines/images/icons/workflow/accept.gif
workflowreject =3D /jsp/jahia/engines/images/icons/workflow/refuse.gif
+org.jahia.engines.processDisplay.back=3DRetour a la fenetre des processus
\ No newline at end of file
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/processing=
/displaylog.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/processing/displaylog.jsp&rev=3D18623&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/webapp/jsp/jahia/processing/displ=
aylog.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/processing/displ=
aylog.jsp Fri Sep 21 15:25:55 2007
@@ -245,7 +245,66 @@
background-color: #ddEEdd;
}
=
+/* ------------------------------------------------ */
+/* BUTTON STRUCT */
+/* ------------------------------------------------ */
+ .button {
+ display: inline;
+}
+
+ .button a:link,
+ .button a:visited,
+.button div.clicked,
+ .button div.disabledButton {
+ text-decoration: none;
+ border: 1px solid;
+ font-size: 11px;
+ cursor: default;
+ font-style: normal;
+ padding: 5px 5px 5px 5px;
+ margin-left: 6px;
+ font-weight: bold;
+ height: 24px;
+ display: inline;
+}
+
+ .button a:link,
+ .button a:visited,
+ .button div.clicked {
+ color: black;
+ border-color: #D0D0D0 #555555 #555555 #D0D0D0;
+ background-image: url( bg_button_up.gif );
+}
+
+ .button div.disabledButton {
+ color: #a1a192;
+ background-color: #f5f4ea;
+ border-color: #a1a192 #a1a192 #a1a192 #a1a192;
+}
+
+ .button a:focus,
+ .button a:hover {
+ border-top: 1px solid;
+ border-right: 2px solid;
+ border-left: 1px solid;
+ border-bottom: 2px solid;
+ border-color: #D0D0D0 #555555 #555555 #D0D0D0;
+ cursor: default;
+ margin-left: 5px;
+ height: 24px;
+}
+
+.button a:active {
+ background-image: url( bg_button_down.gif );
+ border: 1px solid;
+ border-color: #555555 #D0D0D0 #D0D0D0 #555555;
+ cursor: default;
+ margin-left: 6px;
+}
=
+
+
+/* ------------------------------------------------ */
</style>
=
=
@@ -260,14 +319,20 @@
<td align=3D"left"><h3>
<%=3DgetRessource("org.jahia.engines.processDisplay.label", lo=
cale)%>
</h3></td>
+ <td align=3D"right"><div id=3D"buttons">
+ <div class=3D"button">
+ <a href=3D"javascript:history.back();"
+ title=3D"<%=3DgetRessource("org.jahia.chat.wind=
ow.close", locale)%>"><%=3DgetRessource("org.jahia.engines.processDisplay.b=
ack", locale)%></a>
+ </div>
+ </div></td>
</tr>
=
<tr>
- <td colspan=3D"2"><%=3Dbuff.toString()%>
+ <td colspan=3D"3"><%=3Dbuff.toString()%>
</td>
</tr>
<tr>
- <td colspan=3D"2">
+ <td colspan=3D"3">
=
<table border=3D"0" width=3D"100%">
<tr>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
