pvollenweider 2005/10/10 15:47:30 CEST
Modified files:
core/src/webapp/jsp/jahia/administration menu.jsp
work_in_progress.html
core/src/webapp/jsp/jahia/engines/images/icons
admin_components_off.gif
admin_components_on.gif
admin_groups_off.gif
admin_groups_on.gif
admin_pages_off.gif
admin_pages_on.gif
admin_templates_off.gif
admin_templates_on.gif
admin_users_off.gif
admin_users_on.gif
flag_off.gif
flag_on.gif
home_off.gif
home_on.gif
search_off.gif
search_on.gif
Added files:
core/src/webapp/jsp/jahia/engines/images/icons
clip_builder_off.gif
clip_builder_on.gif
export_off.gif
export_on.gif
Log:
Change server layout in site settings
Revision Changes Path
1.8 +10 -10 jahia/core/src/webapp/jsp/jahia/administration/menu.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/menu.jsp.diff?r1=1.7&r2=1.8&f=h
1.5 +1 -1
jahia/core/src/webapp/jsp/jahia/administration/work_in_progress.html
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/work_in_progress.html.diff?r1=1.4&r2=1.5&f=h
1.2 +1 -1
jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_components_off.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_components_off.gif.diff?r1=1.1&r2=1.2&f=h
1.2 +5 -1
jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_components_on.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_components_on.gif.diff?r1=1.1&r2=1.2&f=h
1.2 +8 -2
jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_groups_off.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_groups_off.gif.diff?r1=1.1&r2=1.2&f=h
1.2 +8 -1
jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_groups_on.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_groups_on.gif.diff?r1=1.1&r2=1.2&f=h
1.2 +4 -2
jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_pages_off.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_pages_off.gif.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -1
jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_pages_on.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_pages_on.gif.diff?r1=1.1&r2=1.2&f=h
1.2 +3 -1
jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_templates_off.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_templates_off.gif.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1
jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_templates_on.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_templates_on.gif.diff?r1=1.1&r2=1.2&f=h
1.2 +9 -1
jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_users_off.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_users_off.gif.diff?r1=1.1&r2=1.2&f=h
1.2 +13 -1
jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_users_on.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/admin_users_on.gif.diff?r1=1.1&r2=1.2&f=h
1.1 +4 -0
jahia/core/src/webapp/jsp/jahia/engines/images/icons/clip_builder_off.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/clip_builder_off.gif?rev=1.1&content-type=text/plain
1.1 +17 -0
jahia/core/src/webapp/jsp/jahia/engines/images/icons/clip_builder_on.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/clip_builder_on.gif?rev=1.1&content-type=text/plain
1.1 +9 -0
jahia/core/src/webapp/jsp/jahia/engines/images/icons/export_off.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/export_off.gif?rev=1.1&content-type=text/plain
1.1 +8 -0
jahia/core/src/webapp/jsp/jahia/engines/images/icons/export_on.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/export_on.gif?rev=1.1&content-type=text/plain
1.2 +4 -2
jahia/core/src/webapp/jsp/jahia/engines/images/icons/flag_off.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/flag_off.gif.diff?r1=1.1&r2=1.2&f=h
1.2 +10 -1
jahia/core/src/webapp/jsp/jahia/engines/images/icons/flag_on.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/flag_on.gif.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2
jahia/core/src/webapp/jsp/jahia/engines/images/icons/home_off.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/home_off.gif.diff?r1=1.1&r2=1.2&f=h
1.2 +5 -3
jahia/core/src/webapp/jsp/jahia/engines/images/icons/home_on.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/home_on.gif.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -3
jahia/core/src/webapp/jsp/jahia/engines/images/icons/search_off.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/search_off.gif.diff?r1=1.1&r2=1.2&f=h
1.2 +4 -2
jahia/core/src/webapp/jsp/jahia/engines/images/icons/search_on.gif
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/images/icons/search_on.gif.diff?r1=1.1&r2=1.2&f=h
Index: menu.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/administration/menu.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- menu.jsp 10 Oct 2005 13:14:31 -0000 1.7
+++ menu.jsp 10 Oct 2005 13:47:28 -0000 1.8
@@ -172,46 +172,46 @@
<% if ( siteID.intValue() > 0 ) { %>
<tr>
- <td class="text"><%if(isSuperAdmin.booleanValue() ||
!profileCapability.booleanValue()){%><br><br><%}%><a
href='<%=JahiaAdministration.composeActionURL(request,response,"pages","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('pages','','<%=URL%>images/icons/admin_pages_on.gif',1)"><img
align="left" name="pages" src="<%=URL%>images/icons/admin_pages_off.gif"
width="16" height="16" border="0">
+ <td class="text"><%if(isSuperAdmin.booleanValue() ||
!profileCapability.booleanValue()){%><br><br><%}%><a
href='<%=JahiaAdministration.composeActionURL(request,response,"pages","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('pages','','<%=URL%>images/icons/admin_pages_on.gif',1)"><img
align="left" name="pages" src="<%=URL%>images/icons/admin_pages_off.gif"
width="24" height="24" border="0">
<jahia:adminResourceBundle
resourceName="org.jahia.admin.pageSettings.label"/></a></td>
</tr>
<tr>
- <td class="text"><a
href='<%=JahiaAdministration.composeActionURL(request,response,"users","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('users','','<%=URL%>images/icons/admin_users_on.gif',1)"><img
align="left" name="users" src="<%=URL%>images/icons/admin_users_off.gif"
width="16" height="16" border="0">
+ <td class="text"><a
href='<%=JahiaAdministration.composeActionURL(request,response,"users","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('users','','<%=URL%>images/icons/admin_users_on.gif',1)"><img
align="left" name="users" src="<%=URL%>images/icons/admin_users_off.gif"
width="24" height="24" border="0">
<jahia:adminResourceBundle
resourceName="org.jahia.admin.manageUsers.label"/></a></td>
</tr>
<tr>
- <td class="text"><a
href='<%=JahiaAdministration.composeActionURL(request,response,"groups","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('groups','','<%=URL%>images/icons/admin_groups_on.gif',1)"><img
align="left" name="groups" src="<%=URL%>images/icons/admin_groups_off.gif"
width="16" height="16" border="0">
+ <td class="text"><a
href='<%=JahiaAdministration.composeActionURL(request,response,"groups","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('groups','','<%=URL%>images/icons/admin_groups_on.gif',1)"><img
align="left" name="groups" src="<%=URL%>images/icons/admin_groups_off.gif"
width="24" height="24" border="0">
<jahia:adminResourceBundle
resourceName="org.jahia.admin.manageGroups.label"/></a></td>
</tr>
<tr>
- <td class="text"><a
href='<%=JahiaAdministration.composeActionURL(request,response,"components","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('components','','<%=URL%>images/icons/admin_components_on.gif',1)"><img
align="left" name="components"
src="<%=URL%>images/icons/admin_components_off.gif" width="16" height="16"
border="0">
+ <td class="text"><a
href='<%=JahiaAdministration.composeActionURL(request,response,"components","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('components','','<%=URL%>images/icons/admin_components_on.gif',1)"><img
align="left" name="components"
src="<%=URL%>images/icons/admin_components_off.gif" width="24" height="24"
border="0">
<jahia:adminResourceBundle
resourceName="org.jahia.admin.manageComponents.label"/></a></td>
</tr>
<tr>
- <td class="text"><a
href='<%=JahiaAdministration.composeActionURL(request,response,"templates","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('templates','','<%=URL%>images/icons/admin_templates_on.gif',1)"><img
align="left" name="templates"
src="<%=URL%>images/icons/admin_templates_off.gif" width="16" height="16"
border="0">
+ <td class="text"><a
href='<%=JahiaAdministration.composeActionURL(request,response,"templates","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('templates','','<%=URL%>images/icons/admin_templates_on.gif',1)"><img
align="left" name="templates"
src="<%=URL%>images/icons/admin_templates_off.gif" width="24" height="24"
border="0">
<jahia:adminResourceBundle
resourceName="org.jahia.admin.manageTemplates.label"/></a></td>
</tr>
<tr>
- <td class="text"><a
href='<%=JahiaAdministration.composeActionURL(request,response,"search","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('search','','<%=URL%>images/icons/search_on.gif',1)"><img
align="left" name="search" src="<%=URL%>images/icons/search_off.gif"
width="16" height="16" border="0">
+ <td class="text"><a
href='<%=JahiaAdministration.composeActionURL(request,response,"search","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('search','','<%=URL%>images/icons/search_on.gif',1)"><img
align="left" name="search" src="<%=URL%>images/icons/search_off.gif"
width="24" height="24" border="0">
<jahia:adminResourceBundle
resourceName="org.jahia.admin.manageSearchEngine.label"/></a></td>
</tr>
<tr>
- <td class="text"><a
href='<%=JahiaAdministration.composeActionURL(request,response,"homepages","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('homepages','','<%=URL%>images/icons/home_on.gif',1)"><img
align="left" name="homepages" src="<%=URL%>images/icons/home_off.gif"
width="16" height="16" border="0">
+ <td class="text"><a
href='<%=JahiaAdministration.composeActionURL(request,response,"homepages","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('homepages','','<%=URL%>images/icons/home_on.gif',1)"><img
align="left" name="homepages" src="<%=URL%>images/icons/home_off.gif"
width="24" height="24" border="0">
<jahia:adminResourceBundle
resourceName="org.jahia.admin.manageHomePageDefinitions.label"/></a></td>
</tr>
<tr>
- <td class="text"><a
href='<%=JahiaAdministration.composeActionURL(request,response,"siteLanguages","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('languages','','<%=URL%>images/icons/flag_on.gif',1)"><img
align="left" name="languages" src="<%=URL%>images/icons/flag_off.gif"
width="16" height="16" border="0">
+ <td class="text"><a
href='<%=JahiaAdministration.composeActionURL(request,response,"siteLanguages","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('languages','','<%=URL%>images/icons/flag_on.gif',1)"><img
align="left" name="languages" src="<%=URL%>images/icons/flag_off.gif"
width="24" height="24" border="0">
<jahia:adminResourceBundle
resourceName="org.jahia.admin.manageLanguages.label"/></a></td>
</tr>
<!-- begin link production manager -->
<tr>
- <td class="text"><a
href='<%=JahiaAdministration.composeActionURL(request,response,"productionManager","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('languages','','<%=URL%>images/icons/flag_on.gif',1)"><img
align="left" name="languages" src="<%=URL%>images/icons/flag_off.gif"
width="16" height="16" border="0">
+ <td class="text"><a
href='<%=JahiaAdministration.composeActionURL(request,response,"productionManager","&sub=display")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('export','','<%=URL%>images/icons/export_on.gif',1)"><img
align="left" name="export" src="<%=URL%>images/icons/export_off.gif"
width="24" height="24" border="0">
<jahia:adminResourceBundle
resourceName="org.jahia.admin.productionManager.label"/></a></td>
</tr>
<!-- end link production manager -->
<!-- begin link clipbuilder-->
<tr>
- <td class="text"><a
href='<%=jData.params().composeStrutsUrl("menuBuilder","")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('htmleditors','','<%=URL%>images/icons/htmleditors_on.gif',1)"><img
align="left" name="htmleditors" src="<%=URL%>images/icons/htmleditors_off.gif"
width="16" height="16" border="0">
+ <td class="text"><a
href='<%=jData.params().composeStrutsUrl("menuBuilder","")%>'
onMouseOut="MM_swapImgRestore()"
onMouseOver="MM_swapImage('clip_builder','','<%=URL%>images/icons/clip_builder_on.gif',1)"><img
align="left" name="clip_builder"
src="<%=URL%>images/icons/clip_builder_off.gif" width="24" height="24"
border="0">
<jahia:adminResourceBundle
resourceName="org.jahia.admin.clipbuilder.label"/></a></td>
</tr>
<!-- end link clipbuilder-->
Index: work_in_progress.html
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/administration/work_in_progress.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- work_in_progress.html 7 Oct 2005 14:14:30 -0000 1.4
+++ work_in_progress.html 10 Oct 2005 13:47:28 -0000 1.5
@@ -30,7 +30,7 @@
</script>
</head>
-<body bgcolor="#fff" leftmargin="0" topmargin="0" marginwidth="0"
marginheight="0" onload="javascript:checkWorkInProgress();">
+<body bgcolor="#ffffff" leftmargin="0" topmargin="0" marginwidth="0"
marginheight="0" onload="javascript:checkWorkInProgress();">
<center>
<img border="0" src="../engines/images/work_in_progress.gif" width="200"
height="200" alt="">
</center>
Index: clip_builder_off.gif
===================================================================
<<Binary file>>
Index: clip_builder_on.gif
===================================================================
<<Binary file>>
Index: export_off.gif
===================================================================
<<Binary file>>
Index: export_on.gif
===================================================================
<<Binary file>>
Index: admin_components_off.gif
===================================================================
<<Binary file>>
Index: admin_components_on.gif
===================================================================
<<Binary file>>
Index: admin_groups_off.gif
===================================================================
<<Binary file>>
Index: admin_groups_on.gif
===================================================================
<<Binary file>>
Index: admin_pages_off.gif
===================================================================
<<Binary file>>
Index: admin_pages_on.gif
===================================================================
<<Binary file>>
Index: admin_templates_off.gif
===================================================================
<<Binary file>>
Index: admin_templates_on.gif
===================================================================
<<Binary file>>
Index: admin_users_off.gif
===================================================================
<<Binary file>>
Index: admin_users_on.gif
===================================================================
<<Binary file>>
Index: flag_off.gif
===================================================================
<<Binary file>>
Index: flag_on.gif
===================================================================
<<Binary file>>
Index: home_off.gif
===================================================================
<<Binary file>>
Index: home_on.gif
===================================================================
<<Binary file>>
Index: search_off.gif
===================================================================
<<Binary file>>
Index: search_on.gif
===================================================================
<<Binary file>>
