From c5f9fd15b43e5f3816e30160ce2eb0b2dbeeb3e4 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 11 Jul 2012 09:16:01 +0200
Subject: [PATCH] Change tasklist main screen layout according to recent
 changes in Larry skin

---
 plugins/tasklist/localization/de_CH.inc            |  2 +-
 plugins/tasklist/localization/en_US.inc            |  2 +-
 plugins/tasklist/skins/larry/tasklist.css          | 12 ++++++++----
 .../tasklist/skins/larry/templates/mainview.html   | 14 +++++++-------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/plugins/tasklist/localization/de_CH.inc b/plugins/tasklist/localization/de_CH.inc
index b62f6d0b..5d57e93b 100644
--- a/plugins/tasklist/localization/de_CH.inc
+++ b/plugins/tasklist/localization/de_CH.inc
@@ -6,7 +6,7 @@ $labels['lists'] = 'Ressourcen';
 $labels['list'] = 'Ressource';
 $labels['tags'] = 'Tags';
 
-$labels['createnewtask'] = 'Neue Aufgabe eingeben';
+$labels['createnewtask'] = 'Neue Aufgabe eingeben (z.B. Samstag, Rasenmähen)';
 $labels['mark'] = 'Markieren';
 $labels['unmark'] = 'Markierung aufheben';
 $labels['edit'] = 'Bearbeiten';
diff --git a/plugins/tasklist/localization/en_US.inc b/plugins/tasklist/localization/en_US.inc
index b1460397..b73dda94 100644
--- a/plugins/tasklist/localization/en_US.inc
+++ b/plugins/tasklist/localization/en_US.inc
@@ -6,7 +6,7 @@ $labels['lists'] = 'Resources';
 $labels['list'] = 'Resource';
 $labels['tags'] = 'Tags';
 
-$labels['createnewtask'] = 'Create new Task';
+$labels['createnewtask'] = 'Create new Task (e.g. Saturday, Mow the lawn)';
 $labels['mark'] = 'Mark';
 $labels['unmark'] = 'Unmark';
 $labels['edit'] = 'Edit';
diff --git a/plugins/tasklist/skins/larry/tasklist.css b/plugins/tasklist/skins/larry/tasklist.css
index e6136f58..063632d8 100644
--- a/plugins/tasklist/skins/larry/tasklist.css
+++ b/plugins/tasklist/skins/larry/tasklist.css
@@ -208,11 +208,14 @@ body.tasklistview #searchmenulink {
 #taskstoolbar {
 	position: absolute;
 	top: -6px;
-	right: 0;
-	width: 40%;
+	left: 0;
+	width: 100%;
 	height: 40px;
 	white-space: nowrap;
-	text-align: right;
+}
+
+#quicksearchbar {
+	top: -7px;
 }
 
 #quickaddbox {
@@ -227,7 +230,8 @@ body.tasklistview #searchmenulink {
 #quickaddinput {
 	width: 85%;
 	margin: 0;
-	padding: 5px 8px;
+	padding: 3px 8px;
+	height: 18px;
 	background: #f1f1f1;
 	background: rgba(255, 255, 255, 0.7);
 	border-color: #a3a3a3;
diff --git a/plugins/tasklist/skins/larry/templates/mainview.html b/plugins/tasklist/skins/larry/templates/mainview.html
index 0ec9cabd..927ee4b0 100644
--- a/plugins/tasklist/skins/larry/templates/mainview.html
+++ b/plugins/tasklist/skins/larry/templates/mainview.html
@@ -10,12 +10,10 @@
 
 <div id="mainscreen">
 	<div id="sidebar">
-		<div id="quicksearchbar">
-			<roundcube:object name="plugin.searchform" id="quicksearchbox" />
-			<a id="searchmenulink" class="iconbutton searchoptions" > </a>
-			<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
+		<div id="taskstoolbar" class="toolbar">
+			<roundcube:container name="toolbar" id="taskstoolbar" />
 		</div>
-		
+
 		<div id="selectorbox" class="uibox listbox">
 			<div class="scroller">
 				<h2 class="boxtitle"><roundcube:label name="tasklist.tags" /></h2>
@@ -39,8 +37,10 @@
 		<roundcube:object name="plugin.quickaddform" />
 	</div>
 
-	<div id="taskstoolbar" class="toolbar">
-		<roundcube:container name="toolbar" id="taskstoolbar" />
+	<div id="quicksearchbar">
+		<roundcube:object name="plugin.searchform" id="quicksearchbox" />
+		<a id="searchmenulink" class="iconbutton searchoptions" > </a>
+		<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
 	</div>
 
 	<div id="tasksview" class="uibox">