Merge branch 'release-1.0.12'

alexbeletsky · Mar 18, 2011 · 4e37611 · 4e37611
2 parents a8f4405 + 1be1f97
commit 4e37611
Show file tree

Hide file tree

Showing 20 changed files with 82 additions and 72 deletions.
diff --git a/design/snapshots/Trackyt.net - Dashboard_18032011.png b/design/snapshots/Trackyt.net - Dashboard_18032011.png
diff --git a/settings/UppercuT.config b/settings/UppercuT.config
@@ -40,7 +40,7 @@
   <property name="version.use_semanticversioning" value="false" overwrite="false" />
   <property name="version.major" value="1" overwrite="false" />
   <property name="version.minor" value="0" overwrite="false" />
-  <property name="version.patch" value="11" overwrite="false" />
+  <property name="version.patch" value="12" overwrite="false" />
   <property name="version.gem.suffix" value="" overwrite="false" />
   <property name="use.gem.build_date" value="false" overwrite="false" />
   <property name="assembly.description" value="Time management/Project management system" />

diff --git a/src/Web/API/v11/ApiV11Registration.cs b/src/Web/API/v11/ApiV11Registration.cs
@@ -37,24 +37,24 @@ public override void RegisterArea(AreaRegistrationContext context)
 
             context.MapRoute(
                 "ApiV11_tasks_updateposition",
-                "api/v1.1/{apiToken}/tasks/update/{taskId}/position/{position}",
+                "api/v1.1/{apiToken}/tasks/update/{taskId}/position",
                 new { controller = "ApiV11", action = "UpdatePosition" },
                 new { apiToken = @"[a-fA-F\d]{32}" },
                 new string[] { "Web.API.v11.Controllers" }
             );
 
             context.MapRoute(
                 "ApiV11_tasks_updatedescription",
-                "api/v1.1/{apiToken}/tasks/update/{taskId}/description/{description}",
+                "api/v1.1/{apiToken}/tasks/update/{taskId}/description",
                 new { controller = "ApiV11", action = "UpdateDescription" },
                 new { apiToken = @"[a-fA-F\d]{32}" },
                 new string[] { "Web.API.v11.Controllers" }
             );
 
             context.MapRoute(
                 "ApiV11_tasks_updateplanneddate",
-                "api/v1.1/{apiToken}/tasks/update/{taskId}/planneddate/{date}",
-                new { controller = "ApiV11", action = "UpdatePlannedDate", date = UrlParameter.Optional },
+                "api/v1.1/{apiToken}/tasks/update/{taskId}/planneddate",
+                new { controller = "ApiV11", action = "UpdatePlannedDate" },
                 new { apiToken = @"[a-fA-F\d]{32}" },
                 new string[] { "Web.API.v11.Controllers" }
             );

diff --git a/src/Web/API/v11/Controllers/ApiV11Controller.cs b/src/Web/API/v11/Controllers/ApiV11Controller.cs
@@ -244,7 +244,7 @@ public ActionResult UpdateDescription(string apiToken, int taskId, string descri
         }
 
         [HttpPut]
-        public ActionResult UpdatePlannedDate(string apiToken, int taskId, string date)
+        public ActionResult UpdatePlannedDate(string apiToken, int taskId, string plannedDate)
         {
             CheckArgumentApiToken(apiToken);
 
@@ -253,13 +253,13 @@ public ActionResult UpdatePlannedDate(string apiToken, int taskId, string date)
 
             CheckTaskNotNull(taskId, task);
 
-            if (string.IsNullOrEmpty(date))
+            if (string.IsNullOrEmpty(plannedDate))
             {
                 task.PlannedDate = null;
             }
             else
             {
-                task.PlannedDate = DateTime.ParseExact(date, "dd-MM-yyyy", CultureInfo.InvariantCulture);
+                task.PlannedDate = DateTime.ParseExact(plannedDate, "dd-MM-yyyy", CultureInfo.InvariantCulture);
             }
             _tasks.Save(task);
 

diff --git a/src/Web/Areas/Admin/Views/BlogManagement/AllPosts.aspx b/src/Web/Areas/Admin/Views/BlogManagement/AllPosts.aspx
@@ -7,6 +7,6 @@
 </asp:Content>
 
 <asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
-    <script src="<%: Url.Content("~/Scripts/Admin/control.editposts.js") + "?ver=1011"%>" type="text/javascript"></script>
-    <script src="<%: Url.Content("~/Scripts/Admin/controller.editposts.js") + "?ver=1011"%>" type="text/javascript"></script>
+    <script src="<%: Url.Content("~/Scripts/Admin/control.editposts.js") + "?ver=1012"%>" type="text/javascript"></script>
+    <script src="<%: Url.Content("~/Scripts/Admin/controller.editposts.js") + "?ver=1012"%>" type="text/javascript"></script>
 </asp:Content>
diff --git a/src/Web/Areas/Admin/Views/Login/Index.aspx b/src/Web/Areas/Admin/Views/Login/Index.aspx
@@ -5,7 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" >
 <head runat="server">
     <title>Admin | Login</title>
-    <link href="../../../../Content/admin-login.css?ver=1011" rel="stylesheet" type="text/css" />
+    <link href="../../../../Content/admin-login.css?ver=1012" rel="stylesheet" type="text/css" />
 </head>
 <body>
     <div class="admin-login">

diff --git a/src/Web/Areas/Admin/Views/Shared/Admin.Master b/src/Web/Areas/Admin/Views/Shared/Admin.Master
@@ -5,7 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" >
 <head runat="server">
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-    <link href="../../../../Content/admin.css?ver=1011" rel="stylesheet" type="text/css" />
+    <link href="../../../../Content/admin.css?ver=1012" rel="stylesheet" type="text/css" />
     <script src="<%: Url.Content("~/Scripts/jquery-1.4.1.min.js") %>" type="text/javascript"></script>
 
     <asp:ContentPlaceHolder ID="HeadContent" runat="server" />

diff --git a/src/Web/Areas/User/Views/Dashboard/Index.aspx b/src/Web/Areas/User/Views/Dashboard/Index.aspx
@@ -22,8 +22,8 @@
 </asp:Content>
 
 <asp:Content ID="Content2" ContentPlaceHolderID="head" runat="server">
-    <script type="text/javascript" src="<%: Url.Content("~/Scripts/Tracky/api.js") + "?ver=1011" %>"></script>
-    <script type="text/javascript" src="<%: Url.Content("~/Scripts/Tracky/control.tasks.js") + "?ver=1011" %>"></script>
-    <script type="text/javascript" src="<%: Url.Content("~/Scripts/Tracky/controller.tasks.js") + "?ver=1011" %>"></script>
-    <script type="text/javascript" src="<%: Url.Content("~/Scripts/Tracky/controller.account.js") + "?ver=1011" %>"></script>
+    <script type="text/javascript" src="<%: Url.Content("~/Scripts/Tracky/api.js") + "?ver=1012" %>"></script>
+    <script type="text/javascript" src="<%: Url.Content("~/Scripts/Tracky/control.tasks.js") + "?ver=1012" %>"></script>
+    <script type="text/javascript" src="<%: Url.Content("~/Scripts/Tracky/controller.tasks.js") + "?ver=1012" %>"></script>
+    <script type="text/javascript" src="<%: Url.Content("~/Scripts/Tracky/controller.account.js") + "?ver=1012" %>"></script>
 </asp:Content>
diff --git a/src/Web/Areas/User/Views/Shared/Dashboard.Master b/src/Web/Areas/User/Views/Shared/Dashboard.Master
@@ -5,8 +5,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" >
 <head runat="server">
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-    <link href="../../../../Content/dashboard.css?ver=1011" rel="stylesheet" type="text/css" />
-    <link href="../../../../Content/confirm.css?ver=1011" rel="stylesheet" type="text/css" />
+    <link href="../../../../Content/dashboard.css?ver=1012" rel="stylesheet" type="text/css" />
+    <link href="../../../../Content/confirm.css?ver=1012" rel="stylesheet" type="text/css" />
     <link href="../../../../Content/custom-theme/jquery-ui-1.8.10.custom.css" rel="stylesheet" type="text/css" />
 
     <script src="<%: Url.Content("~/Scripts/jquery-1.4.1.min.js") %>" type="text/javascript"></script>

diff --git a/src/Web/Content/Blog/layout-18-mar-2011.PNG b/src/Web/Content/Blog/layout-18-mar-2011.PNG
diff --git a/src/Web/Content/dashboard.css b/src/Web/Content/dashboard.css
@@ -167,7 +167,7 @@ footer, .push {
 #new-task-control
 {
     width: 760px;
-    height: 120px;
+    height: 100px;
     margin:0 auto;
     /* 3d4a59 */
     background-color: #425565;
@@ -195,7 +195,7 @@ footer, .push {
     width: 600px;
     height: 35px;
     margin:0 auto;
-    margin-top: 25px;
+    margin-top: 24px;
 }
 
 #new-task-container input
@@ -223,9 +223,8 @@ footer, .push {
 {
     color: #1cbcff;
     width: 400px;
-    height: 50px;
     margin:0 auto;
-    margin-top: 20px;
+    margin-top: 5px;
 }
 
 /* Datepicker */
@@ -247,11 +246,11 @@ footer, .push {
 
 #tasks
 {
-    width: 720px;
+    width: 730px;
     height: auto;
     margin:0 auto;
     margin-bottom: 20px;
-    padding: 20px;
+    padding-top: 20px;
 }
 
 .task  
@@ -270,11 +269,11 @@ footer, .push {
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#B4F7B4', endColorstr='#48B555',GradientType=0 ); /* ie */
 
     margin-top: 3px;
-    padding: 5px;
+    padding: 1px;
 
     width: 100%;
-    height: 28px;
-    
+    height: 33px;
+
     z-index: -1000;
 }
 
@@ -294,16 +293,6 @@ footer, .push {
     pointer-events: none;
 }
 
-.task .index
-{
-    top: -5px;
-    left: 0px;
-    font-size:x-small;
-    font-weight: bold;
-    float: left;
-    width: 45px;
-}
-
 .task .moveontop 
 {
     float: left;
@@ -321,24 +310,35 @@ footer, .push {
 
 .task .description
 {
-    height: 24px;
+    position: relative;
+    left: 8px;
+    top: 7px;
+
+    height: auto;
     width: 400px;
 
     float: left;
-    font-size: large;
-    padding-left: 14px;
-    margin-top: 4px;
+    font-size: 16px;
+    text-align:left;
+
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
 }
 
 .task #description-edit
 {
-    width: 360px;
-    padding: 4px;
+    width: 90%;
     opacity: 0.6;
 
-    -moz-border-radius: 15px;
-    -webkit-border-radius: 15px;
-    border-radius: 15px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
+    border-radius: 10px;
+}
+
+.task input#description-edit  
+{
+    padding: 2px;
 }
 
 .task .plantodate
@@ -354,18 +354,20 @@ footer, .push {
 {
     cursor: pointer;
     opacity: 0.6;
-
 }
 
 .task .timer 
 {
+    position: relative;
+    top: 7px;
+    right: 14px;
+
     height: 16px;
-    width: 50px;
+    width: 61px;
 
     float:right;
-    padding-right: 40px;
     font-size: small;
-    margin-top: 4px;    
+    text-align: right;
     color: #7e7e7e;
 }
 
@@ -424,13 +426,16 @@ footer, .push {
 
 .task .planned
 {
+    position: relative;
+    top: 7px;
+    right: 22px;
+
     height: 16px;
-    width: 74px;
+    width: 86px;
 
     float:right;
-    padding-right: 8px;
     font-size: small;
-    margin-top: 4px;    
+    text-align: right;
 }
 
 .clean

diff --git a/src/Web/Content/public.css b/src/Web/Content/public.css
@@ -258,6 +258,12 @@ http://ryanfait.com/sticky-footer/
     text-align: justify;
 }
 
+.blogpost img
+{
+    height: auto;
+    width: 100%;
+}
+
 .blogpost .header
 {
     padding-bottom: 20px;

diff --git a/src/Web/Scripts/Tests/api/tests.api.v11.js b/src/Web/Scripts/Tests/api/tests.api.v11.js
@@ -332,12 +332,12 @@
             var taskId = result.data.tasks[0].id;
             ok(taskId >= 1, "could not get task for update");
 
-            var method = 'tasks/update/' + taskId + '/position/' + 100;
+            var method = 'tasks/update/' + taskId + '/position';
             var type = 'PUT';
 
             var call = createCallUrl(me.url, me.apiToken, method, params);
 
-            api_test(call, type, data, function (result) {
+            api_test(call, type, { position: 100 }, function (result) {
                 ok(result.success, "update call failed");
                 ok(result.data.task.position == 100, "position value wrong");
             });
@@ -361,16 +361,15 @@
             var taskId = result.data.tasks[0].id;
             ok(taskId >= 1, "could not get task for update");
 
-            var method = 'tasks/update/' + taskId + '/planneddate/' + '17-03-2011';
+            var method = 'tasks/update/' + taskId + '/planneddate';
             var type = 'PUT';
 
             var call = createCallUrl(me.url, me.apiToken, method, params);
 
-            api_test(call, type, data, function (result) {
+            api_test(call, type, { plannedDate: '17-03-2011' }, function (result) {
                 ok(result.success, "update call failed");
                 ok(result.data.task.plannedDate == "/Date(1300312800000)/", "planned date value wrong");
             });
         });
-
     });
 });
diff --git a/src/Web/Scripts/Tracky/controller.tasks.js b/src/Web/Scripts/Tracky/controller.tasks.js
@@ -214,18 +214,18 @@
     // Callbacks
 
     function updateTaskPositionCallback(ref, position) {
-        var method = '/tasks/update/' + control.getTaskIdFromReference(ref) + '/position/' + position;
-        a.call(method, 'PUT', undefined, function (r) {}); 
+        var method = '/tasks/update/' + control.getTaskIdFromReference(ref) + '/position';
+        a.call(method, 'PUT', { position: position } , function (r) {}); 
     }
 
     function updateTaskDescriptionCallback(ref, description) {
-        var method = '/tasks/update/' + control.getTaskIdFromReference(ref) + '/description/' + description;
-        a.call(method, 'PUT', undefined, function (r) {});
+        var method = '/tasks/update/' + control.getTaskIdFromReference(ref) + '/description'; 
+        a.call(method, 'PUT', { description: description }, function (r) {});
     }
 
     function updateTaskPlannedDateCallback(ref, plannedDate) {
-        var method = '/tasks/update/' + control.getTaskIdFromReference(ref) + '/planneddate/' + encodeURI(plannedDate);
-        a.call(method, 'PUT', undefined, function (r) {});         
+        var method = '/tasks/update/' + control.getTaskIdFromReference(ref) + '/planneddate'
+        a.call(method, 'PUT', { plannedDate: plannedDate } , function (r) {});         
     }
 
     //////////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/Web/Views/Error/GenericError.aspx b/src/Web/Views/Error/GenericError.aspx
@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" >
 <head runat="server">
-    <link href="../../Content/public-login.css?ver=1011" rel="stylesheet" type="text/css" />
+    <link href="../../Content/public-login.css?ver=1012" rel="stylesheet" type="text/css" />
     <title>Trackyt.net | Ooops</title>
 </head>
 <body>

diff --git a/src/Web/Views/Login/Index.aspx b/src/Web/Views/Login/Index.aspx
@@ -3,7 +3,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head id="Head1" runat="server">
-    <link href="../../Content/public-login.css?ver=1011" rel="stylesheet" type="text/css" />
+    <link href="../../Content/public-login.css?ver=1012" rel="stylesheet" type="text/css" />
 
     <link rel="shortcut icon" href="~/Content/Images/favicon.ico" type="image/x-icon" />
     <link rel="icon" href="~/Content/Images/favicon.ico" type="image/ico" />

diff --git a/src/Web/Views/Registration/Index.aspx b/src/Web/Views/Registration/Index.aspx
@@ -3,9 +3,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head id="Head1" runat="server">
-    <link href="../../Content/public-login.css?ver=1011" rel="stylesheet" type="text/css" />
+    <link href="../../Content/public-login.css?ver=1012" rel="stylesheet" type="text/css" />
     <script src="<%: Url.Content("~/Scripts/jquery-1.4.1.min.js") %>" type="text/javascript"></script>
-    <script src="<%: Url.Content("~/Scripts/Tracky/controller.registration.js") + "?ver=1011" %>" type="text/javascript"></script>
+    <script src="<%: Url.Content("~/Scripts/Tracky/controller.registration.js") + "?ver=1012" %>" type="text/javascript"></script>
 
     <link rel="shortcut icon" href="~/Content/Images/favicon.ico" type="image/x-icon" />
     <link rel="icon" href="~/Content/Images/favicon.ico" type="image/ico" />

diff --git a/src/Web/Views/Registration/Mobile.cshtml b/src/Web/Views/Registration/Mobile.cshtml
@@ -12,7 +12,7 @@
     <link rel="shortcut icon" href="~/Content/Images/favicon.ico" type="image/x-icon" />
     <link rel="icon" href="~/Content/Images/favicon.ico" type="image/ico" />
 
-    <link href="../Content/public-login.css?ver=1011" rel="stylesheet" type="text/css" />
+    <link href="../Content/public-login.css?ver=1012" rel="stylesheet" type="text/css" />
 </head>
 <body>
     <div id="content">
@@ -42,6 +42,6 @@
     </div>
 
     <script src="@Url.Content("~/Scripts/jquery-1.4.1.min.js")" type="text/javascript"></script>
-    <script src="@(Url.Content("~/Scripts/Tracky/controller.registration.js") + "?ver=1011")" type="text/javascript"></script>
+    <script src="@(Url.Content("~/Scripts/Tracky/controller.registration.js") + "?ver=1012")" type="text/javascript"></script>
 </body>
 </html>