Author: xlawrence
Date: Fri Sep 7 16:45:52 2007
New Revision: 8
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D8&repname=3Ds=
imple_templates
Log:
improvements
Added:
trunk/src/jsp/css/
trunk/src/jsp/css/web.css
trunk/src/jsp/css/web.css.bak
trunk/src/jsp/img/
trunk/src/jsp/img/arrow.gif (with props)
trunk/src/jsp/img/dotted.gif (with props)
trunk/src/jsp/img/line.gif (with props)
trunk/src/jsp/img/logo.gif (with props)
trunk/src/jsp/img/tab_left.gif (with props)
trunk/src/jsp/img/tab_right.gif (with props)
Removed:
trunk/src/jsp/logo.gif
trunk/src/jsp/tab_left.gif
trunk/src/jsp/tab_right.gif
trunk/src/jsp/web.css
Modified:
trunk/ (props changed)
trunk/src/java/jahiatemplates/Simple_templates.properties
trunk/src/jsp/declarations.inc
trunk/src/jsp/leftmenu.inc
trunk/src/jsp/pagetitle.inc
trunk/src/jsp/template.jsp
Modified: trunk/src/java/jahiatemplates/Simple_templates.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/java/jahiat=
emplates/Simple_templates.properties&rev=3D8&repname=3Dsimple_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/java/jahiatemplates/Simple_templates.properties (original)
+++ trunk/src/java/jahiatemplates/Simple_templates.properties Fri Sep 7 16=
:45:52 2007
@@ -5,3 +5,112 @@
contentContainerOperations =3D Container operations
contentFieldOperations =3D Field operations
contentPageOperations =3D Page operations
+
+# operation modes
+operationMode.edit =3D Edit
+operationMode.compare =3D Compare
+operationMode.preview =3D Preview
+operationMode.live =3D Live
+
+# admin buttons
+button.mySettings =3D My settings
+button.pageSettings =3D Page settings
+button.workflow =3D Workflow
+button.administration =3D Administration
+button.login =3D Login
+button.logout =3D Logout
+button.username =3D username
+button.search =3D Search
+button.sitemap =3D Sitemap
+
+# general messages
+update =3D Update
+editinword =3D Edit in Word
+delete =3D Delete
+copy =3D Copy
+paste =3D Paste
+search =3D Search
+add =3D Add
+differentACLTitle =3D This object and its parent have different ACLs
+message.noLink =3D No link
+message.noPage =3D No page
+message.noNews =3D No news
+message.maxNews =3D Number of news to display
+message.more =3D More...
+message.filter =3D Filter by
+message.and =3D and
+message.display =3D Display
+message.paginationInfo =3D results per page
+message.infoCatLabel =3D Documents published in category
+message.infoCatLegendEnd =3D and are published in others categories.
+message.infoCatLegendStart =3D Documents ending with a \"*\" are related to
+message.addCategory =3D Select the news categories you want to display by =
selecting them in the MetaData part of the news box
+message.addInformation =3D Add information
+
+doc.docCreationDate =3D Creation date
+doc.docCreatorLbl =3D Created by
+doc.docLastModDate =3D Modified on
+doc.docListCatLabel =3D This document belongs to =
the followings categories
+doc.docModifLabel =3D Modified by
+
+reload=3DReload the page
+displayingDocuments =3D Displaying documents
+yes =3D yes
+no =3D no
+skill =3D Skill
+level =3D Level
+hourlyRate =3D Hourly Rate
+homepage =3D Homepage
+tel =3D Tel
+mobile =3D Mobile
+email =3D Email
+street =3D Street
+cityCode =3D NPA / City
+back =3D Back
+of =3D of
+whichBestMachesFirst =3D with best matches first
+process =3D Process
+refresh =3D Refresh
+
+# general labels
+label.navigation =3D Navigation
+
+# quick link container list
+add.quicklinks =3D Add a quicklink
+update.quicklinks =3D Update quicklink settings
+update.quicklink =3D Update
+delete.quicklink =3D Delete
+
+# mainContent container list
+mainContent.mainContentList =3D Content Container
+mainContent.title =3D Title
+mainContent.content =3D Content
+mainContent.image =3D Image
+mainContent.align =3D Align
+add.mainContents =3D Add content
+update.mainContents =3D Update content settings
+update.mainContent =3D Edit this content
+delete.mainContent =3D Delete this content
+
+# footer link container list
+add.footerLinks =3D Add a link
+update.footerLinks =3D Update list settings
+update.footerLink =3D Update
+delete.footerLink =3D Delete
+footer.footerText =3D Footer
+
+# navigationLink
+add.navigationLinks =3D Add a page
+update.navigationLinks =3D Settings
+update.navigationLink =3D Update
+delete.navigationLink =3D Delete
+
+# SiteSettings
+logoSettings =3D Update logo
+
+ContentContainerListOperations =3D List operations
+ContentContainerOperations =3D Container operations
+ContentFieldOperations =3D Field operations
+ContentPageOperations =3D Page operation
+
+filemanager.name =3D filemanager
Added: trunk/src/jsp/css/web.css
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
css/web.css&rev=3D8&repname=3Dsimple_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/jsp/css/web.css (added)
+++ trunk/src/jsp/css/web.css Fri Sep 7 16:45:52 2007
@@ -0,0 +1,144 @@
+body {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+}
+a {
+ text-decoration: none;
+ color: #000066;
+}
+a:hover {
+ text-decoration: underline;
+}
+h1,h2 {
+ font-weight: bold;
+ color: #000066;
+}
+h1 {
+ font-size: 18px;
+}
+h2 {
+ font-size: 14px;
+}
+p {
+ text-align:justify;
+}
+.leftmenu {
+ vertical-align: top;
+}
+.leftmenu a {
+ background-color:#dedede;
+ border-bottom:1px solid #ffffff;
+ padding:5px;
+ display:block;
+}
+
+.leftLink {
+ background-color:#dedede;
+ border-bottom:1px solid #ffffff;
+ padding:5px;
+ display:block;
+}
+
+.leftLink a {
+ display:inline;
+}
+
+.leftmenu a:hover {
+ color:#ffffff;
+ background-color:#999999;
+ font-weight: bold;
+}
+.maincell {
+ padding-left:10px;
+ vertical-align: top;
+}
+.left {
+ margin-right:5px;
+}
+.right {
+ margin-left:5px;
+}
+div.tab {
+ float: left;
+ padding-left:0px;
+}
+
+div.tab a {
+ background: url(../img/tab_right.gif) no-repeat right top;
+ float: left;
+ margin-left: 6px;
+ margin-top: 10px;
+ text-decoration: none;
+}
+
+div.tab a:link,
+div.tab a:visited,
+div.tab a:active,
+div.tab a:hover {
+ color: #515C6A;
+ font-size: 11px;
+}
+
+div.tab a:hover {
+ background-position: 100% -26px;
+}
+
+div.tab a:hover span {
+ background-position: 0% -26px;
+}
+
+div.tab li {
+ display: inline;
+ margin: 0px;
+ padding: 0px;
+}
+
+div.tab li.selected a {
+ background-position: 100% -26px;
+}
+
+div.tab li.selected span {
+ background-position: 0% -26px;
+ padding-bottom: 6px;
+}
+
+div.tab span {
+ background: url(../img/tab_left.gif) no-repeat left top;
+ display: block;
+ float: left;
+ padding: 5px 9px;
+ white-space: nowrap;
+}
+
+/* Commented Backslash Hack hides rule from IE5-Mac \*/
+div.tab span {
+ float: none;
+}
+/* End IE5-Mac hack */
+
+div.tab ul {
+ list-style: none;
+ margin: 0px;
+ padding: 0px;
+}
+
+/* GLOBAL SETTINGS
+------------------------------------------------ */
+body{background:#ddd;color:#333;font-family:Arial, Helvetica, sans-serif;f=
ont-size:11px;text-align:left;margin:0;padding:0;}
+a{color:#333;text-decoration:none;}
+a:hover{text-decoration:underline;}
+h1{background:url(../img/line.gif) no-repeat left bottom;color:#333;font-s=
ize:16px;font-weight:700;margin:10px 0 5px;padding-bottom:20px;}
+h2{background:url(../img/arrow.gif) no-repeat 0 8px;color:#7ca648;font-siz=
e:14px;font-weight:700;padding:5px 0 10px 20px;}
+div.dotted{background:url(../img/dotted.gif) repeat-x top;display:block;he=
ight:1px;}
+
+/* MAIN STRUCT CLASS
+------------------------------------------------ */
+#topmodules{border-bottom:1px dotted #AAA;top:0;width:1004px;}
+#toplinks{clear:both;}
+#header{background:#fff;clear:both;display:block;float:left;width:1004px;}
+#pagebody{background:#fff;clear:both;display:block;float:left;padding:0 0 =
20px;width:1004px;}
+#footer{background:url(../img/dotted.gif) repeat-x top left #fff;clear:bot=
h;display:block;float:left;padding-top:10px;text-align:left;width:1004px;}
+#footer .margin{display:block;padding:0 20px 40px;}
+
+
+
Added: trunk/src/jsp/css/web.css.bak
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
css/web.css.bak&rev=3D8&repname=3Dsimple_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/jsp/css/web.css.bak (added)
+++ trunk/src/jsp/css/web.css.bak Fri Sep 7 16:45:52 2007
@@ -0,0 +1,144 @@
+body {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+}
+a {
+ text-decoration: none;
+ color: #000066;
+}
+a:hover {
+ text-decoration: underline;
+}
+h1,h2 {
+ font-weight: bold;
+ color: #000066;
+}
+h1 {
+ font-size: 18px;
+}
+h2 {
+ font-size: 14px;
+}
+p {
+ text-align:justify;
+}
+.leftmenu {
+ vertical-align: top;
+}
+.leftmenu a {
+ background-color:#dedede;
+ border-bottom:1px solid #ffffff;
+ padding:5px;
+ display:block;
+}
+
+.leftLink {
+ background-color:#dedede;
+ border-bottom:1px solid #ffffff;
+ padding:5px;
+ display:block;
+}
+
+.leftLink a {
+ display:inline;
+}
+
+.leftmenu a:hover {
+ color:#ffffff;
+ background-color:#999999;
+ font-weight: bold;
+}
+.maincell {
+ padding-left:10px;
+ vertical-align: top;
+}
+.left {
+ margin-right:5px;
+}
+.right {
+ margin-left:5px;
+}
+div.tab {
+ float: left;
+ padding-left:0px;
+}
+
+div.tab a {
+ background: url(../img/tab_right.gif) no-repeat right top;
+ float: left;
+ margin-left: 6px;
+ margin-top: 10px;
+ text-decoration: none;
+}
+
+div.tab a:link,
+div.tab a:visited,
+div.tab a:active,
+div.tab a:hover {
+ color: #515C6A;
+ font-size: 11px;
+}
+
+div.tab a:hover {
+ background-position: 100% -26px;
+}
+
+div.tab a:hover span {
+ background-position: 0% -26px;
+}
+
+div.tab li {
+ display: inline;
+ margin: 0px;
+ padding: 0px;
+}
+
+div.tab li.selected a {
+ background-position: 100% -26px;
+}
+
+div.tab li.selected span {
+ background-position: 0% -26px;
+ padding-bottom: 6px;
+}
+
+div.tab span {
+ background: url(../img/tab_left.gif) no-repeat left top;
+ display: block;
+ float: left;
+ padding: 5px 9px;
+ white-space: nowrap;
+}
+
+/* Commented Backslash Hack hides rule from IE5-Mac \*/
+div.tab span {
+ float: none;
+}
+/* End IE5-Mac hack */
+
+div.tab ul {
+ list-style: none;
+ margin: 0px;
+ padding: 0px;
+}
+
+/* GLOBAL SETTINGS
+------------------------------------------------ */
+body{background:#ddd;color:#333;font-family:Arial, Helvetica, sans-serif;f=
ont-size:11px;text-align:left;margin:0;padding:0;}
+a{color:#333;text-decoration:none;}
+a:hover{text-decoration:underline;}
+h1{background:url(../img/line.gif) no-repeat left bottom;color:#333;font-s=
ize:16px;font-weight:700;margin:10px 0 5px;padding-bottom:20px;}
+h2{background:url(../img/arrow.gif) no-repeat 0 8px;color:#7ca648;font-siz=
e:14px;font-weight:700;padding:5px 0 10px 20px;}
+div.dotted{background:url(../img/dotted.gif) repeat-x top;display:block;he=
ight:1px;}
+
+/* MAIN STRUCT CLASS
+------------------------------------------------ */
+#topmodules{border-bottom:1px dotted #AAA;top:0;width:1004px;}
+#toplinks{clear:both;}
+#header{background:#fff;clear:both;display:block;float:left;width:1004px;}
+#pagebody{background:#fff;clear:both;display:block;float:left;padding:0 0 =
20px;width:1004px;}
+#footer{background:url(../img/dotted.gif) repeat-x top left #fff;clear:bot=
h;display:block;float:left;padding-top:10px;text-align:left;width:1004px;}
+#footer .margin{display:block;padding:0 20px 40px;}
+
+
+
Modified: trunk/src/jsp/declarations.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/declara=
tions.inc&rev=3D8&repname=3Dsimple_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/jsp/declarations.inc (original)
+++ trunk/src/jsp/declarations.inc Fri Sep 7 16:45:52 2007
@@ -2,9 +2,10 @@
<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-logic" prefix=3D"logic" %>
<%@ taglib uri=3D"jahiaHtmlLib" prefix=3D"jahiaHtml" %>
<%@ taglib uri=3D"contentLib" prefix=3D"content" %>
+<%@ include file=3D"/jsp/jahia/javascript/serverconfig_js.inc"%>
<content:JSTools/>
-<link rel=3D"stylesheet" href=3D"<content:contextURL/>/web.css" type=3D"te=
xt/css"/>
<link rel=3D"stylesheet" href=3D"<content:serverHttpPath/>/jsp/jahia/css/c=
ore_css.jsp" type=3D"text/css"></link>
+<link rel=3D"stylesheet" href=3D"<content:contextURL/>/css/web.css" type=
=3D"text/css"/>
<logic:equal name=3D"currentRequest" property=3D"editMode" value=3D"true">
<link rel=3D"stylesheet" href=3D"<content:contextURL/>/actions.css" ty=
pe=3D"text/css"/>
<script language=3D"javascript1.2" src=3D"<content:contextURL/>/action=
s.js" type=3D"text/javascript"/>
Added: trunk/src/jsp/img/arrow.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
img/arrow.gif&rev=3D8&repname=3Dsimple_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
Binary file - no diff available.
Added: trunk/src/jsp/img/dotted.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
img/dotted.gif&rev=3D8&repname=3Dsimple_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
Binary file - no diff available.
Added: trunk/src/jsp/img/line.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
img/line.gif&rev=3D8&repname=3Dsimple_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
Binary file - no diff available.
Added: trunk/src/jsp/img/logo.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
img/logo.gif&rev=3D8&repname=3Dsimple_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
Binary file - no diff available.
Added: trunk/src/jsp/img/tab_left.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
img/tab_left.gif&rev=3D8&repname=3Dsimple_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
Binary file - no diff available.
Added: trunk/src/jsp/img/tab_right.gif
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
img/tab_right.gif&rev=3D8&repname=3Dsimple_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
Binary file - no diff available.
Modified: trunk/src/jsp/leftmenu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/leftmen=
u.inc&rev=3D8&repname=3Dsimple_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/jsp/leftmenu.inc (original)
+++ trunk/src/jsp/leftmenu.inc Fri Sep 7 16:45:52 2007
@@ -12,12 +12,14 @@
%>
<content:containerList name=3D'leftMenuContainerList' id=3D'leftMenuContai=
nerList'>
<content:container id=3D"leftMenuContainer">
- <content:pageField valueId=3D"leftLink" name=3D'leftLink'/>
- <logic:notEmpty name=3D"leftLink">
- <a href=3D"<bean:write name=3D'leftLink' property=3D'url'/>"><bean=
:write name=3D'leftLink' property=3D'title'/></a>
- </logic:notEmpty>
- <jahiaHtml:actionMenu name=3D"leftMenuContainer" namePostFix=3D"" reso=
urceBundle=3D"jahiatemplates.Simple_templates" useFieldSet=3D"false">
- </jahiaHtml:actionMenu>
+ <div class=3D"leftLink">
+ <content:pageField valueId=3D"leftLink" name=3D'leftLink'/>
+ <logic:notEmpty name=3D"leftLink">
+ <a href=3D"<bean:write name=3D'leftLink'
property=3D'url'/>"><be=
an:write name=3D'leftLink' property=3D'title'/></a>
+ </logic:notEmpty>
+ <jahiaHtml:actionMenu name=3D"leftMenuContainer"
namePostFix=3D"" re=
sourceBundle=3D"jahiatemplates.Simple_templates" useFieldSet=3D"false">
+ </jahiaHtml:actionMenu>
+ </div>
</content:container>
<jahiaHtml:actionMenu name=3D"leftMenuContainerList" namePostFix=3D"" reso=
urceBundle=3D"jahiatemplates.Simple_templates" useFieldSet=3D"false">
</jahiaHtml:actionMenu>
Modified: trunk/src/jsp/pagetitle.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/pagetit=
le.inc&rev=3D8&repname=3Dsimple_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/jsp/pagetitle.inc (original)
+++ trunk/src/jsp/pagetitle.inc Fri Sep 7 16:45:52 2007
@@ -1,5 +1,9 @@
-<h1>
- <bean:write name=3D'currentPage' property=3D'title' filter=3D'false'/>
- <jahiaHtml:actionMenu name=3D"currentPage" namePostFix=3D"" resourceBu=
ndle=3D"jahiatemplates.Simple_templates" useFieldSet=3D"false">
- </jahiaHtml:actionMenu>
-</h1>
+<div id=3D"pagetitle">
+ <h1>
+ <bean:write name=3D"currentPage" property=3D"title"
filter=3D"false"/>
+ <jahiaHtml:actionMenu name=3D"currentPage" namePostFix=3D""
resourceBund=
le=3D"jahiatemplates.Simple_templates" useFieldSet=3D"false">
+ </jahiaHtml:actionMenu>
+ </h1>
+</div>
+ =
+
Modified: trunk/src/jsp/template.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/templat=
e.jsp&rev=3D8&repname=3Dsimple_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/src/jsp/template.jsp (original)
+++ trunk/src/jsp/template.jsp Fri Sep 7 16:45:52 2007
@@ -8,12 +8,13 @@
</head>
<body>
<logic:equal name=3D"currentRequest" property=3D"logged" value=3D"true">
- <jsp:include page=3D"/jsp/jahia/topbar/topmenu.jsp" flush=3D"true"/>
- <jsp:include page=3D"/jsp/jahia/topbar/operationbuttons.jsp" flush=3D"=
true"/>
+ <div id=3D"topmodules"><jsp:include
page=3D"/jsp/jahia/topbar/topmenu.js=
p" flush=3D"true"/></div> =
+ <div id=3D"toplinks"><jsp:include page=3D"/jsp/jahia/topbar/operationb=
uttons.jsp" flush=3D"true"/></div>
</logic:equal>
- <p>
+<div id=3D"pagebody">
+<p>
<a href=3D"<bean:write name=3D'currentSite' property=3D'homePage.url'/=
>"><img
- src=3D"<content:contextURL/>/logo.gif" alt=3D"Home" width=3D"150" heig=
ht=3D"40" border=3D"0" /></a>
+ src=3D"<content:contextURL/>/img/logo.gif" alt=3D"Home" width=3D"150" =
height=3D"40" border=3D"0" /></a>
</p>
<table width=3D"800" border=3D"0">
<tr>
@@ -29,5 +30,6 @@
</td>
</tr>
</table>
+</div>
</body>
</html>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
