Update themes

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

@@ -6,29 +6,23 @@
  */
  
  /* Blog list */
-#bloglist .right a {
-	padding-left: 12px;
-}
 
 /* Post list */
 #postlist th {
-	border-bottom: 1px dotted #d1d1d1;
 }
 
 #postlist input.delete {
-    background: transparent url(../images/icon-delete.gif) no-repeat left center;
     color: #ca0000;
-	padding-left: .8em;
-	border: 0;
 }
 
 #postlist input.edit {
-	background: url(../images/icon-edit.gif) no-repeat left center;
 	color: #4C711D;
-	padding-left: .8em;
-	border: 0;
 }
 #postlist td.postdetails {
-	color: #888;
 }
 
+/* attachment files */
+#postlist .attachments th {
+	background: #AABC8B;
+	color: #FFF;
+}

htdocs/artefact/blog/theme/raw/static/style/style.css

@@ -7,7 +7,7 @@
  
  /* Blog list */
 #bloglist .right a {
-	font-size: .9em;
+	font-size: .9167em;
 	margin-left: 1em;
 }
 #bloglist td .addicon {
@@ -20,20 +20,40 @@
 /* Post list */
 #postlist th {
 	border-bottom: 1px dotted #d1d1d1;
+	font-size: 1em;
+	padding: .5em 0 .25em 0;
+	vertical-align: bottom;
+}
+#postlist th.posttitle {
+	font-size: 1.8em;
 }
 #postlist th.controls {
     font-weight: normal;
+	text-align: right;
+}
+#postlist input.delete {
+	font-size: .9167em;
+	background: url(../images/icon-delete.gif) no-repeat left center;
+	border: 0;
+	padding-left: 8px;
+	* padding-left: 6px;
+	cursor: pointer;
+	color: #333;
 }
-#postlist input.delete,
 #postlist input.edit {
-	font-size: .9em;
+	font-size: .9167em;
+	background: url(../images/icon-edit.gif) no-repeat left center;
+	border: 0;
+	padding-left: 8px;
+	cursor: pointer;
+	color: #333;
 }
 #postlist p {
 	margin: 0 0 1em 0;
 }
 #postlist td.postdetails {
 	padding-bottom: 2em;
-	font-size: .9em;
+	font-size: .9167em;
 	color: #888;
 }
 
@@ -44,6 +64,10 @@
 	border: 0;
 }
 .attachments .unselect {
-	font-size: .9em;
+	font-size: .9167em;
 }
-
+#postlist td h1,
+#postlist td h2 {
+	margin: 1em 0 0.5em 0;
+	font-size: 1.5em;
+}
\ No newline at end of file

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

@@ -19,6 +19,12 @@ form#files .foldernav {
 .filelist th {
 	border-bottom: 1px solid #CCCCCC;
 }
+.filelist td.right input.btn-edit {
+	color: #6E8E00;
+}
+.filelist td.right input.btn-del {
+	color: #BC0909;
+}
 /* parent folder row */
 tr.parentfolder td {
 	background-color: #f0f4f7 !important;
@@ -39,6 +45,9 @@ tr.folderhover td {
 #files_filebrowser_edit_row td {
 	border: 2px solid #eee;
 }
+#files_filebrowser_edit_row #files_filebrowser_edit_heading {
+	color: #333;
+}
 
 /* Edit post File list */
 #editpost_filebrowser_upload_browse,

htdocs/artefact/file/theme/fresh/static/style/style.css

@@ -6,6 +6,8 @@
  */
 /* File upload box */
 .fileupload {
+	background: #1C3740;
+	border: 0;
 }
 /* folder nav */
 .foldernav {

htdocs/artefact/file/theme/raw/static/style/style.css

@@ -27,8 +27,8 @@
 	font-weight: bold !important;
 }
 .uploadform td {
-	font-size: .9em;
-	line-height: 1.4em;
+	font-size: .9167em;
+	line-height: 1.3333em;
 }
 .fileupload td#files_filebrowser_upload_messages,
 .fileupload td#editpost_filebrowser_upload_messages {
@@ -39,18 +39,18 @@
 .foldernav {
     font-weight: bold;
     margin: 1em 0 0 0;
-    padding: 0 0 0 1.4em;
-    font-size: 1.2em;
-	line-height: 1em;
-    height: 1.6em;
-    background: url(../images/foldernav_small.png) no-repeat left top;
+    padding: 0 0 0 1.6667em;
+    font-size: 1.3333em;
+	line-height: 1.6667em;
+    height: 1.6667em;
+    background: url(../images/foldernav_small.png) no-repeat left;
 }
 form#files .foldernav {
-    padding: 0 0 0 1.6em;
-    font-size: 1.4em;
-	line-height: 1.6em;
-    height: 1.7em;
-    background: url(../images/foldernav.png) no-repeat left 3px;
+    padding: 0 0 0 1.6667em;
+    font-size: 1.3333em;
+	line-height: 1.6667em;
+    height: 1.6667em;
+    background: url(../images/foldernav.png) no-repeat left;
 }
 
 /* File list */
@@ -62,7 +62,24 @@ form#files .foldernav {
 	border-bottom: 1px solid #CCCCCC;
 }
 .filelist td.right input {
-	font-size: .9em;
+	font-size: .9167em;
+}
+.filelist td.right input.btn-edit {
+	font-size: .9167em;
+	background: transparent url(../images/icon-edit.gif) no-repeat left center;
+	border: 0;
+	padding-left: 8px;
+	cursor: pointer;
+	color: #333;
+}
+.filelist td.right input.btn-del {
+	font-size: .9167em;
+	background: transparent url(../images/icon-delete.gif) no-repeat left center;
+	border: 0;
+	padding-left: 8px;
+	* padding-left: 10px;
+	cursor: pointer;
+	color: #333;
 }
 /* parent folder row */
 tr.parentfolder td {
@@ -97,7 +114,8 @@ tr.folderhover a {
 	border: 2px solid #eee;
 }
 #files_filebrowser_edit_row #files_filebrowser_edit_heading {
-	font-size: 1.2em;
+	font-size: 1.1667em;
+	padding: .5em 0.25em 0 .25em;
 }
 #files_filebrowser_edit_row table th {
 	text-align: left;
@@ -133,7 +151,7 @@ tr.folderhover a {
 
 .filelist table table.editpermissions th,
 .filelist table table.editpermissions td {
-	font-size: .9em;
+	font-size: .9167em;
 }
 
 .filelist .disabled {

htdocs/artefact/internal/theme/raw/static/style/style.css

@@ -26,7 +26,7 @@ input#myfriends_addfriend_add {
   margin-left: .5em;
 }
 #profileform_email_container a {
-	font-size: .9em;
+	font-size: .9167em;
 }
 
 .profile-fieldsets fieldset {

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

@@ -4,11 +4,6 @@
  * Copyright (C) 2006-2009 Catalyst IT
  * This file is distributed under the same terms as Mahara itself
  */
- 
-/* Edit and Delete in list */
-.btn-spacer a {
-	padding-left: 12px;
-}
 
 /* Forum list */
 #forumslist{

htdocs/interaction/forum/theme/raw/index.tpl

 {include file="header.tpl"}
 
-<h2>{str tag="nameplural" section=interaction.forum}{if $publicgroup}<a href="{$feedlink}"><img class="feedicon" src="{theme_url filename='images/rss.gif'}"></a>{/if}</h2>
+<h3>{str tag="nameplural" section=interaction.forum}{if $publicgroup}<a href="{$feedlink}"><img class="feedicon" src="{theme_url filename='images/rss.gif'}"></a>{/if}</h3>
 {if $admin}
 <div id="forumbtns" class="rbuttons">
 <a href="{$WWWROOT}interaction/edit.php?group={$groupid}&amp;plugin=forum" class="btn btn-add">{str tag="newforum" section=interaction.forum}</a>

htdocs/interaction/forum/theme/raw/static/style/style.css

@@ -46,12 +46,15 @@
 	border: 1px solid #eee;
 }
 #viewforum h3 {
-	font-size: 1.4em;
+	font-size: 1.3333em;
 }
 #viewforum .rbuttons {
 	right: 1em;
 	top: 1em;
 }
+* html #viewforum .rbuttons {
+	right: 3em;
+}
 #forumtopicstable {
 	border-bottom: 1px solid #ccc;
 }
@@ -89,7 +92,7 @@
 }
 /* admin & moderator */
 .forummods {
-	font-size: .9em;
+	font-size: .9167em;
 	padding: .5em;
 	margin: .5em 0;
 }
@@ -120,7 +123,7 @@
 	width: 160px;
 	border-right: 1px solid #eee;
 	text-align: center;
-    font-size: .9em;
+    font-size: .9167em;
 }
 .forumpostleft .posttime {
 	color: #888;
@@ -138,7 +141,7 @@
     margin: 0;
 }
 .postbtns {
-	font-size: .9em;
+	font-size: .9167em;
 	text-align: right;
 	color: #d1d1d1;
 }
@@ -152,3 +155,19 @@
 .postreply {
 	padding: 0 0 0 1em;
 }
+
+
+#forumslist .btn-edit,
+#forumtopicstable .btn-edit {
+	background: url(../images/icon-edit.gif) no-repeat left;
+	border: 0;
+	cursor: pointer;
+	padding-left: 12px;
+}
+#forumslist .btn-del,
+#forumtopicstable .btn-del {
+	background: url(../images/icon-delete.gif) no-repeat left;
+	border: 0;
+	cursor: pointer;
+	padding-left: 12px;
+}

htdocs/interaction/forum/theme/raw/topic.tpl

 {include file="header.tpl"}
 
-<h3><a href="{$WWWROOT}interaction/forum/view.php?id={$topic->forumid}">{$topic->forumtitle}</a></h3>
+<h3>Forums > <a href="{$WWWROOT}interaction/forum/view.php?id={$topic->forumid}">{$topic->forumtitle}</a></h3>
 <h4>{$topic->subject}</h4>
 {if $membership}
 	<div id="forumbtns" class="rbuttons">

htdocs/interaction/forum/theme/raw/view.tpl

 {include file="header.tpl"}
 
-<h3>{$subheading}{if $publicgroup}<a href="{$feedlink}"><img class="feedicon" src="{theme_url filename='images/rss.gif'}"></a>{/if}</h3>
+<h3>Forums > {$subheading}{if $publicgroup}<a href="{$feedlink}"><img class="feedicon" src="{theme_url filename='images/rss.gif'}"></a>{/if}</h3>
 <div id="forumbtns" class="rbuttons">
 	{if $admin}
 		<a href="{$WWWROOT}interaction/edit.php?id={$forum->id}" class="btn btn-editforum">{str tag="edittitle" section="interaction.forum"}</a>

htdocs/theme/aqua/static/style/style.css

@@ -194,12 +194,13 @@ input.error, select.error {
 /****************************** Buttons ****************************/
 /** input buttons **/
 input.submit,
-input.cancel,
 button,
 input.button,
 input.buttondk,
 input.select,
-input#files_filebrowser_edit_artefact {
+input#files_filebrowser_edit_artefact,
+#delete_all_notifications_submit,
+input.cancel {
 	background-color: #14436F;
 	border-color: #5388b9 #011e3a #011e3a #5388b9;
 	color: #FFF;
@@ -214,25 +215,27 @@ input#files_filebrowser_edit_artefact {
 }
 /** hover for buttons **/
 input.submit:hover,
-input.cancel:hover,
 button:hover,
 input.button:hover,
 input.buttondk:hover,
 input.select:hover,
 input#files_filebrowser_edit_artefact:hover,
-.rbuttons a.btn:hover {
+.rbuttons a.btn:hover,
+#delete_all_notifications_submit:hover,
+input.cancel:hover {
 	background: #155a9b;
 	text-decoration: none;
 }
 /** Depress for buttons **/
 input.submit:active,
-input.cancel:active,
 button:active,
 input.button:active,
 input.buttondk:active,
 input.select:active,
 input#files_filebrowser_edit_artefact:active,
-.rbuttons a.btn:active {
+.rbuttons a.btn:active,
+#delete_all_notifications_submit:active,
+input.cancel:active {
 	border-color: #011e3a #5388b9 #5388b9 #011e3a;
 	background: #155a9b;
 	color: #FFF;
@@ -253,11 +256,6 @@ a#btn-delete {
     color: #ca0000 !important;
 	padding-left: 12px;
 }
-#btn-request, 
-a.btn-add {
-	background: url(../images/icon-add.gif) no-repeat left center;
-	padding-left: 12px;
-}
 a.btn-msg, #btn-sendmessage {
 	background: url(../images/icon-mail.gif) no-repeat left center;
 	padding-left: 12px;
@@ -370,17 +368,14 @@ input#myfriends_addfriend_add {
 }
 /* Search and language bar */
 #language-select, #usf {
-    padding: 45px 10px 0 0;
 }
 #usf_query_container input {
-	font-size: .9em;
-	padding: .25em;
     color: #333333;
 }
 
 /**************** TOP NAVIGATION ****************/
 #right-nav ul {
-  margin: 1.5em 1em 0 0;
+  margin: 1.5em 1em 1em 0;
   min-width: 20em;
 }
 #right-nav li {
@@ -746,11 +741,6 @@ div.sideblock #friendscontrol label {
 	padding-left: 12px;
     background: url(../images/icon-edit.gif) no-repeat left center;
 }
-#myviews .btn-del {
-    background: transparent url(../images/icon-delete.gif) no-repeat left center;
-    color: #ca0000 !important;
-	padding-left: 12px;
-}
 
 /* Copy a view */
 #viewpreview {

htdocs/theme/aqua/templates/header/navigation.tpl

+
+
+{if $MAINNAV}
+        <div id="main-nav">
+            <ul>{strip}
+{foreach from=$MAINNAV item=item}
+                <li{if $item.selected}{assign var=MAINNAVSELECTED value=$item} class="selected"{/if}><a href="{$WWWROOT}{$item.url}"{if $item.accesskey} accesskey="{$item.accesskey}"{/if}>{$item.title}</a></li>
+{/foreach}
+{if $ADMIN || $INSTITUTIONALADMIN}
+                <li><a href="{$WWWROOT}" accesskey="h">{str tag="returntosite"}</a></li>
+{elseif $USER->get('admin')}
+                <li><a href="{$WWWROOT}admin/" accesskey="a">{str tag="siteadministration"}</a></li>
+{elseif $USER->is_institutional_admin()}
+                <li><a href="{$WWWROOT}admin/users/search.php" accesskey="a">{str tag="useradministration"}</a></li>
+{/if}
+            {/strip}</ul>
+            
+        </div>
+
+        <div id="sub-nav">
+{if $MAINNAVSELECTED.submenu}
+            <ul>{strip}
+{foreach from=$MAINNAVSELECTED.submenu item=item}
+                <li{if $item.selected} class="selected"{/if}><a href="{if get_config('httpswwwroot') && $item.url=='account/'}{$HTTPSWWWROOT}{else}{$WWWROOT}{/if}{$item.url}"{if $item.accesskey} accesskey="{$item.accesskey}"{/if}>{$item.title}</a></li>
+{/foreach}
+            {/strip}</ul>
+{/if}
+        </div>
+{/if}

htdocs/theme/aqua/templates/header/topright.tpl

+<div id="header-right">
+{if $RIGHTNAV}
+        <div id="right-nav">
+            <ul>{strip}
+{foreach from=$RIGHTNAV item=item}
+                <li{if $item.selected}{assign var=MAINNAVSELECTED value=$item} class="selected"{/if}><a href="{if $item.wwwroot}{$item.wwwroot}{else}{$WWWROOT}{/if}{$item.url}">{if $item.title}{$item.title}{/if}{if $item.icon}<img src="{$item.icon}" alt="{$item.alt}">{if isset($item.count)}<span class="navcount{if $item.countclass} {$item.countclass}{/if}">{$item.count}</span>{/if}</a></li>
+{/foreach}
+                <li class="btn-logout"><a href="{$WWWROOT}?logout" accesskey="l">{str tag="logout"}</a></li>
+            {/strip}</ul>
+        </div>
+{/if}
+
+{if !$nosearch && !$LOGGEDIN && (count($LANGUAGES) > 1)}
+        <form id="language-select" method="post" action="">
+            <div>
+                <label>{str tag=language}: </label>
+                <select name="lang">
+                    <option value="default" selected="selected">{$sitedefaultlang}</option>
+{foreach from=$LANGUAGES key=k item=i}
+                    <option value="{$k}">{$i}</option>
+{/foreach}
+                </select>
+                <input type="submit" class="submit" name="changelang" value="{str tag=change}">
+            </div>
+        </form>
+{/if}
+
+{if !$nosearch && $LOGGEDIN}        {user_search_form}{/if}
+</div>
+