more theme changes from evonne

htdocs/artefact/blog/theme/default/list.tpl

@@ -3,37 +3,41 @@
   This template displays a list of the user's blogs.  The list is populated
   using javascript.
 
- *}{include file="header.tpl"}
+ *}
+
+{include file="header.tpl"}
+
 <div id="column-right">
 {include file="adminmenu.tpl"}
 </div>
 
 <div id="column-left">
-<div class="content">
-<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
-<div class="maincontent">
-    <h2>{str section="artefact.blog" tag="blogs"}</h2>
-
-    <div class="newblog">
-        <a href="{$WWWROOT}/artefact/blog/new/">{str section="artefact.blog" tag="newblog"}</a>
-    </div>
-
-    <table id="bloglist">
-        <thead>
-            <tr>
-                <th>{str section="artefact.blog" tag="title"}</th>
-                <th>{str section="artefact.blog" tag="description"}</th>
-            </tr>
-        </thead>
-        <tbody>
-        </tbody>
-    </table>
+	<div class="content">
+		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
+			<div class="maincontent">
+    		<h2>{str section="artefact.blog" tag="blogs"}</h2>
+
+    			<div class="newblog">
+        		<a href="{$WWWROOT}/artefact/blog/new/">{str section="artefact.blog" tag="newblog"}</a>
+    			</div>
+
+			<table id="bloglist">
+				<thead>
+					<tr>
+						<th>{str section="artefact.blog" tag="title"}</th>
+						<th>{str section="artefact.blog" tag="description"}</th>
+					</tr>
+				</thead>
+				<tbody>
+				</tbody>
+			</table>
     
-    <div class="newblog">
-        <a href="{$WWWROOT}/artefact/blog/new/">{str section="artefact.blog" tag="newblog"}</a>
-    </div>
-</div>
-</span></span></span></span></div>
-</div>
+				<div class="newblog">
+					<a href="{$WWWROOT}/artefact/blog/new/">{str section="artefact.blog" tag="newblog"}</a>
+				</div>
+			</div>
+		</span></span></span></span></div>
+	</div>
 </div>
+
 {include file="footer.tpl"}

htdocs/artefact/blog/theme/default/new.tpl

@@ -2,19 +2,23 @@
 
   This template displays the 'new blog' form
 
- *}{include file="header.tpl"}
+ *}
+
+{include file="header.tpl"}
+
 <div id="column-right">
 {include file="adminmenu.tpl"}
 </div>
 
 <div id="column-left">
-<div class="content">
-<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
-<div class="maincontent">
-    <h2>{str section="artefact.blog" tag="newblog"}</h2>
-    {$newblogform}
-</div>
-</span></span></span></span></div>
-</div>
+	<div class="content">
+		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
+			<div class="maincontent">
+    		<h2>{str section="artefact.blog" tag="newblog"}</h2>
+    		{$newblogform}
+			</div>
+		</span></span></span></span></div>
+	</div>
 </div>
+
 {include file="footer.tpl"}

htdocs/artefact/blog/theme/default/newpost.tpl

@@ -2,21 +2,25 @@
 
   This template displays the 'new blog post' form
 
- *}{include file="header.tpl"}
+ *}
+
+{include file="header.tpl"}
+ 
 <div id="column-right">
 {include file="adminmenu.tpl"}
 </div>
 
 <div id="column-left">
-<div class="content">
-<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
-<div class="maincontent">
-    <h2>{str section="artefact.blog" tag="newpost"}</h2>
-    {$newpostform}
+	<div class="content">
+		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
+			<div class="maincontent">
+    		<h2>{str section="artefact.blog" tag="newpost"}</h2>
+    		{$newpostform}
 
-    ADD RADIO BUTTONS
-</div>
-</span></span></span></span></div>
-</div>
+    		ADD RADIO BUTTONS
+			</div>
+		</span></span></span></span></div>
+	</div>
 </div>
+
 {include file="footer.tpl"}

htdocs/artefact/blog/theme/default/view.tpl

@@ -2,33 +2,37 @@
 
   This template displays a list of the user's blog posts for a particular blog.
 
- *}{include file="header.tpl"}
- <div id="column-right">
+ *}
+
+{include file="header.tpl"}
+
+<div id="column-right">
 {include file="adminmenu.tpl"}
 </div>
 
 <div id="column-left">
-<div class="content">
-<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
-<div class="maincontent">
-    <h2>{$blog->get('title')}</h2>
-
-    <div>
-        <a href="{$WWWROOT}/artefact/blog/newpost/?id={$blog->get('id')}">{str section="artefact.blog" tag="newpost"}</a>
-    </div>
-
-    <table id="postlist">
-        <thead>
-        </thead>
-        <tbody>
-        </tbody>
-    </table>
-    
-    <div>
-        <a href="{$WWWROOT}/artefact/blog/newpost/?id={$blog->get('id')}">{str section="artefact.blog" tag="newpost"}</a>
-    </div>
-
-</div>
-</span></span></span></span></div>
-</div>
+	<div class="content">
+		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
+			<div class="maincontent">
+			<h2>{$blog->get('title')}</h2>
+			
+				<div>
+					<a href="{$WWWROOT}/artefact/blog/newpost/?id={$blog->get('id')}">{str section="artefact.blog" tag="newpost"}</a>
+				</div>
+		
+			<table id="postlist">
+				<thead>
+				</thead>
+				<tbody>
+				</tbody>
+			</table>
+				
+				<div>
+					<a href="{$WWWROOT}/artefact/blog/newpost/?id={$blog->get('id')}">{str section="artefact.blog" tag="newpost"}</a>
+				</div>
+			</div>
+		</span></span></span></span></div>
+	</div>
 </div>
+
+{include file="footer.tpl"}
\ No newline at end of file

htdocs/artefact/file/theme/default/index.tpl

 {include file="header.tpl"}
 
-
 <div id="column-right">
 {include file="adminmenu.tpl"}
 </div>
 
 <div id="column-left">
-<div class="content">
-<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span 
-class="cnr-bl"><span class="cnr-br">
-	<div class="maincontent">
-    <h2>{str section="artefact.file" tag="myfiles"}</h2>
-    <div id="uploader"></div>
-    <div id="foldernav"></div>
-    <table id="filelist">
-        <thead><tr>
-            <th>Name</th>
-            <th>Size</th>
-            <th>Time</th>
-            <th></th>
-        </tr></thead>
-        <tbody><tr><th></th></tr></tbody>
-    </table>
-	
-</div>
-</span></span></span></span></div>	
-</div>
+	<div class="content">
+		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
+			<div class="maincontent">
+			<h2>{str section="artefact.file" tag="myfiles"}</h2>
+				<div id="uploader"></div>
+				<div id="foldernav"></div>
+			<table id="filelist">
+				<thead><tr>
+					<th>Name</th>
+					<th>Size</th>
+					<th>Time</th>
+					<th></th>
+				</tr></thead>
+				<tbody><tr><th></th></tr></tbody>
+			</table>
+			</div>
+		</span></span></span></span></div>	
+	</div>
 </div>
 
 {include file="footer.tpl"}

htdocs/artefact/internal/theme/default/index.tpl

@@ -5,15 +5,15 @@
 </div>
 
 <div id="column-left">
-<div class="content">
-<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span 
-class="cnr-bl"><span class="cnr-br">
-	<div class="maincontent">
-    <h2>{str section="artefact.internal" tag="profile"}</h2>
-    {$profileform}
+	<div class="content">
+		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
+			<div class="maincontent">
+			<h2>{str section="artefact.internal" tag="profile"}</h2>
+			{$profileform}
 
+			</div>
+		</span></span></span></span></div>	
 	</div>
-</span></span></span></span></div>	
-</div>
 </div>
+
 {include file="footer.tpl"}

htdocs/artefact/internal/theme/default/validate.tpl

@@ -5,16 +5,16 @@
 </div>
 
 <div id="column-left">
-<div class="content">
-<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span 
-class="cnr-bl"><span class="cnr-br">
-	<div class="maincontent">
-    <h2>{str section="artefact.internal" tag="emailactivation"}</h2>
-    <p>
-        {$message|escape}
-    </p>
+	<div class="content">
+		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
+			<div class="maincontent">
+			<h2>{str section="artefact.internal" tag="emailactivation"}</h2>
+			<p>
+				{$message|escape}
+			</p>
+			</div>
+		</span></span></span></span></div>	
 	</div>
-</span></span></span></span></div>	
-</div>
 </div>
+
 {include file="footer.tpl"}

htdocs/theme/default/static/style/style.css

@@ -68,16 +68,16 @@ h3, h4, h5, h6 {
 #topwrapper ul,
 #topwrapper li {
   	padding: 0px;
-   margin: 0px;
+    margin: 0px;
 	text-align: right;
-   display: inline;
+    display: inline;
 }
 
 /* GLOBAL NAVIGATION TABS BEGIN */
 #globalTabs {
 	text-align: right;
   	padding: 0;
-   margin: 0 10px 5px 0;
+    margin: 0 10px 5px 0;
 }
 
 #topwrapper #globalTabs #globalnav-logout a {
@@ -202,11 +202,10 @@ form {
 .searchbox td {
 	padding: 0;
 }
-
 /* HEADER END */
 
 
-/* MAIN COLUMN BEGIN */
+/* MAIN COLUMNS BEGIN */
 #mainwrapper {
 	padding: 5px 5px 5px 5px;
 	margin: 0;
@@ -240,13 +239,13 @@ form {
 #mainnav li {
     display: inline;
     padding: 0 0 0 0;
-	 color: #e6c560;
-	 margin: 0 6px 0 6px;
+	color: #e6c560;
+	margin: 0 6px 0 6px;
 	text-decoration: none;
 }
 
 #mainnav li.selected {
-	 color: #FFFFFF;
+	color: #FFFFFF;
 }
 
 #mainnav li a,
@@ -263,6 +262,9 @@ form {
 	text-decoration: none;
 }
 
+/* MAIN NAVIGATION ENDS */
+
+/* SUB NAVIGATION BEGINS */
 .subnav-left {
 	float: left;
 	margin: -6px 0 0 0;
@@ -303,17 +305,17 @@ form {
 }
 
 #subnav li {
-   display: inline;
-   padding: 0;
+    display: inline;
+    padding: 0;
 	margin: 0 5px 0 5px;
 }
 
 #subnav li.selected {
-   font-weight: bold;
+    font-weight: bold;
 	color: #98bf10;
 }
+/* SUB NAVIGATION BEGINS */
 
-/* MAIN NAVIGATION END */
 
 #maincontentwrapper {
 	margin: 0 0 0 0;
@@ -321,8 +323,8 @@ form {
 }
 
 #column-left {
-   margin:0 235px 0 0;
-   padding:0;
+    margin:0 235px 0 0;
+    padding:0;
 	background-color: #FFFFFF;
 }
 
@@ -340,37 +342,73 @@ div.sidebar {
 	font-weight: bold;
 }
 
+#column-right div.sidebar-botcorners {
+    padding: 0 0 0 0;
+    margin: 0 0 0 0;
+}
+
+#column-right .sidebarforgotpassword {
+	padding: 10px 5px 5px 10px;
+	margin: 0 0 0 0;
+	background: #FFFFFF url(../images/sidebox_topwhite.gif) no-repeat top;
+}
+
+#column-right div.sidebarforgotpassword-botcorners {
+    padding: 0 0 0 0;
+    margin: 0 0 7px 0;
+}
+
+#column-right .sidebarforgotpassword a,
+#column-right .sidebarforgotpassword a:link,
+#column-right .sidebarforgotpassword a:active,
+#column-right .sidebarforgotpassword a:visited {
+	background: url(../images/icon_question.gif) no-repeat left;
+	padding: 0 0 0 17px;
+	color: #547c22;
+	text-decoration: none;
+	font-weight: bold;
+}
+
+#column-right .sidebarforgotpassword a:hover {
+	color: #819f18;
+	text-decoration: underline;
+}
+
+/* SITE MENU BEGINS */
 #sitemenu {
-	margin: 20px 5px 0 0;
+	margin: 20px 0 0 -10px;
 	padding: 0;
+	border: 1px solid red;
 }
 
-#sitemenu li {
+#sitemenu li, #sitemenu li.r0 {
 	padding: 0 0 0 13px;
 	margin: 0 5px 0 0px;	 
 	color: #000000;
 	font-weight: bold;
-	background: url(../images/icon_arrow.gif) no-repeat left;
+	background: #FFFFFF url(../images/icon_arrow.gif) no-repeat left;
 	list-style-type: none;
 	line-height: 18px;
 }
 
-#column-right div.sidebar-botcorners {
-    padding: 0 0 0 0;
-    margin: 0 0 0 0;
+#sitemenu li.r1 {
+	background-color: #FF0000;
 }
 
+/* SITE MENU ENDS */
 
+
+/* LOGIN FOR COLUMN RIGHT ONLY BEGINS */
 #column-right div.loginbox-botcorners {
     padding: 0 0 0 0;
     margin: 0 0 0 -10px;
 }
 
 #column-right #loginbox {
-   width: 228px;
+    width: 228px;
 	background: #FFFFFF url(../images/sidebox_top_headerbg.gif) no-repeat top;
-   padding: 10px 0 0 0;
-   margin: 0 0 5px 0;
+    padding: 10px 0 0 0;
+    margin: 0 0 5px 0;
 	color: #000000;
 }
 
@@ -430,64 +468,8 @@ div.sidebar {
 #column-right #login a:hover {
 	text-decoration: underline;
 }
+/* LOGIN FOR COLUMN RIGHT ONLY BEGINS */
 
-.maincontent #loginbox {
-   padding: 0;
-   margin: 0;
-}
-
-.maincontent #loginbox fieldset {
-	border: none;
-	padding: 0;
-	margin: 0 0 0 10px;
-}