Theme update

Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

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

@@ -404,12 +404,6 @@ div.sideblock h3 a:hover {
 }
 
 /* Side Profile */
-#sb-profile ul a,
-#sb-profile ul a:link,
-#sb-profile ul a:visited,
-#sb-profile ul a:active {
-	color: #66879f;
-}
 #sb-profile ul ul a,
 #sb-profile ul ul a:link,
 #sb-profile ul ul a:visited,

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

@@ -149,20 +149,20 @@ ul.artefactchooser-subtabs li.current a:hover {
 
 /* views */
 .feedback {
-	background: url(../images/feedback.gif) no-repeat left center;
-	padding-left: 20px;
+	background: url(../images/feedback.gif) no-repeat left top;
+	padding-left: 20px !important;
 }
 .objection {
-	background: url(../images/objectionable.gif) no-repeat left center;
-	padding-left: 20px;
+	background: url(../images/objectionable.gif) no-repeat left top;
+	padding-left: 20px !important;
 }
 .print {
-	background: url(../images/icon-print.gif) no-repeat left center;
-	padding-left: 20px;
+	background: url(../images/icon-print.gif) no-repeat left top;
+	padding-left: 20px !important;
 }
 .watchlist {
-	background: url(../images/watchlist.gif) no-repeat left center;
-	padding-left: 20px;
+	background: url(../images/watchlist.gif) no-repeat left top;
+	padding-left: 20px !important;
 }
 
 /* Collection navigation */

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

@@ -244,6 +244,9 @@ tr.highlight td {
 	background-color: #fffcd8 !important;
 	border-bottom: 2px solid #FFF;
 }
+.divrow {
+	padding: 3px 5px;
+}
 .listing {
 	margin-bottom: 5px;
 }
@@ -816,7 +819,7 @@ div.rbuttons .small-logo {
 #header-right {
 	float: right;
 	min-width: 250px;
-	padding: 5px 10px;
+	padding: 5px 10px 0 10px;
 	text-align: right;
 	white-space: nowrap;
 	display: block;
@@ -846,7 +849,7 @@ div.rbuttons .small-logo {
 #right-nav ul {
 	float: right;
 	text-align: right;
-	margin: 5px 0;
+	margin: 5px 0 5px 0 !important;
 	min-width: 200px;
 }
 #right-nav li {
@@ -1131,9 +1134,6 @@ div.sideblock ul li {
 	list-style-type: disc;
 	padding-left: 15px;
 }
-#sb-profile ul ul li {
-	padding-bottom: 0;
-}
 #changeuser {
 	margin-top: 10px;
 	text-align: center;
@@ -1605,6 +1605,9 @@ table.attachments td {
 	padding-top: 2px;
 }
 /* Secret url */
+.secreturls {
+	width: 10%;
+}
 .secreturls .buttons {
 	padding-top: 5px;
 }
@@ -2117,8 +2120,7 @@ form#search, form#filter, div.searchform {
 	margin-left: 4px;
 }
 .home-info-1 .home-info-inner {
- * padding-top: 5px;
- * padding-bottom: 5px;
+ * padding-top: 8px;
 }
 #home-info-help {
 	margin: 0 4px;

htdocs/theme/raw/templates/view/layout.tpl

@@ -16,7 +16,7 @@
             {foreach from=$options key=id item=description}
             {if $columns != $layouts[$id]->columns}
               {assign var=columns value=$layouts[$id]->columns}
-              <div class="cb"></div>
+              <hr class="cb" />
               <div class="fl"><strong>{$layouts[$id]->columns} {if $columns > 1}{str tag=columns section=view}{else}{str tag=column section=view}{/if}</strong></div>
             {/if}
             <div class="fl">

htdocs/theme/raw/templates/view/share.tpl

@@ -58,7 +58,7 @@
         {if $accesslist.views}
           {foreach from=$accesslist.views item=view name=v}
           <div class="cv-listitem">
-            <div class="fr">
+            <div class="fr secreturls">
               {count($view.secreturls)} &nbsp; <div class="fr cv-listitem-edit"><a title="{str tag=editsecreturlaccess section=view}" href="{$WWWROOT}view/urls.php?id={$view.id}"><img src="{theme_url filename='images/edit.gif'}" alt="{str tag=edit}"></a></div>
             </div>
             <div>
@@ -70,7 +70,7 @@
         {if $accesslist.collections}
           {foreach from=$accesslist.collections item=collection name=c}
           <div class="cb cv-listitem">
-            <div class="fr">
+            <div class="fr secreturls">
               {count($collection.secreturls)} &nbsp; <div class="fr cv-listitem-edit"><a title="{str tag=editsecreturlaccess section=view}" href="{$WWWROOT}view/urls.php?id={$collection.viewid}"><img src="{theme_url filename='images/edit.gif'}" alt="{str tag=edit}"></a></div>
             </div>
             <div>

htdocs/theme/views.css

@@ -644,7 +644,7 @@ ul.artefactchooser-subtabs li.current a:active {
 }
 #collection strong {
 	font-size: 1.1667em;
-	margin: 5px 10px 0 0;
+	margin: 10px 10px 0 0;
 	float: left;
 }
 #containerX div.colnav1 {
@@ -658,19 +658,19 @@ ul.artefactchooser-subtabs li.current a:active {
 #containerX ul.colnav {
     list-style: none;
     padding: 0;
-    margin: 0 !important;
+    margin: 0;
 	float: left;
 }
 #containerX ul.colnav li {
     padding: 0;
     margin: 0 !important;
+	float: left;
 }
 #containerX ul.colnav li a,
 #containerX ul.colnav li.selected span {
 	padding: 5px 7px;
 	margin: 0 5px 0 0;
 	display: block;
-	float: left;
 }
 #containerX div.colnav-extra {
     margin: 8px 0 0;
@@ -686,18 +686,19 @@ div.colnav1 {
 ul.colnav {
     list-style: none;
     padding: 0;
-    margin: 10px 0 0 0 !important;
+    margin: 5px 0 0 0 !important;
+	float: left;
 }
 ul.colnav li {
-    padding: 0;
+    padding: 0 !important;
     margin: 0 !important;
+	float: left;
 }
 ul.colnav li a,
 ul.colnav li.selected span {
-	padding: 3px 5px;
-	margin: 0 5px 0 0;
+	padding: 5px 7px !important;
+	margin: 0 5px 0 0 !important;
 	display: block;
-	float: left;
 }
 div.colnav-extra {
     margin: 8px 0 0;
@@ -747,6 +748,8 @@ div.colnav-extra {
 }
 #viewmenu a {
 	margin: 0 5px;
+	padding-bottom: 2px;
+	line-height: 1.6667em;
 }
 #viewmenu .help a {
 	padding: 0;
@@ -755,8 +758,12 @@ div.colnav-extra {
 	padding: 3px 0 0 0;
 	font-size: 1.1667em;
 }
+#feedbacktable td {
+	padding: 3px 5px 0 5px;
+}
 #feedbacktable .details {
 	font-size: .9167em;
+	line-height: 1.8em;
 }
 #feedbacktable .icon {
 	float: left;
@@ -772,9 +779,10 @@ div.colnav-extra {
 #feedbacktable .attachmessage {
 	font-size: .9167em;
 	font-style: italic;
+	color: #888;
 }
 #feedbacktable p {
-    margin: 0 0 3px;
+    margin: 5px 0;
 }
 #feedback_pagination {
 	margin: 0;