pvollenweider 2005/08/17 15:54:57 CEST
Modified files:
src/jsp/common adminbuttons.inc quicklinks.jsp
src/jsp/css screen.css tab.css
src/jsp home.jsp
Added files:
src/jsp/common operationbuttons.inc
Log:
add resources
Revision Changes Path
1.2 +24 -98
corporate_portal_templates_v2/src/jsp/common/adminbuttons.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/common/adminbuttons.inc.diff?r1=1.1&r2=1.2&f=h
1.1 +85 -0
corporate_portal_templates_v2/src/jsp/common/operationbuttons.inc (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/common/operationbuttons.inc?rev=1.1&content-type=text/plain
1.2 +9 -11
corporate_portal_templates_v2/src/jsp/common/quicklinks.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/common/quicklinks.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +12 -4 corporate_portal_templates_v2/src/jsp/css/screen.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/css/screen.css.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1 corporate_portal_templates_v2/src/jsp/css/tab.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/css/tab.css.diff?r1=1.1&r2=1.2&f=h
1.6 +3 -3 corporate_portal_templates_v2/src/jsp/home.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/home.jsp.diff?r1=1.5&r2=1.6&f=h
Index: operationbuttons.inc
====================================================================
<%
if (hasWriteAccess || (hasAdminAccess && hasReadAccess)){
%>
<div class="tab">
<ul>
<%
// Display Live button
if
(contentPage.hasEntries(ContentPage.ACTIVE_PAGE_INFOS,languageCode)){
String liveUrl = jData.gui().drawNormalModeLink();
%>
<li <%= jData.gui().isNormalMode() ? "class='selected'" : ""%>>
<a href="<%=liveUrl%>">
<span><content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="operationMode.live"/></span>
</a>
</li>
<%
}
// Display Preview & compare buttons
Integer languageState = (Integer)languagesStates.get(languageCode);
boolean displayPreview = false;
boolean isSharedInStaging = false;
Integer sharedState = (Integer)languagesStates.get("shared");
if (sharedState != null) {
if (sharedState.intValue() >
EntryLoadRequest.ACTIVE_WORKFLOW_STATE) {
isSharedInStaging = true;
}
}
if (languageState != null){
if (languageState.intValue() >
EntryLoadRequest.ACTIVE_WORKFLOW_STATE){
displayPreview = true;
}
}
if (contentPage.isStagedEntryMarkedForDeletion(languageCode)){
displayPreview = false;
isSharedInStaging = false;
}
if ((displayPreview || isSharedInStaging ||
jData.gui().isCompareMode()) &&
contentPage.hasEntries(ContentPage.ACTIVE_PAGE_INFOS |
ContentPage.STAGING_PAGE_INFOS,
languageCode)) {
String previewUrl = jData.gui().drawPreviewModeLink();
%>
<li <%= jData.gui().isPreviewMode() ? "class='selected'" : ""%>>
<a href="<%=previewUrl%>">
<span><content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="operationMode.preview"/></span>
</a>
</li>
<%
if
(contentPage.hasEntries(ContentPage.ACTIVE_PAGE_INFOS,languageCode)){
String compareUrl = jData.gui().drawRevDifferenceModeLink(1,
jData.params().getOperationMode());
%>
<li <%= jData.gui().isCompareMode() ? "class='selected'" :
""%>>
<a href="<%=compareUrl%>">
<span><content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="operationMode.compare"/></span>
</a>
</li>
<%
}
}
// Display Edit button
if (jData.page().checkWriteAccess(user)){
String editUrl = jData.gui().drawEditModeLink();
%>
<li <%= isEditMode ? "class='selected'" : ""%>>
<a href="<%=editUrl%>">
<span><content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="operationMode.edit"/></span>
</a>
</li>
<%
}
%>
</ul>
</div>
<%
}
%>
Index: adminbuttons.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/common/adminbuttons.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- adminbuttons.inc 2 Aug 2005 14:20:06 -0000 1.1
+++ adminbuttons.inc 17 Aug 2005 13:54:56 -0000 1.2
@@ -1,104 +1,18 @@
<logic:equal name="currentRequest" property="logged" value="true">
-<div class="admin">
-<%
-if (hasWriteAccess || (hasAdminAccess && hasReadAccess)){
- %>
- <div class="tab">
- <ul>
- <%
- // Display Live button
- if
(contentPage.hasEntries(ContentPage.ACTIVE_PAGE_INFOS,languageCode)){
- String liveUrl = jData.gui().drawNormalModeLink();
- %>
- <li <%= jData.gui().isNormalMode() ? "class='selected'" : ""%>>
- <a href="<%=liveUrl%>">
- <span><content:resourceBundle
-
resourceBundle="jahiatemplates.Corporate_portal_templates"
- resourceName="operationMode.live"/></span>
- </a>
- </li>
- <%
- }
-
- // Display Preview & compare buttons
- Integer languageState = (Integer)languagesStates.get(languageCode);
- boolean displayPreview = false;
- boolean isSharedInStaging = false;
- Integer sharedState = (Integer)languagesStates.get("shared");
- if (sharedState != null) {
- if (sharedState.intValue() >
EntryLoadRequest.ACTIVE_WORKFLOW_STATE) {
- isSharedInStaging = true;
- }
- }
- if (languageState != null){
- if (languageState.intValue() >
EntryLoadRequest.ACTIVE_WORKFLOW_STATE){
- displayPreview = true;
- }
- }
- if (contentPage.isStagedEntryMarkedForDeletion(languageCode)){
- displayPreview = false;
- isSharedInStaging = false;
- }
- if ((displayPreview || isSharedInStaging ||
jData.gui().isCompareMode()) &&
- contentPage.hasEntries(ContentPage.ACTIVE_PAGE_INFOS |
ContentPage.STAGING_PAGE_INFOS,
- languageCode)) {
- String previewUrl = jData.gui().drawPreviewModeLink();
- %>
- <li <%= jData.gui().isPreviewMode() ? "class='selected'" : ""%>>
- <a href="<%=previewUrl%>">
- <span><content:resourceBundle
-
resourceBundle="jahiatemplates.Corporate_portal_templates"
- resourceName="operationMode.preview"/></span>
- </a>
- </li>
- <%
- if
(contentPage.hasEntries(ContentPage.ACTIVE_PAGE_INFOS,languageCode)){
- String compareUrl = jData.gui().drawRevDifferenceModeLink(1,
jData.params().getOperationMode());
- %>
- <li <%= jData.gui().isCompareMode() ? "class='selected'" :
""%>>
- <a href="<%=compareUrl%>">
- <span><content:resourceBundle
-
resourceBundle="jahiatemplates.Corporate_portal_templates"
- resourceName="operationMode.compare"/></span>
- </a>
- </li>
- <%
- }
- }
-
- // Display Edit button
- if (jData.page().checkWriteAccess(user)){
- String editUrl = jData.gui().drawEditModeLink();
- %>
- <li <%= isEditMode ? "class='selected'" : ""%>>
- <a href="<%=editUrl%>">
- <span><content:resourceBundle
-
resourceBundle="jahiatemplates.Corporate_portal_templates"
- resourceName="operationMode.edit"/></span>
- </a>
- </li>
- <%
- }
- %>
- </ul>
- </div>
- <%
-}
-%>
-</div>
-
-<div id="adminlinks">
- <a href="<%=jData.gui().html().drawMySettingsLauncher()%>">Modification
mot de passe</a> |
+<ul>
+ <li><a
href="<%=jData.gui().html().drawMySettingsLauncher()%>"><content:resourceBundle
+
resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="button.mySettings"/></a></li>
<%
if (hasWriteAccess){
%>
<content:pagePropertiesURL id="pagePropertiesURL" display="false" />
<logic:present name="pagePropertiesURL">
- <a href="<bean:write name='pagePropertiesURL'/>">
+ <li><a href="<bean:write name='pagePropertiesURL'/>">
<content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
- resourceName="pageSettings"/>
- </a> |
+ resourceName="button.pageSettings"/>
+ </a></li>
</logic:present>
<%
Map pageOnlyLanguagesStates =
contentPage.getLanguagesStates(false);
@@ -126,13 +40,25 @@
colorLink = "orange";
}
}
- %><content:workflowButton style="<%=colorLink%>"
- title='<%=getResourceBundle ("workflow", "workflow",
jData)%>'/> |<%
+ %><li><a
href="javascript:<%=jData.gui().html().drawWorkflowLauncher()%>"
+ title="Workflow"
class="<%=colorLink%>"><span><content:resourceBundle
+
resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="button.workflow"/></span></a></li><%
}
if ( isAdmin ){
- %><content:adminButton title='<%=getResourceBundle ("admin",
"admin", jData)%>'/> | <%
+ %><li><a
href="<%=jData.gui().html().drawAdministrationLauncher()%>"
+ title="Administration"><span><content:resourceBundle
+
resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="button.administration"/></span></a></li><%
+
}
}
%>
-</div>
-</logic:equal>
+ <li>
+ <a href="<%=jData.gui().html().drawLogoutLauncher()%>"
+ title="Logout"><span><content:resourceBundle
+ resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="button.logout"/>
<%=user.getUsername()%></span></a>
+ </li>
+</ul>
+</logic:equal>
\ No newline at end of file
Index: quicklinks.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/common/quicklinks.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quicklinks.jsp 27 Jul 2005 09:47:30 -0000 1.1
+++ quicklinks.jsp 17 Aug 2005 13:54:56 -0000 1.2
@@ -7,14 +7,12 @@
</content:declareContainer>
</content:declareContainerList>
+
<ul>
- <li><a href="" title="Search"><span>Search</span></a></li>
- <logic:equal name="currentRequest" property="logged" value="true">
- <li>
- <a href="<%=jData.gui().html().drawLogoutLauncher()%>"
- title="Logout"><span>Logout
<%=user.getUsername()%></span></a>
- </li>
- </logic:equal>
+
+ <li><a href="" title="Search"><span><content:resourceBundle
+
resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="button.search"/></span></a></li>
<%
JahiaContainerList quickLinksContainerList =
jData.containers().getAbsoluteContainerList("quickLinksContainerList",
homePageId);
@@ -35,7 +33,7 @@
ContainerBean quickLinksContainerBean =
new ContainerBean(quickLinksContainer,jParams);
jData.gui().html().drawBeginActionMenu(quickLinksContainerBean,
- null, null, false, "",
"jahiatemplates.Corporate_portal_templates", null, out);
+ null, null, false, ".quicklink",
"jahiatemplates.Corporate_portal_templates", null, out);
}
%>
</li>
@@ -46,19 +44,19 @@
%>
<li><a href="#"><jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
- resourceName="noLink"/></a>
+ resourceName="message.noLink"/></a>
<%
ContainerBean quickLinksContainerBean =
new ContainerBean(quickLinksContainer,jParams);
jData.gui().html().drawBeginActionMenu(quickLinksContainerBean,
- null, null, false, "",
"jahiatemplates.Corporate_portal_templates", null, out);
+ null, null, false, ".quicklink",
"jahiatemplates.Corporate_portal_templates", null, out);
}
}
}
if (isEditMode) {
%><li><%
jData.gui().html().drawBeginActionMenu(quickLinksContainerListBean,
- null, null, false, "",
"jahiatemplates.Corporate_portal_templates", null, out);
+ null, null, false, ".quicklinks",
"jahiatemplates.Corporate_portal_templates", null, out);
%></li><%
}
}
Index: screen.css
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/css/screen.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- screen.css 26 Jul 2005 12:26:39 -0000 1.1
+++ screen.css 17 Aug 2005 13:54:57 -0000 1.2
@@ -76,17 +76,17 @@
float:right;
padding-right:10px;
}
-#quicklinkright ul {
+#quicklinks ul {
list-style: none;
margin: 0;
padding: 0;
}
-#quicklinkright li {
+#quicklinks li {
display: inline;
margin: 0;
padding: 0;
}
-#quicklinkright a {
+#quicklinks a {
color: #6a6a6a;
float: left;
display: block;
@@ -103,7 +103,15 @@
display:block;
height:73px;
}
-
+#quicklinks a.green {
+ color: #006600;
+}
+#quicklinks a.orange {
+ color: #E17637;
+}
+#quicklinks a.red {
+ color: #660000;
+}
/* ------------------------------------------------ */
/* MENU */
/* ------------------------------------------------ */
Index: tab.css
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/css/tab.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tab.css 2 Aug 2005 14:20:07 -0000 1.1
+++ tab.css 17 Aug 2005 13:54:57 -0000 1.2
@@ -1,5 +1,5 @@
div.tab {
- background: #F4F3F3 url(../img/tab_border.gif) repeat-x bottom;
+ background: url(../img/tab_border.gif) repeat-x bottom;
float: left;
clear: both;
padding-top: 1px;
Index: home.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/home.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- home.jsp 2 Aug 2005 14:20:06 -0000 1.5
+++ home.jsp 17 Aug 2005 13:54:57 -0000 1.6
@@ -22,18 +22,18 @@
</head>
<body onload="init()">
<div id="wrapper">
- <%@ include file="common/adminbuttons.inc"%>
+ <%@ include file="common/operationbuttons.inc"%>
<div id="header">
<div id="quicklinks">
<div id="quicklinkleft">
- links
+ <%@ include file="common/adminbuttons.inc"%>
</div>
<div id="quicklinkright">
<jsp:include page="common/quicklinks.jsp" flush="true"/>
</div>
</div>
<div id="logo">
- <a href="#"></a>
+ <a href="<bean:write name='currentSite'
property='homePage.url'/>"></a>
</div>
<div id="menu">
<jsp:include page="common/topmenu.jsp" flush="true"/>
