r1006 - in xwiki/trunk/src/main/web/skins: . new

Ludovic Dubost ludovic at users.forge.objectweb.org
Tue Mar 28 21:23:53 CEST 2006 

Author: ludovic
Date: 2006-03-28 21:23:53 +0200 (Tue, 28 Mar 2006)
New Revision: 1006

Added:
   xwiki/trunk/src/main/web/skins/new/
   xwiki/trunk/src/main/web/skins/new/basestyle.css
   xwiki/trunk/src/main/web/skins/new/edit.vm
   xwiki/trunk/src/main/web/skins/new/editobject.vm
   xwiki/trunk/src/main/web/skins/new/footer.vm
   xwiki/trunk/src/main/web/skins/new/header.vm
   xwiki/trunk/src/main/web/skins/new/powered-by-xwiki.png
   xwiki/trunk/src/main/web/skins/new/view.vm
Log:
base skin with 2 columns which allows to more easily adapt the look and feel

Added: xwiki/trunk/src/main/web/skins/new/basestyle.css
===================================================================
--- xwiki/trunk/src/main/web/skins/new/basestyle.css	2006-03-28 19:19:15 UTC (rev 1005)
+++ xwiki/trunk/src/main/web/skins/new/basestyle.css	2006-03-28 19:23:53 UTC (rev 1006)
@@ -0,0 +1,392 @@
+ at import "elements.css";
+ at import "ie.css";
+
+#xwikibody {
+ text-align: center;
+ margin: auto;
+ background-color: #ffffff;
+}
+
+#xwikibodycontent {
+ width: 100%;
+ margin: auto;
+ text-align: left;
+ background-color: #ffffff;
+}
+
+#xwikimenu {
+ float: left;
+ clear: left;
+ margin-left: 15px;
+}
+
+#xwikitoolbar {
+ float: right;
+ clear: right;
+ width: 13em;
+}
+
+#xwikicontent {
+ margin-left: 13em;
+ margin-top: 5px;
+ margin-bottom: 15px;
+}
+
+#xwikieditcontent {
+ margin-right: 14em;
+}
+
+#xwikimenu {
+ clear: left;
+ width: 12em;
+}
+
+#xwikiheader {
+ padding: 5px;
+}
+
+#xwikifooter {
+ clear: both;
+ padding: 5px;
+ height: 5em;
+}
+
+#xwikiwebusermenu {
+ display: none;
+}
+
+#xwikititle {
+ float: left;
+}
+
+#xwikiad {
+    float: right;
+    margin-right: 30px;
+}
+
+#xwikilogin {
+    float: right;
+}
+
+#xwikinav_header {
+    display: block;
+    clear: both;
+    width: 100%;
+    height: 4.3em;
+    right: 0px;
+    border-width: 2px 0px 1px 0px;
+    border-style: solid;
+    background-repeat: repeat;
+}
+
+#xwikinav_header.xwiki0b {
+    height: 2.2em;
+    border-width: 2px 0px 0px 0px;
+}
+
+#xwikinav_header.xwiki1a {
+    display: block;
+}
+
+.xwikiactions, #xwikiwebusermenu, #xwikilanguagemenu, #xwikieditmenu {
+    display: block;
+    float: left;
+    margin: 0px;
+    padding: 0px;
+}
+
+.xwikiactions a, #xwikiwebusermenu a, #xwikilanguagemenu a, #xwikieditmenu a, #xwikieditmenu img {
+    display: block;
+    float: left;
+    list-style-type: none;
+    margin: 0.1em;
+    margin-left: 0.2em;
+    margin-right: 0.2em;
+    padding: 0.1em;
+    padding-left: 0.3em;
+    padding-right: 0.3em;
+    text-decoration: none;
+    text-align: center;
+}
+
+#xwikiwebusermenu span, .xwikiactions span {
+    display: none;
+}
+
+#xwikiwebusermenu {
+    height: auto;
+    width: 100%;
+}
+
+#xwikilanguagemenu, #xwikieditmenu {
+    margin: 0px;
+    padding-left: 10px;
+    height: auto;
+}
+
+#xwikireadonly {
+    color: red;
+}
+
+#xwikilanguagemenu {
+    float: right;
+    right: 0px;
+}
+
+#xwikieditmenu {
+    left: 0px;
+}
+
+#xwikieditmenu a, #xwikieditmenu a:visited, #xwikieditmenu img,
+#xwikilanguagemenu a, #xwikilanguagemenu a:visited,
+#xwikilanguagemenu span.xwikisep2expl {
+    display: block;
+    float: left;
+    list-style-type: none;
+    margin: 0em;
+    margin-left: 0em;
+    margin-top: 0.2em;
+    margin-right: 0.2em;
+    padding: 0.2em;
+    padding-left: 0.3em;
+    padding-right: 0.3em;
+    text-decoration: none;
+    text-align: center;
+    font-size: 10pt;
+}
+
+#xwikieditmenu img {
+    margin: 0em;
+    padding: 0em;
+    margin-right: 2px;
+    margin-top: 1px;
+    vertical-align : middle;
+    border: 0px;
+}
+
+#xwikimoreactions {
+    padding: 0;
+    margin: 0;
+    z-index: 20;
+}
+
+#xwikimoreactionsitems a, #xwikimoreactionsitems a:hover, #xwikimoreactionsitems a:visited {
+    text-decoration: none;
+    padding: 0;
+    margin: 0;
+    margin-right: 5px;
+    font-size: 11px;
+    line-height: 16px;
+}
+
+#xwikimoreactions div a {
+    display: block;
+}
+
+#xwikimoreactionstitle a, #xwikimoreactionstitle a:hover, #xwikimoreactionstitle a:visited {
+    margin-top: 0.2em;
+    padding-top: 0.2em;
+}
+
+#xwikimoreactions, .xwikimoreactionitem {
+    float: left;
+    position: relative;
+    width: auto;
+    text-align: center;
+    cursor: default;
+}
+
+#xwikimoreactionsitems {
+   display: none;
+   position: absolute;
+   width: 12em;
+   top: 2em;
+   left: 1em;
+   padding: 0;
+   border: 1px solid;
+   padding: 5px;
+   background-color: #fff;
+}
+
+#xwikimoreactionsitems a:hover {
+   text-decoration: none;
+   color: #222222;
+}
+
+#xwikimoreactions>#xwikimoreactionsitems {
+   top: 1.8em;
+   left: 0;
+}
+
+#xwikimoreactionsitems .xwikimoreactionitem {
+   display: block;
+   float: none;
+   background-color: white solid;
+   border: 0;
+}
+
+#xwikimoreactions:hover div, #xwikimoreactions.over div {
+   display: block;
+}
+
+#xwikimoreactions:hover #xwikimoreactionsitems {
+   padding: 5px;
+}
+
+.xwikimoreactionitem {
+   clear: both;
+   width: 100%;
+   padding: 0;
+   padding-left: 10px;
+   margin: 0;
+   width: 12em;
+}
+
+#xwikieditmenu a:hover, #xwikilanguagemenu a:hover {
+   text-decoration: underline;
+}
+
+.xwikisep, .xwikisep2 {
+   display: none;
+}
+
+#xwikidocinfo, #xwikidocinfoname, #xwikidocinfocreated, #xwikidocinfoupdated, #xwikidocinfolang {
+   float: left;
+}
+#xwikidocinfocreated, #xwikidocinfoupdated {
+   clear: left;
+}
+#xwikicopyright, #xwikiicons {
+   float: right; 
+   clear: right; 
+}
+#xwikisearch {
+   float: right;
+   clear: right;
+}
+
+#xwikisearch {
+   float: right;
+   padding: 3px;
+   margin-top: 15px;
+}
+
+.xwikicomment {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  padding: 5px 5px 5px 5px;
+  color: inherit;
+  border: 1px dotted;
+  width: 90%;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+#xwikidata {
+ margin-top: 10px;
+ margin-bottom: 10px;
+}
+
+.xwikidata {
+ float: left;
+ clear: both;
+ margin-left: 10px;
+ margin-top: 5px;
+ margin-bottom: 5px;
+ padding: 0px;
+ width: 80%;
+}
+
+.xwikidatacontent {
+ padding-left: 10px;
+ float: left;
+ color: #666;
+}
+
+.xwikidatatitle {
+ float: left;
+ padding: 2px;
+ color: #fff;
+}
+
+.xwikidatatitle a {
+ color: #fff;
+}
+
+.xwikidatatitle1, .xwikidatafooter1 {
+ float: left;
+ width: 10px;
+ background: url(box_top.gif) no-repeat top left;
+}
+
+.xwikidatatitle2, .xwikidatafooter2 {
+ float: left;
+ width: 100%;
+ border-bottom: 1px solid #fff;
+ background: url(box_top2.gif) no-repeat top right;
+}
+
+.xwikidatafooter {
+ float: left;
+ padding-left: 10px;
+ padding-right: 10px;
+ color: #fff;
+}
+
+.xwikidatafooter1 {
+ background: url(box_bottom.gif) no-repeat bottom left;
+}
+
+.xwikidatafooter2 {
+ background: url(box_bottom2.gif) no-repeat bottom right;
+}
+
+#xwikiattachmentscontent {
+ text-align: center;
+}
+
+#xwikiattachmentscontent table {
+  border: 1px dotted;
+  width: 80%;
+  margin-top: 10px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+#xwikiattachmentsform {
+  margin-left: auto;
+  margin-right: auto;
+  width: 70%;
+}
+
+#xwikimessage {
+  float: left;
+  clear: left;
+  width: 100%;
+  margin: auto;
+  padding: auto;
+  margin-top: 5px;
+  margin-left: 20px;
+}
+
+.article_title {
+ font-size: 120%;
+ border-bottom: 1px;
+}
+
+.article_content {
+ padding: 10px;
+}
+
+.article_date {
+ font-size: 120%;
+ border-bottom: 1px solid;
+}
+
+.article_footer {
+ border-top: 1px dotted; 
+ font-size: 75%; 
+ font-weight: bold; 
+ color: gray;
+}
+

Added: xwiki/trunk/src/main/web/skins/new/edit.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/new/edit.vm	2006-03-28 19:19:15 UTC (rev 1005)
+++ xwiki/trunk/src/main/web/skins/new/edit.vm	2006-03-28 19:23:53 UTC (rev 1006)
@@ -0,0 +1,85 @@
+#set($hasedit = $xwiki.hasAccessLevel("edit"))
+#set($hasadmin = $xwiki.hasAdminRights())
+#set($showactions=1)
+#template("editheader.vm")
+<div id="xwikiedit">
+ <div id="xwikitoolbar">
+ #if($xwiki.exists("${doc.web}.EditToolbar"))
+      $xwiki.includeForm("${doc.web}.EditToolbar",false)
+ #else
+  #if($xwiki.exists("XWiki.EditToolbar"))
+      $xwiki.includeForm("XWiki.EditToolbar",false)
+  #else
+   #if($xwiki.exists("xwiki:XWiki.EditToolbar"))
+    $xwiki.includeForm("xwiki:XWiki.EditToolbar",false)
+   #else
+    #template("edittoolbar.vm")
+   #end
+  #end
+ #end
+ </div>
+ <div id="xwikieditcontent">
+#set($xredirect=$!request.getParameter("xredirect"))
+<form id="edit" method="post" action="$doc.getURL("preview")">
+<p>
+<input type="hidden" name="template" value="$!tdoc.template" />
+<input type="hidden" name="xredirect" value="$!xredirect" />
+<input type="hidden" name="language" value="$!tdoc.language" />
+</p>
+#set($force = $!request.get("force"))
+#if (($tdoc.getLocked()==true)&&(!$force))
+<p>
+$msg.get("doclockedby"): $xwiki.getLocalUserName($doc.getLockingUser()).
+<br />
+<a href="$doc.getURL("edit", "template=$!tdoc.template&xredirect=$!xredirect&language=$!tdoc.language&force=1")">$msg.get("forcelock")
+</p>
+#else
+#set( $pages = $tdoc.includedPages)
+#if ( $pages.size() > 0)
+<p>
+$msg.get("editincludepagemsg")
+#foreach ($page in $pages)
+<a href="$xwiki.getURL($page, "edit")">$page</a>&nbsp;
+#end
+</p>
+#end
+<div id="xwikitext">
+#if ($xwiki.isMultiLingual()==true)
+$msg.get("youareediting"): $tdoc.language
+<br /><br />
+#end
+#includeHelp("EditWikiToolbar")
+$xwiki.getTextArea($tdoc.content)
+<br/>
+<script type="text/javascript">
+<!--
+function openHelp() {
+  win = open( "http://www.xwiki.com/xwiki/bin/view/Doc/XWikiSyntax?xpage=plain",
+			   "syntax", "titlebar=0,width=750,height=480,resizable,scrollbars");
+  if( win ) {
+	 win.focus();
+  }
+}
+// -->
+</script>
+$msg.get("helponsyntax") <a href="" onClick="openHelp(); return false;">$msg.get("xwikisyntax")</a>
+<br /><br />
+#if ($tdoc.language=="")
+$msg.get("parent"):&nbsp;<input type="text" name="parent" value="$!doc.parent" size="40" />
+<br/><br/>
+$msg.get("defaultlanguage"):&nbsp;<input type="text" name="default_language" value="$!doc.defaultLanguage" size="10" />
+<br/><br/>
+#if(($doc.creator.equals($context.user))
+     ||($hasadmin))
+$msg.get("creator"):&nbsp;<input type="text" name="creator" value="$!doc.creator" size="40" />
+#else
+$msg.get("creator"):&nbsp;$!doc.creator
+#end
+#end
+#end
+</div>
+</form>
+#includeHelp("EditHelp")
+</div>         
+</div>
+#template("editfooter.vm")

Added: xwiki/trunk/src/main/web/skins/new/editobject.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/new/editobject.vm	2006-03-28 19:19:15 UTC (rev 1005)
+++ xwiki/trunk/src/main/web/skins/new/editobject.vm	2006-03-28 19:23:53 UTC (rev 1006)
@@ -0,0 +1,108 @@
+#set($showactions=0)
+#template("editheader.vm")
+<div id="xwikiedit">
+ <div id="xwikieditcontent">
+#set( $classes = $doc.getxWikiClasses())
+#set( $redirect = $xwiki.getRequestURL())
+<script type="text/javascript">
+<!--
+var currentfield = "";
+function show(fieldname) {
+  if (currentfield!="")
+    document.getElementById(currentfield).style.display="none";
+  document.getElementById(fieldname).style.display="block";
+  currentfield = fieldname;
+}
+// -->
+</script>
+<div id="intro">
+$msg.get("welcometoobjecteditor")
+</div>
+<form id="update" method="post" action="$doc.getURL("save")">
+<p>
+<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" />
+#set ( $first = 1)
+#foreach($class in $classes)
+#set( $nb = $doc.getObjectNumbers("${class.name}"))
+<input type="hidden" name="${class.name}_nb" value="$nb" />
+</p>
+#foreach($obj in $doc.getObjects($class.name))
+<div id="${class.name}_${obj.number}" style="display: #if ($first==1) block #else none #end;">
+#if ($first==1)
+<script type="text/javascript">
+<!--
+currentfield = "${class.name}_${obj.number}";
+// -->
+</script>
+#set ($first = 0)
+#end
+
+$msg.get("youcan") <a href="$doc.getURL("objectremove" , "classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${xwiki.getFormEncoded($redirect)}")"
+    onclick="return confirm('$msg.get("confirmobjectremove")')">
+    $msg.get("removethisobject")</a><br /><br /><br />
+
+<table>
+#foreach($prop in $class.properties)
+<tr><td>$prop.prettyName</td>
+<td>$doc.displayEdit($prop, "${class.name}_${obj.number}_",  $obj)
+</td></tr>
+#end
+</table>
+</div>
+ #end
+#end
+</form>
+#includeHelp("EditObjectsHelp")
+ </div>
+ <div id="xwikitoolbar">
+<h2>$msg.get("objecteditor")</h2>
+<br />
+<p style="text-align: center">
+<input type="button" value="$msg.get("saveobjects")" onclick="document.forms.update.submit()" />
+</p>
+<br />
+<h3>$msg.get("currentobjects")</h3>
+#foreach ($class in $classes)
+<b>$class.name</b><br />
+<div id="class_${class.name}">
+#set( $props = $class.getProperties())
+#set( $i=0)
+#foreach( $prop in $props)
+#if ($i==0)
+#set($firstfield = $prop.name)
+#set ($i = 1)
+#end
+#end
+#foreach ($obj in $doc.getObjects($class.name))
+&nbsp;&nbsp;<a href="" onclick="show('${class.name}_${obj.number}'); return false;">${obj.number}: $doc.display($firstfield,$obj)</a><br />
+#end
+</div>
+<br /><br />
+#end
+<h3>$msg.get("addobject")</h3>
+<form id="objectadd" method="post" action="$doc.getURL("objectadd")">
+<p style="text-align: center">
+<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" />
+<select name="classname" size="1">
+<option value="---">$msg.get("selectclass")</option>
+#foreach ($classname in $xwiki.classList)
+<option value="$classname">$classname</option>
+#end
+</select>
+<input type="submit" value="$msg.get("addobjectfromclass")" />
+</p>
+</form>
+#if($xwiki.isVirtual())
+<form id="objectadd2" method="post" action="$doc.getURL("objectadd")">
+<p style="text-align: center">
+<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" />
+<input type="text" name="classname" size="20" />
+<input type="submit" value="$msg.get("addobjectfromclass")" />
+</p>
+</form>
+#end
+          </div>
+</div>
+#template("editfooter.vm")
+
+

Added: xwiki/trunk/src/main/web/skins/new/footer.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/new/footer.vm	2006-03-28 19:19:15 UTC (rev 1005)
+++ xwiki/trunk/src/main/web/skins/new/footer.vm	2006-03-28 19:23:53 UTC (rev 1006)
@@ -0,0 +1,34 @@
+<div id="xwikifooter">
+#if($context.user!="XWiki.XWikiGuest")
+ <div id="xwikidocinfo">
+ <div id="xwikidocinfoname">
+ #if ($doc.parent.length() > 0)
+ $parent &gt; $!headertitle
+ #else
+ $!headertitle
+ #end
+ </div>
+ <div id="xwikidocinfolang">
+ ($tdoc.getRealLanguage())
+ </div>
+ <div id="xwikidocinfocreated">
+ #if ($tdoc)
+ $msg.get("creator"): $xwiki.getLocalUserName($tdoc.creator)
+ &nbsp;$msg.get("date"): $!xwiki.formatDate($tdoc.creationDate)
+ </div>
+ <div id="xwikidocinfoupdated">
+ $msg.get("lastauthor"): $xwiki.getLocalUserName($tdoc.author)
+ &nbsp;$msg.get("date"): $!xwiki.formatDate($tdoc.date)
+ #end
+ </div>
+ </div>
+#end
+ <div id="xwikicopyright">
+$!copyright
+ </div>
+ <div id="xwikiicons">
+<a href="http://www.xwiki.com"><img src="$xwiki.getAttachmentURL($xwiki.getSkin(), "powered-by-xwiki.png")" border="0" alt="Powered by XWiki" /></a>
+ </div>
+</div>
+</div>
+</div>

Added: xwiki/trunk/src/main/web/skins/new/header.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/new/header.vm	2006-03-28 19:19:15 UTC (rev 1005)
+++ xwiki/trunk/src/main/web/skins/new/header.vm	2006-03-28 19:23:53 UTC (rev 1006)
@@ -0,0 +1,27 @@
+<div id="xwikibody">
+ <div id="xwikibodycontent">
+#if($context.getMode()==0)
+  <div id="xwikiheader">
+   <div id="xwikilogin">
+#set( $logredir = $xwiki.getFormEncoded($xwiki.getRequestURL()))
+#if ($context.getUser().equals("XWiki.XWikiGuest"))
+<a href="$xwiki.getURL("XWiki.XWikiLogin","login", "xredirect=$logredir")">$msg.get("login")</a> 
+#else
+#set($docuser = $xwiki.getDocument($context.user))
+#set($objuser = $docuser.getObject("XWiki.XWikiUsers",0))
+$msg.get("hello") 
+<a href="$docuser.getURL("view")">$docuser.display("first_name", "view", $objuser)</a> | 
+<a href="$xwiki.getURL("XWiki.XWikiLogout","logout", "xredirect=$logredir")">$msg.get("logout")</a>
+#end
+   </div>
+   <div id="xwikititle">
+$xwiki.parseContent($xwiki.getWebPreference("title"))
+   </div>
+   <div id="xwikisearch">
+#set($searchdoc = $xwiki.getDocument("Main.WebSearch"))
+#if($searchdoc)
+<form action="$searchdoc.getURL("view")" style="margin:0">$msg.get("search"): <input type="text" name="text" value="" size="10"/></form>
+#end
+   </div>
+  </div>
+#end

Added: xwiki/trunk/src/main/web/skins/new/powered-by-xwiki.png
===================================================================
(Binary files differ)


Property changes on: xwiki/trunk/src/main/web/skins/new/powered-by-xwiki.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: xwiki/trunk/src/main/web/skins/new/view.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/new/view.vm	2006-03-28 19:19:15 UTC (rev 1005)
+++ xwiki/trunk/src/main/web/skins/new/view.vm	2006-03-28 19:23:53 UTC (rev 1006)
@@ -0,0 +1,32 @@
+#macro(includeWikiPage $pagename $wikipageid)
+ <div id="$wikipageid">
+ #if($xwiki.exists("${doc.web}.${pagename}"))
+      $xwiki.includeForm("${doc.web}.${pagename}",false)
+ #else
+  #if($xwiki.exists("XWiki.${pagename}"))
+      $xwiki.includeForm("XWiki.${pagename}",false)
+  #else
+   #if($xwiki.exists("xwiki:XWiki.${pagename}"))
+    $xwiki.includeForm("xwiki:XWiki.${pagename}",false)
+   #end
+  #end
+ #end
+ </div>
+#end
+#template("xwiki.vm")
+#template("httpheader.vm")
+#template("header.vm")
+#template("viewheader.vm")
+<div id="xwikiview">
+#includeWikiPage("Menu" "xwikimenu")
+<div id="xwikicontent">
+$cdoc.getRenderedContent()
+</div>         
+<div id="xwikidata" class="clear">
+#template("comments2.vm")
+#template("attachments.vm")
+</div>
+</div>
+#template("footer.vm")
+</body>
+</html>

More information about the Xwiki-notifications mailing list