sites_management.jsp

sshyrkov Mon, 21 Jan 2008 09:56:27 -0800

Author: sshyrkov
Date: Mon Jan 21 18:56:13 2008
New Revision: 19559

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19559&repname=
=3Djahia
Log:
JAHIA-2626: Jahia Include Tag - Manage Template Sets
http://www.jahia.net/jira/browse/JAHIA-2626
Resolution: added template set name information to the site properties. No =
special template set management will be implemented for now


Modified:
    branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/sites/M=
anageSites.java
    branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/site_edit.jsp
    branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/sites_management.jsp

Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/s=
ites/ManageSites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/admin/sites/ManageSites.java&rev=3D195=
59&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/sites/M=
anageSites.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/sites/M=
anageSites.java Mon Jan 21 18:56:13 2008
@@ -1458,6 +1458,7 @@
             request.setAttribute("defaultSite", defaultSite);
             request.setAttribute("versioningEnabled", versioningEnabled);
             request.setAttribute("stagingEnabled", stagingEnabled);
+            request.setAttribute("siteTemplatePackageName", site.getTempla=
tePackageName());
 =

             // redirect...
             JahiaAdministration.doRedirect(request, response, session, JSP=
_PATH + "site_edit.jsp");

Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/admin=
istration/site_edit.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/jsp/jahia/administration/site_edit.jsp&rev=3D1=
9559&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-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/site_edit.jsp (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/site_edit.jsp Mon Jan 21 18:56:13 2008
@@ -91,6 +91,14 @@
     </tr>
     <tr>
         <td>
+            <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.sit=
e.ManageSites.templateSet.label"/>
+        </td>
+        <td>
+            :&nbsp;<%=3D request.getAttribute("siteTemplatePackageName") %>
+        </td>
+    </tr>
+    <tr>
+        <td>
             <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.sit=
e.ManageSites.setAsDefaultSite.label"/>&nbsp;
         </td>
         <td>

Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/admin=
istration/sites_management.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/jsp/jahia/administration/sites_management.jsp&=
rev=3D19559&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-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/sites_management.jsp (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/sites_management.jsp Mon Jan 21 18:56:13 2008
@@ -79,10 +79,10 @@
                 <thead>
                 <tr>
                     <th        width=3D"5%">&nbsp;</th>
-                    <th width=3D"20%"><jahia:adminResourceBundle resourceN=
ame=3D"org.jahia.admin.name.label"/></th>
-                    <th width=3D"10%" style=3D"white-space: nowrap"><jahia=
:adminResourceBundle resourceName=3D"org.jahia.admin.site.ManageSites.siteK=
ey.label"/></th>
-                    <th width=3D"53%"><jahia:adminResourceBundle resourceN=
ame=3D"org.jahia.admin.site.ManageSites.siteDesc.label"/></th>
-                    <th        width=3D"12%"><jahia:adminResourceBundle 
resourceN=
ame=3D"org.jahia.admin.site.ManageSites.actions.label"/></th>
+                    <th width=3D"35%"><jahia:adminResourceBundle resourceN=
ame=3D"org.jahia.admin.name.label"/></th>
+                    <th width=3D"12%" style=3D"white-space: nowrap"><jahia=
:adminResourceBundle resourceName=3D"org.jahia.admin.site.ManageSites.siteK=
ey.label"/></th>
+                    <th width=3D"35%"><jahia:adminResourceBundle resourceN=
ame=3D"org.jahia.admin.site.ManageSites.templateSet.label"/></th>
+                    <th        width=3D"13%"><jahia:adminResourceBundle 
resourceN=
ame=3D"org.jahia.admin.site.ManageSites.actions.label"/></th>
                 </tr>
               </thead>
         <form name=3D"main">
@@ -105,7 +105,7 @@
                                 <td><input type=3D"checkbox" name=3D"siteb=
ox" value=3D"<%=3Dsite.getSiteKey()%>"></td>
                                 <td><%=3Dsite.getTitle()%></td>
                                 <td><%=3Dsite.getSiteKey()%></td>
-                                <td><%=3Dsite.getDescr()%></td>
+                                <td><%=3Dsite.getTemplatePackageName()%></=
td>
                                 <td>
                                     <a href=3D'<%=3DJahiaAdministration.co=
mposeActionURL(request,response,"sites","&sub=3Dedit&siteid=3D" + site.getI=
D())%>' title=3D"<jahia:adminResourceBundle resourceName=3D'org.jahia.admin=
.edit.label'/>"><img src=3D"<%=3DURL%>images/icons/admin/site_edit.png" alt=
=3D"<jahia:adminResourceBundle resourceName=3D'org.jahia.admin.edit.label'/=
>" title=3D"<jahia:adminResourceBundle resourceName=3D'org.jahia.admin.edit=
.label'/>" width=3D"16" height=3D"16" border=3D"0"/></a>
                                     &nbsp;

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

svn commit: [jahia] r19559 - in /branches/JAHIA-INCLUDE-TAG-BRANCH/core/src: java/org/jahia/admin/sites/ManageSites.java webapp/jsp/jahia/administration/site_edit.jsp webapp/jsp/jahia/administration/sites_management.jsp

Reply via email to