svn commit: [jahia] r17834 - in /trunk/core/src/webapp/jsp/jahia: administration/adminpopup.jsp engines/filemanager/info.jsp

[xlawrence]

Author: xlawrence
Date: Fri Jun 29 11:31:13 2007
New Revision: 17834

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17834&repname=
=3Djahia
Log:
correctly display integrity warnings

Modified:
    trunk/core/src/webapp/jsp/jahia/administration/adminpopup.jsp
    trunk/core/src/webapp/jsp/jahia/engines/filemanager/info.jsp

Modified: trunk/core/src/webapp/jsp/jahia/administration/adminpopup.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/adminpopup.jsp&rev=3D17834&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
--- trunk/core/src/webapp/jsp/jahia/administration/adminpopup.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/administration/adminpopup.jsp Fri Jun 2=
9 11:31:13 2007
@@ -82,20 +82,14 @@
 </form>
 =

 <div id=3D"copyrightPart">
-       <table border=3D"0" width=3D"100%">
-               <tr>
-                       <td width=3D"48">
-                               <img src=3D'<%=3Drequest.getContextPath() + 
"/jsp/jahia/images/logo-ja=
hia.gif" %>' width=3D"45" height=3D"34" alt=3D"Jahia Logo" />
-            </td>
-                       <td>
-             <div id=3D"copyright"><%=3Dcopyright%></div><span 
class=3D"version"=
>Jahia <%=3DJahia.VERSION%>.<%=3DJahia.PATCH_NUMBER%> r<%=3DJahia.BUILD_NUM=
BER%></span>
-    </td>
-</tr>
-</table>
+      <div class=3D"copyright">
+        <%=3Dcopyright%>
+     </div>
+     <span class=3D"version">
+        Jahia <%=3DJahia.VERSION%>.<%=3DJahia.PATCH_NUMBER%> r<%=3DJahia.B=
UILD_NUMBER%>
+     </span>
 </div>
 =

-<div id=3D"poweredby"><span>Powered by Jahia</span></div>
-
 </div>
 =

 </body>

Modified: trunk/core/src/webapp/jsp/jahia/engines/filemanager/info.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/filemanager/info.jsp&rev=3D17834&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
--- trunk/core/src/webapp/jsp/jahia/engines/filemanager/info.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/filemanager/info.jsp Fri Jun 29=
 11:31:13 2007
@@ -765,8 +765,11 @@
     if (msg !=3D null) { %>
 <tr>
     <td colspan=3D"2">
-        <p class=3D"errorbold">
-            <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.=
shared.BigText_Field.warning.label"/>:
+        <p>
+            <span class=3D"errorbold"><jahia:engineResourceBundle
+                    resourceName=3D"org.jahia.engines.shared.BigText_Field=
.warning.label"/>:</span>&nbsp;
+            <input type=3D"checkbox" name=3D"ignoreAllWarnings"/>&nbsp;<ja=
hia:engineResourceBundle
+                resourceName=3D"org.jahia.engines.shared.BigText_Field.ign=
oreWarning.label"/>
         </p>
         <ul class=3D"error">
             <jahia:engineResourceBundle resourceName=3D"<%=3D msg %>"/>: <=
br/>&nbsp;<br/>
@@ -776,17 +779,26 @@
                 - <%=3DContentFieldKey.FIELD_TYPE + "_" + usageEntry.getId=
()%>&nbsp;
                 <jahia:engineResourceBundle resourceName=3D"org.jahia.engi=
nes.filemanager.Filemanager_Engine.for.label"/>
                 &nbsp;
-                <%=3D((Object[]) futur403.get(i))[1]%>&nbsp;
+                <% final String name =3D ((Object[]) futur403.get(i))[1].t=
oString();
+                    final int index =3D name.indexOf(":");
+                if (index > -1) { %>
+                <%=3Dname.substring(0, index)%>&nbsp;
+                <% } else { %>
+                <%=3Dname%>&nbsp;
+                <% } %>
                 <a href=3D"javascript:<%=3DjData.gui().html().drawUpdateFi=
eldLauncher(usageEntry.getField().getContentField())%>"><img
-                        border=3D"0" src=3D"<jahia:serverHttpPath />/jsp/j=
ahia/engines/images/actions/action.gif"
-                        alt=3D"<jahia:engineResourceBundle resourceName=3D=
"org.jahia.engines.updatefiled.UpdateField_Engine.updateField.label"/>"/></=
a>
+                    border=3D"0" src=3D"<jahia:serverHttpPath />/jsp/jahia=
/engines/images/actions/update.gif"
+                    alt=3D"<jahia:engineResourceBundle resourceName=3D"org=
.jahia.engines.updatefiled.UpdateField_Engine.updateField.label"/>"
+                    title=3D"<jahia:engineResourceBundle resourceName=3D"o=
rg.jahia.engines.updatefiled.UpdateField_Engine.updateField.label"/>"/></a>
             </li>
             <% } %>
         </ul>
+        <span class=3D"error"><jahia:engineResourceBundle resourceName=3D"=
org.jahia.engines.filemanager.Filemanager_Engine.readPermissionConfirm.labe=
l"/></span>
     </td>
 </tr>
 =

 <% } %>
+
 <tr>
 <td valign=3D"top">
     <div id=3D"aclentries">

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list