r1096 - in xwiki-sandbox/interface/src/main: java/com/xpn/xwiki/web resources web/WEB-INF web/skins/default web/templates
Sergiu Dumitriu
sdumitriu at users.forge.objectweb.org
Tue Jul 25 21:53:30 CEST 2006
Author: sdumitriu
Date: 2006-07-25 21:53:29 +0200 (Tue, 25 Jul 2006)
New Revision: 1096
Added:
xwiki-sandbox/interface/src/main/web/skins/default/xwlogoblue.png
xwiki-sandbox/interface/src/main/web/templates/historyinline.vm
xwiki-sandbox/interface/src/main/web/templates/rollback.vm
Modified:
xwiki-sandbox/interface/src/main/java/com/xpn/xwiki/web/RollbackAction.java
xwiki-sandbox/interface/src/main/java/com/xpn/xwiki/web/RollbackForm.java
xwiki-sandbox/interface/src/main/resources/ApplicationResources.properties
xwiki-sandbox/interface/src/main/web/WEB-INF/struts-config.xml
xwiki-sandbox/interface/src/main/web/WEB-INF/version.properties
xwiki-sandbox/interface/src/main/web/skins/default/collapse.png
xwiki-sandbox/interface/src/main/web/skins/default/collapseh.png
xwiki-sandbox/interface/src/main/web/skins/default/corner.png
xwiki-sandbox/interface/src/main/web/skins/default/elements.css
xwiki-sandbox/interface/src/main/web/skins/default/expand.png
xwiki-sandbox/interface/src/main/web/skins/default/expandh.png
xwiki-sandbox/interface/src/main/web/skins/default/page.css
xwiki-sandbox/interface/src/main/web/skins/default/screenlayout.css
xwiki-sandbox/interface/src/main/web/skins/default/style.css
xwiki-sandbox/interface/src/main/web/skins/default/xwiki.js
xwiki-sandbox/interface/src/main/web/templates/attachmentsinline.vm
xwiki-sandbox/interface/src/main/web/templates/global.vm
xwiki-sandbox/interface/src/main/web/templates/htmlfooter.vm
xwiki-sandbox/interface/src/main/web/templates/htmlheader.vm
xwiki-sandbox/interface/src/main/web/templates/httpheader.vm
xwiki-sandbox/interface/src/main/web/templates/login.vm
xwiki-sandbox/interface/src/main/web/templates/macros.vm
xwiki-sandbox/interface/src/main/web/templates/menuview.vm
xwiki-sandbox/interface/src/main/web/templates/view.vm
xwiki-sandbox/interface/src/main/web/templates/xwikivars.vm
Log:
Modified: xwiki-sandbox/interface/src/main/java/com/xpn/xwiki/web/RollbackAction.java
===================================================================
--- xwiki-sandbox/interface/src/main/java/com/xpn/xwiki/web/RollbackAction.java 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/java/com/xpn/xwiki/web/RollbackAction.java 2006-07-25 19:53:29 UTC (rev 1096)
@@ -29,15 +29,17 @@
public class RollbackAction extends XWikiAction {
public boolean action(XWikiContext context) throws XWikiException {
XWiki xwiki = context.getWiki();
- XWikiRequest request = context.getRequest();
XWikiResponse response = context.getResponse();
XWikiDocument doc = context.getDoc();
RollbackForm form = (RollbackForm) context.getForm();
-
+
+ String confirm = form.getConfirm();
String rev = form.getRev();
String language = form.getLanguage();
- XWikiDocument tdoc;
-
+ XWikiDocument tdoc;
+ if((confirm == null) || (!confirm.equals("1"))){
+ return true;
+ }
if ((language==null)||(language.equals(""))||(language.equals("default"))||(language.equals(doc.getDefaultLanguage()))) {
// Need to save parent and defaultLanguage if they have changed
tdoc = doc;
@@ -62,5 +64,12 @@
String redirect = Utils.getRedirect("view", context);
sendRedirect(response, redirect);
return false;
- }
+ }
+
+ public String render(XWikiContext context) throws XWikiException {
+ handleRevision(context);
+ XWikiDocument doc = (XWikiDocument) context.get("doc");
+ String defaultTemplate = doc.getDefaultTemplate();
+ return "rollback";
+ }
}
Modified: xwiki-sandbox/interface/src/main/java/com/xpn/xwiki/web/RollbackForm.java
===================================================================
--- xwiki-sandbox/interface/src/main/java/com/xpn/xwiki/web/RollbackForm.java 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/java/com/xpn/xwiki/web/RollbackForm.java 2006-07-25 19:53:29 UTC (rev 1096)
@@ -23,12 +23,14 @@
public class RollbackForm extends XWikiForm {
private String rev;
- private String language;
+ private String language;
+ private String confirm;
public void readRequest() {
XWikiRequest request = getRequest();
setRev(request.getParameter("rev"));
- setLanguage(request.getParameter("language"));
+ setLanguage(request.getParameter("language"));
+ setConfirm(request.getParameter("confirm"));
}
public String getRev() {
@@ -45,5 +47,13 @@
public void setLanguage(String language) {
this.language = language;
- }
+ }
+
+ public String getConfirm() {
+ return confirm;
+ }
+
+ public void setConfirm(String confirm) {
+ this.confirm = confirm;
+ }
}
\ No newline at end of file
Modified: xwiki-sandbox/interface/src/main/resources/ApplicationResources.properties
===================================================================
--- xwiki-sandbox/interface/src/main/resources/ApplicationResources.properties 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/resources/ApplicationResources.properties 2006-07-25 19:53:29 UTC (rev 1096)
@@ -58,6 +58,7 @@
preview=Preview
login=Log-in
logout=Log-out
+rememberme=Remember me on this computer
homepage=User Home Page
styles=Styles
defaultstyle=Default Style
Modified: xwiki-sandbox/interface/src/main/web/WEB-INF/struts-config.xml
===================================================================
--- xwiki-sandbox/interface/src/main/web/WEB-INF/struts-config.xml 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/WEB-INF/struts-config.xml 2006-07-25 19:53:29 UTC (rev 1096)
@@ -138,6 +138,7 @@
name="rollback"
scope="request">
<forward name="edit" path="/templates/rollback.vm"/>
+ <forward name="rollback" path="/templates/rollback.vm"/>
</action>
<action path="/cancel/"
Modified: xwiki-sandbox/interface/src/main/web/WEB-INF/version.properties
===================================================================
--- xwiki-sandbox/interface/src/main/web/WEB-INF/version.properties 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/WEB-INF/version.properties 2006-07-25 19:53:29 UTC (rev 1096)
@@ -1,2 +1,2 @@
-#Mon Jul 24 01:22:07 EEST 2006
-build.number=1015
+#Tue Jul 25 14:12:53 EEST 2006
+build.number=1019
Modified: xwiki-sandbox/interface/src/main/web/skins/default/collapse.png
===================================================================
(Binary files differ)
Modified: xwiki-sandbox/interface/src/main/web/skins/default/collapseh.png
===================================================================
(Binary files differ)
Modified: xwiki-sandbox/interface/src/main/web/skins/default/corner.png
===================================================================
(Binary files differ)
Modified: xwiki-sandbox/interface/src/main/web/skins/default/elements.css
===================================================================
--- xwiki-sandbox/interface/src/main/web/skins/default/elements.css 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/skins/default/elements.css 2006-07-25 19:53:29 UTC (rev 1096)
@@ -97,7 +97,9 @@
/* Section 11: Tables */
table {}
-caption {}
+caption {
+ margin: auto;
+}
thead {}
tfoot {}
tbody {}
Modified: xwiki-sandbox/interface/src/main/web/skins/default/expand.png
===================================================================
(Binary files differ)
Modified: xwiki-sandbox/interface/src/main/web/skins/default/expandh.png
===================================================================
(Binary files differ)
Modified: xwiki-sandbox/interface/src/main/web/skins/default/page.css
===================================================================
--- xwiki-sandbox/interface/src/main/web/skins/default/page.css 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/skins/default/page.css 2006-07-25 19:53:29 UTC (rev 1096)
@@ -1,8 +1,7 @@
-.center {
- display: block;
- margin-left: 240px;
-}
-
.centered {
margin: auto;
-}
\ No newline at end of file
+ text-align: center;
+}
+/*.centered *{
+ text-align: left;
+}*/
Modified: xwiki-sandbox/interface/src/main/web/skins/default/screenlayout.css
===================================================================
--- xwiki-sandbox/interface/src/main/web/skins/default/screenlayout.css 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/skins/default/screenlayout.css 2006-07-25 19:53:29 UTC (rev 1096)
@@ -5,12 +5,18 @@
*/
-body{
+body#body{
position: relative;
width: 944px; /* screenwidth - 80 */
margin: auto;
+ text-align: center;
}
+#xwikimaincontainer{
+ width: 944px; /* screenwidth - 80 */
+ margin: auto;
+ text-align: left;
+}
.layoutsection{
clear: both;
}
@@ -116,6 +122,7 @@
#actionmenu{
position: relative;
+ left: 0px;
}
.layoutsubsection{
border: 1px solid #DDD;
@@ -123,23 +130,24 @@
padding: 0px 4px;
}
-.main.layoutsubsection{
+.layoutsubsection.main{
text-align: left;
padding-top: 4px;
}
-.about.layoutsubsection{
+.layoutsubsection.about{
border: none;
text-align: right;
font-style: italic;
margin-bottom: 20px;
font-size: 85%;
}
-.menu.right{
- position: absolute;
+.rightmenu{
+ /*position: relative;
top: 0px;
- right: 4px;
+ right: 4px;*/
+ float: right;
}
-.menu.left{
+.leftmenu{
padding-right: 2em;
}
@@ -179,11 +187,11 @@
.xwikiintra li a:hover{
text-decoration: underline;
}
-
.xwikiintra li.active{
- background-color: #FFF;
+ background-color: #FFF !important;
border: none;
border-bottom: 3px solid #FFF;
+ border-top: 1px solid #DDD;
}
.xwikicomment {
@@ -210,20 +218,20 @@
margin-left: 64px;
}
-.attachmentdelete a{
+.xwikibuttonlink a{
background-color: #BBB;
padding: 2px 4px;
text-decoration: none;
font-weight: bold;
}
-table.attachmentstable{
+table.xwikidatatable{
margin: 8px auto;
/* width: 100%; */
}
-table.attachmentstable, table.attachmentstable th{
+table.xwikidatatable, table.xwikidatatable th{
border: 1px solid #DDD;
}
-table.attachmentstable td{
+table.xwikidatatable td{
padding: 2px 8px;
}
.xwikiintracontent{
@@ -237,12 +245,17 @@
.xwikiintracontent fieldset{
border-color: #ddd;
border-style: solid;
+ padding: 8px 8px;
}
.xwikiintracontent legend{
font-size: 110%;
font-weight: bold;
cursor: pointer;
+ margin-bottom: 8px;
}
+html > body .xwikiintracontent legend{
+ margin-bottom: 0px;
+}
.xwikiintracontent fieldset.collapsed{
border: none;
}
Modified: xwiki-sandbox/interface/src/main/web/skins/default/style.css
===================================================================
--- xwiki-sandbox/interface/src/main/web/skins/default/style.css 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/skins/default/style.css 2006-07-25 19:53:29 UTC (rev 1096)
@@ -6,7 +6,6 @@
@import "screenlayout.css";
@import "colors.css";
@import "temp.css";
-
.rssfeed {
width: 90%;
}
@@ -26,7 +25,6 @@
background-color: #B6C5F2;
}
-
/* Dark Blue */
.xwikiactions a, #xwikiwebusermenu a {
background-color: #5368A6;
@@ -102,7 +100,6 @@
background-color: transparent;
}
-
/* Dark Blue */
.xwikiactions a, #xwikiwebusermenu a {
background-color: #BBB;
@@ -117,13 +114,58 @@
color: #000;
}
+.submenu{
+ display: block;
+ background-color: white;
+ border: 1px solid #ddd;
+ border-top: 1px solid white;
+ position: absolute;
+ padding: 4px 5px 8px;
+ margin-top: -1px;
+ margin-left: 5px;
+}
+.submenu .submenuitem{
+ display: block;
+}
.submenu.hidden{
display: none;
}
+
+input[type=submit], input[type=reset]{
+ background-color: #EEE;
+ font-family: Helvetica;
+ font-weight: bold;
+ padding: 1px 16px;
+}
+input[type=submit]:hover, input[type=reset]:hover{
+ background-color: #FFD;
+ cursor: pointer;
+}
+.xwikiintra li:hover, .xwikiintracontent legend:hover, .xwikiintracontent fieldset.collapsed legend:hover{
+ background-color: #FFD;
+}
+
+
+/*-------------------------------------------------------------------------------*/
+
+/* Dark Blue */
+.xwikiactions a, #xwikiwebusermenu a {
+ background-color: #369;
+}
+
+#xwikinav_footer, #xwikinav_header, #xwikinav_header.xwiki0b {
+ border-color: #369;
+}
+
+.heading-1, .heading-1-1 {
+ border: none;
+ color: #369;
+}
+
.submenu{
display: block;
background-color: white;
- border: 1px solid #ddd;
+/* border: 1px solid #369; */
border-top: 1px solid white;
position: absolute;
padding: 4px 5px 8px;
@@ -132,4 +174,215 @@
}
.submenu .submenuitem{
display: block;
+}
+.submenu.hidden{
+ display: none;
+}
+
+input[type=submit], input[type=reset], input[type=button], input.button{
+ background-color: #EEE;
+ font-family: Helvetica;
+ font-weight: bold;
+ padding: 1px 16px;
+}
+input[type=submit]:hover, input[type=reset]:hover, input[type=button]:hover, input.button:hover{
+ background-color: #FFD;
+ cursor: pointer;
+}
+.xwikiintra li:hover, .xwikiintracontent legend:hover, .xwikiintracontent fieldset.collapsed legend:hover{
+ background-color: #FFD;
+}
+/*___________________
+From elements.css
+_________________________*/
+
+.extern{
+ background: #369 url("corner.png") no-repeat right top;
+}
+a:link{
+ color: #369;
+}
+a:visited{
+ color: #777;
+}
+
+#companylogo img {
+ background-image: url("xwlogoblue.png");
+ background-repeat: no-repeat;
+ height: 91px;
+ width: 136px;
+}
+
+table{
+ border-spacing: 0px;
+ border-collapse: collapse;
+}
+
+/*---------------------------
+colors.css
+-----------------------------*/
+.panel{
+ border: 1px solid #ACD;
+ position: relative;
+}
+.xwikipaneltitle{
+ background-color: #CDF;
+ cursor: pointer;
+}
+.xwikipanelarrow{
+ position: absolute;
+ top: 0px;
+ right: 0px;
+ visibility: hidden;
+}
+
+tr.row.odd{
+ background-color: #CDF;
+}
+tr.row.even{
+ background-color: #FFF;
+}
+tr th{
+ background-color: #CDF;
+}
+
+
+/*---------------------------------
+ From scrennlayout.css
+-----------------------------------
+*/
+
+/*
+---------------------------------------
+Intra
+---------------------------------------
+*/
+ul.xwikiintra{
+ border-bottom: 1px solid #DDD;
+ margin: 0px -4px;
+ padding: 5px 0px 5px;
+ background-color: #EEE;
+}
+.xwikiintra li{
+ display: inline;
+ padding: 0px;
+ list-style-type: none;
+ background-color: #cdf;
+ border: none;
+ border: 1px solid #ACF;
+ border-bottom: 2px solid #CCC;
+ border-left-color: #DDF;
+ border-top-color: #DDF;
+}
+html > body .xwikiintra li{
+ padding: 5px 0px;
+}
+.xwikiintra li a{
+ padding: 5px 15px;
+ color: #000;
+ font-weight: bold;
+ text-decoration: none;
+}
+.xwikiintra li a:hover{
+ text-decoration: none;
+}
+.xwikiintra li.active a:hover{
+ cursor: default;
+}
+.xwikiintra li.active a{
+ color: #000;
+}
+
+.xwikibuttonlink a{
+ background-color: #369;
+ color: #fff;
+}
+
+.xwikibuttonlink a:hover{
+ background-color: #ffd;
+ color: #369;
+}
+
+
+table.xwikidatatable th{
+ border: 1px solid #369;
+ background-color: #369;
+ color: #cdf;
+ text-align: center;
+}
+
+table.xwikidatatable td{
+ padding: 2px 8px;
+}
+.xwikiintracontent{
+ margin: 8px;
+}
+
+.xwikilogintable{
+ margin: 8px auto;
+}
+.xwikilogintable th{
+ text-align: right;
+ background-color: transparent;
+}
+/*
+.xwikiintracontent legend{
+ border: 1px solid #369;
+}
+.xwikiintracontent fieldset{
+ border-color: #369;
+}
+*/
+
+fieldset.xwikimessage{
+ width: 480px;
+ margin: auto;
+ border: 2px solid #658BB2;
+ border-top: 8px solid #658BB2;
+ background-color: #F5F5F5;
+ padding: 0px 8px 16px;
+}
+html > body fieldset.xwikimessage{
+ padding-top: 8px;
+}
+
+fieldset.xwikimessage legend{
+ background-color: #658BB2;
+ color: #FFF;
+ font-weight: bold;
+ font-size: 110%;
+ padding: 2px 8px;
+ margin: 0px;
+}
+fieldset.xwikimessage .xwikimessage{
+ text-align: center;
+ font-weight: bold;
+ font-size: 110%;
+}
+fieldset.xwikimessage .buttons{
+ text-align: center;
+}
+fieldset.xwikimessage .buttons a{
+ text-decoration: none;
+ margin: 8px;
+}
+
+input.button{
+ background-color: #EEE;
+ font-family: Helvetica;
+ font-weight: bold;
+ padding: 1px 16px;
+ text-align: center;
+}
+
+#xwikihistorylist li{
+ list-style-type: none;
+}
+
+
+.xwikiintracontent h4{
+ font-size: 110%;
+ text-align: left;
+ text-transform: none;
+ margin: 0px;
}
\ No newline at end of file
Modified: xwiki-sandbox/interface/src/main/web/skins/default/xwiki.js
===================================================================
--- xwiki-sandbox/interface/src/main/web/skins/default/xwiki.js 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/skins/default/xwiki.js 2006-07-25 19:53:29 UTC (rev 1096)
@@ -21,26 +21,20 @@
/*if(element.lastChild.style.display == "block") return;*/
element.lastChild.style.left = (computeAbsoluteLeft(element) - 10) + "px";
element.lastChild.style.top = computeAbsoluteTop(element) + "px";
- element.lastChild.className = element.lastChild.className.replace("hidden", "");
+ element.lastChild.className = element.lastChild.className.replace("hidden", "visible");
}
}
function computeAbsoluteLeft(element) {
- x = element.offsetLeft;
- tmp = element.offsetParent;
- //while (tmp != null && (tmp.getAttribute("id") != "withoutfooter")) {
- // x += tmp.offsetLeft;
- // tmp = tmp.offsetParent;
- //}
- return x;
+ if(window.ActiveXObject){
+ return element.offsetLeft - element.parentNode.parentNode.parentNode.currentStyle.marginLeft.match("[0-9]+") - element.lastChild.currentStyle.marginLeft.substring(0, 1);
+ }
+ return element.offsetLeft;
}
function computeAbsoluteTop(element) {
- y = element.offsetTop;
- tmp = element.offsetParent;
- //while (tmp != null) {
- // y += tmp.offsetTop;
- // tmp = tmp.offsetParent;
- //}
- return y + element.offsetHeight;
+ if(window.ActiveXObject){
+ return element.offsetHeight;
+ }
+ return element.offsetTop + element.offsetHeight;
}
function hidesubmenu(element){
if(element.lastChild.tagName.toLowerCase() == "span"){
@@ -50,7 +44,7 @@
}
function doHide(){
- window.hideelement.className += " hidden";
+ window.hideelement.className = window.hideelement.className.replace("visible", "hidden");
clearTimeout(window.hidetimer);
window.hidetimer = null;
window.hideelement = null;
Added: xwiki-sandbox/interface/src/main/web/skins/default/xwlogoblue.png
===================================================================
(Binary files differ)
Property changes on: xwiki-sandbox/interface/src/main/web/skins/default/xwlogoblue.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: xwiki-sandbox/interface/src/main/web/templates/attachmentsinline.vm
===================================================================
--- xwiki-sandbox/interface/src/main/web/templates/attachmentsinline.vm 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/templates/attachmentsinline.vm 2006-07-25 19:53:29 UTC (rev 1096)
@@ -71,7 +71,7 @@
</script>
#end
#if($attachments.size()>0)
- <table class="attachmentstable">
+ <table class="xwikidatatable" summary="$msg.get(document) ${doc.displayTitle} — $msg.get("attachments")">
<col class="attachmenttype"/>
<col class="attachmentname"/>
<col class="attachmentauthor"/>
@@ -101,7 +101,7 @@
<td>$!xwiki.formatDate($attach.date, "dd/MM/yyyy")</td>
<td>$attach.filesize</td>
#if($hasedit || $hasadmin)
- <td class="attachmentdelete"><a href="$doc.getAttachmentURL("${attach.filename}", "delattachment")" onclick="return confirm('$msg.get("confirmdelattachment")');" title="$msg.get("deletethisattachment")">$msg.get("delete")</a></td>
+ <td class="xwikibuttonlink"><a href="$doc.getAttachmentURL("${attach.filename}", "delattachment")" onclick="return confirm('$msg.get("confirmdelattachment")');" title="$msg.get("deletethisattachment")">$msg.get("delete")</a></td>
#end
</tr>
#set($counter = $counter + 1)
Modified: xwiki-sandbox/interface/src/main/web/templates/global.vm
===================================================================
--- xwiki-sandbox/interface/src/main/web/templates/global.vm 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/templates/global.vm 2006-07-25 19:53:29 UTC (rev 1096)
@@ -37,7 +37,7 @@
#if($searchdoc.isNew()==false)
<div id="globalsearch">
<form action="$searchdoc.getURL("view")">
- <p><input type="text" name="text" value="" size="15"/> <input type="submit" value="Search"/></p>
+ <p><input type="text" name="text" value="" size="15"/> <input type="submit" class="button" value="Search"/></p>
</form>
</div>
</div>
Added: xwiki-sandbox/interface/src/main/web/templates/historyinline.vm
===================================================================
--- xwiki-sandbox/interface/src/main/web/templates/historyinline.vm 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/templates/historyinline.vm 2006-07-25 19:53:29 UTC (rev 1096)
@@ -0,0 +1,52 @@
+ <div id="historycontent" class="xwikiintracontent">
+ <h4 class="xwikiintratitle">$msg.get("history")</h4>
+ <form action="$doc.getURL("view")" method="post">
+ <div>
+ <input type="hidden" name="xpage" value="changes" />
+ <div class="centered">
+## <h4>$msg.get("dochistory")</h4>
+ <div class="buttons"><input type="submit" accesskey="c" value="$msg.get("compare")" class="button"/><input type="button" accesskey="a" value="$msg.get("allchanges")" onclick="location='$doc.getURL("view","xpage=changesall")'" class="button"/></div>
+ <table class="xwikidatatable" summary="$msg.get(document) ${doc.displayTitle} — $msg.get("history")">
+ <tr>
+ <th>$msg.get("from")</th>
+ <th>$msg.get("to")</th>
+ <th>$msg.get("version")</th>
+ <th>$msg.get("reveditor")</th>
+ <th>$msg.get("date")</th>
+#if($hasedit || $hasadmin)
+ <th></th>
+#end
+ </tr>
+#if(!$revisionscount)
+#set($revisionscount = 0)
+#end
+#if ($tdoc.realLanguage!="")
+#set($lang = "&language=${tdoc.realLanguage}")
+#else
+#set($lang = "")
+#end
+#foreach ($version in $tdoc.getRecentRevisions($revisionscount))
+#set($origdoc = "")
+#set($newdoc = "")
+#set($nextversion = $version)
+#set($newdoc = $xwiki.getDocument($tdoc, $nextversion))
+ <tr class="row#if($velocityCount % 2 == 1) even #else odd #end">
+ <td><input type="radio" name="rev1" value="$nextversion" /></td>
+ <td><input type="radio" name="rev2" value="$nextversion" /></td>
+ <td><a href="$tdoc.getURL("viewrev","rev=$nextversion")">$nextversion</a></td>
+#if($newdoc=="")
+ <td>–</td>
+ <td>–</td>
+#else
+ <td>$xwiki.getLocalUserName($newdoc.author)</td>
+ <td>$xwiki.formatDate($newdoc.date, "dd/MM/yyyy hh:mm")</td>
+#end
+#if($hasedit || $hasadmin)
+ <td class="xwikibuttonlink"><a href="$tdoc.getURL("rollback","rev=$nextversion$lang")" onclick="if (confirm('$msg.get("readytorollback") $nextversion')){this.href += '&confirm=1'; return true;} return false;">$msg.get("rollback")</a></td>
+#end
+ </tr>
+#end
+</table></div>
+ </div>
+ </form>
+ </div>
\ No newline at end of file
Modified: xwiki-sandbox/interface/src/main/web/templates/htmlfooter.vm
===================================================================
--- xwiki-sandbox/interface/src/main/web/templates/htmlfooter.vm 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/templates/htmlfooter.vm 2006-07-25 19:53:29 UTC (rev 1096)
@@ -1,4 +1,5 @@
#if($context.getMode()==0)
+</div>
</body>
</html>
#end
Modified: xwiki-sandbox/interface/src/main/web/templates/htmlheader.vm
===================================================================
--- xwiki-sandbox/interface/src/main/web/templates/htmlheader.vm 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/templates/htmlheader.vm 2006-07-25 19:53:29 UTC (rev 1096)
@@ -72,10 +72,12 @@
}
</script>
</head>
-<body onUnload="cancelEdit()" onLoad="prepareCancelEdit()">
+<body onUnload="cancelEdit()" onLoad="prepareCancelEdit()" id="body">
+<div id="xwikimaincontainer">
#else
</head>
-<body>
+<body id="body">
+<div id="xwikimaincontainer">
#end
#else
#template("stylesheets2.vm")
Modified: xwiki-sandbox/interface/src/main/web/templates/httpheader.vm
===================================================================
--- xwiki-sandbox/interface/src/main/web/templates/httpheader.vm 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/templates/httpheader.vm 2006-07-25 19:53:29 UTC (rev 1096)
@@ -1,3 +1,3 @@
## Deprecated!
##
-#include("htmlheader")
\ No newline at end of file
+#template("htmlheader.vm")
\ No newline at end of file
Modified: xwiki-sandbox/interface/src/main/web/templates/login.vm
===================================================================
--- xwiki-sandbox/interface/src/main/web/templates/login.vm 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/templates/login.vm 2006-07-25 19:53:29 UTC (rev 1096)
@@ -1,31 +1,34 @@
-#template("xwiki.vm")
-#template("httpheader.vm")
+#if ($request.getParameter("raw").equals("1"))
+#template("code.vm")
+#else
+#template("xwikivars.vm")
+#template("layoutvars.vm")
+#template("htmlheader.vm")
#template("header.vm")
-#template("baseheader.vm")
+##
#if($message)
-<div id="xwikimessage">
-$message
-</div>
+<div id="xwikimessage">$message</div>
#end
-<div id="xwikicontent">
-<form id="loginForm" action="" method="POST">
+<div class="layoutsection">
+ <div id="contentcolumn" class="content hideleft hideright">
+<form id="loginForm" action="" method="post">
<input type="hidden" name="xredirect" value="$!request.getParameter("xredirect")" />
-<table border="0">
-<tr><td>$msg.get("username"):</td>
-<td><input type="text" name="j_username" value="" /></td>
-</tr>
-<tr><td>$msg.get("password"):</td>
-<td><input type="password" name="j_password" value="" /></td>
-</tr>
-<tr><td colspan="2">
+#xwikimessageboxstart($msg.get("login") "")
+<table class="xwikilogintable" summary="$msg.get("loginform")">
+<tr><th>$msg.get("username"):</th>
+<td><input type="text" name="j_username" value=""/></td></tr>
+<tr><th>$msg.get("password"):</th>
+<td><input type="password" name="j_password" value=""/></td></tr>
+</table>
<input type="checkbox" name="j_rememberme" value="true" CHECKED /> $msg.get("rememberme")
-</td>
-</tr>
-<tr>
-<td colspan="2"><input type="submit" value="$msg.get("login")"/></td>
-</tr>
-</table>
+<div class="buttons"><input type="submit" class="button" value="$msg.get("login")"/></div>
+#xwikimessageboxend()
</form>
+ </div>
</div>
-#template("basefooter.vm")
+##
+##
+##
#template("footer.vm")
+#template("htmlfooter.vm")
+#end
\ No newline at end of file
Modified: xwiki-sandbox/interface/src/main/web/templates/macros.vm
===================================================================
--- xwiki-sandbox/interface/src/main/web/templates/macros.vm 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/templates/macros.vm 2006-07-25 19:53:29 UTC (rev 1096)
@@ -527,7 +527,7 @@
###
#macro(panelheader $title)
<div class="panel expanded">
-<h6 class="xwikipaneltitle" onclick="toggleVisibility(this.parentNode);">$title</h6>
+<h6 class="xwikipaneltitle" onclick="toggleVisibility(this.parentNode);">$title</h6><span class="xwikipanelarrow"> </span>
<div class="xwikipanelcontents">
#end
@@ -541,33 +541,64 @@
</div>
#end
-
-## Define the "xwikiimglink" macro used in the lower menu area
-#macro(xwikiimglink $actionurl $imgurl $linktext)
-<a href="$actionurl" class="img"><img src="$imgurl" alt="$linktext" title="$linktext"/>$linktext</a><span class="xwikisep"> | </span>
-#end
-## End macro
-
+###
+### Toplevel Menu entry with subitems
+###
+### Generate a menu entry and start the subitem section
+###
+### @param actionurl The URL this entry points to
+### @param linktext The menu item text
+###
#macro(xwikitopmenuentrystart $actionurl $linktext)
<div class="topmenuentry" onmouseover="showsubmenu(this);" onmouseout="hidesubmenu(this);"><a href="$actionurl"><strong>$linktext</strong></a><span class="hidden menucolon">: </span><span class="submenu hidden">
#end
+
+###
+### Toplevel Menu entry without subitems
+###
+### Generate a menu entry withut subitems
+###
+### @param actionurl The URL this entry points to
+### @param linktext The menu item text
+###
#macro(xwikitopmenuentry $actionurl $linktext)
<div class="topmenuentry"><a href="$actionurl"><strong>$linktext</strong></a></div>
#end
+###
+### Menu subitem entry
+###
+### Generate a submenu entry
+###
+### @param actionurl The URL this entry points to
+### @param linktext The menu item text
+###
#macro(submenuitem $actionurl $linktext)
<span class="submenuitem"><a href="$actionurl">$linktext</a></span>
#end
+###
+### Toplevel Menu entry end
+###
+### End the subitem section
+###
#macro(xwikitopmenuentryend)
</span></div>
#end
-## Define the "xwikiitem" macro used in the "More Actions" menu
-#macro(xwikiitem $url $msgname)
-<span class="xwikimoreactionitem"><a href="$url">$msg.get($msgname)</a></span><span class="xwikisep"> | </span>
+#macro(xwikimessageboxstart $title $message)
+ <div class="centered">
+ <fieldset class="xwikimessage">
+ <legend>$title</legend>
+ <p class="xwikimessage">$message</p>
#end
-## End macro
-## Define the "toSentenceCase" macro which changes the case of a string
-#macro(toSentenceCase $str)$str.substring(0, 1).toUpperCase()$str.substring(1).toLowerCase()#end
-## End macro
+#macro(xwikimessageboxend)
+ </fieldset>
+ </div>
+#end
+
+#macro(xwikimessagebox $title $message $urlyes $urlno $msgyes $msgno)
+#xwikimessageboxstart($title $message)
+ <div class="buttons"><a href="$urlyes"><input type="button" class="button" value="$msgyes"/></a><a href="$urlno"><input type="button" class="button" value="$msgno"/></a></div>
+#xwikimessageboxend()
+#end
\ No newline at end of file
Modified: xwiki-sandbox/interface/src/main/web/templates/menuview.vm
===================================================================
--- xwiki-sandbox/interface/src/main/web/templates/menuview.vm 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/templates/menuview.vm 2006-07-25 19:53:29 UTC (rev 1096)
@@ -22,6 +22,8 @@
#if($context.getMode()==0)## Visible only in a page
<div id="actionmenu" class="layoutsubsection">
<h3 id="xwikimenutitle" class="hidden">$msg.get("menu")</h3>
+<div class="rightmenu">?</div>
+<div class="leftmenu">
##
## Edit menu
##
@@ -79,6 +81,6 @@
#if($hasadmin)
#xwikitopmenuentry($doc.getURL("delete", $languageparams) $msg.get("delete"))
#end
-<span class="right menu">?</span>
</div>
+</div>
#end
\ No newline at end of file
Added: xwiki-sandbox/interface/src/main/web/templates/rollback.vm
===================================================================
--- xwiki-sandbox/interface/src/main/web/templates/rollback.vm 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/templates/rollback.vm 2006-07-25 19:53:29 UTC (rev 1096)
@@ -0,0 +1,18 @@
+#if ($request.getParameter("raw").equals("1"))
+#template("code.vm")
+#else
+#template("xwikivars.vm")
+#template("layoutvars.vm")
+#template("htmlheader.vm")
+#template("header.vm")
+<div class="layoutsection">
+ <div id="contentcolumn" class="content hideleft hideright">
+#xwikimessagebox($msg.get("rollback") $msg.get('readytorollback').concat(" ").concat($request.get("rev")).concat("?") "${request.requestURL}?confirm=1&${request.queryString.replace('&', '&').replace('&amp;', '&')}" $doc.getURL('view') $msg.get("yes") $msg.get("no"))
+ </div>
+</div>
+##
+##
+##
+#template("footer.vm")
+#template("htmlfooter.vm")
+#end
\ No newline at end of file
Modified: xwiki-sandbox/interface/src/main/web/templates/view.vm
===================================================================
--- xwiki-sandbox/interface/src/main/web/templates/view.vm 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/templates/view.vm 2006-07-25 19:53:29 UTC (rev 1096)
@@ -1,5 +1,5 @@
#if ($request.getParameter("raw").equals("1"))
- #template("code.vm")
+#template("code.vm")
#else
#template("xwikivars.vm")
#template("layoutvars.vm")
Modified: xwiki-sandbox/interface/src/main/web/templates/xwikivars.vm
===================================================================
--- xwiki-sandbox/interface/src/main/web/templates/xwikivars.vm 2006-07-25 15:33:44 UTC (rev 1095)
+++ xwiki-sandbox/interface/src/main/web/templates/xwikivars.vm 2006-07-25 19:53:29 UTC (rev 1096)
@@ -1,5 +1,5 @@
#template("fudocs.vm")
-##template("macros.vm")
+#template("macros.vm")
#set($isguest = $context.getUser().equals("XWiki.XWikiGuest"))
#set($hasedit = $xwiki.hasAccessLevel("edit"))
#set($hasadmin = $xwiki.hasAccessLevel("admin"))
More information about the Xwiki-notifications
mailing list