Skip to content
Browse files

Merge branch 'hotfix/0.3.10'

  • Loading branch information...
2 parents 36e7e04 + 326ca12 commit f16c5a37a46848f60f0754fb115262455ba7c6c0 @noctivityinc committed Jun 1, 2010
View
5 RELEASE_NOTES.textile
@@ -1,5 +1,10 @@
h1. Todopia Release Notes
+h3. 0.3.10 (hotfix)
+* Fixed bug with unfiled todos not showing in daily email
+* Fixed width issue in Safari
+* Moved contextMenu css to sass include
+
h3. 0.3.9
* Added textile formatting to notes
* Fixed positioning of note popup
View
1 app/controllers/user_sessions_controller.rb
@@ -2,6 +2,7 @@ class UserSessionsController < ApplicationController
layout 'public'
def new
+ debugger
@user_session = UserSession.new
end
View
51 app/stylesheets/partials/_jquery.contextMenu.sass
@@ -0,0 +1,51 @@
+/* Generic context menu styles */
+
+.contextMenu
+ position: absolute
+ width: 120px
+ z-index: 99999
+ border: solid 1px #CCC
+ background: #EEE
+ padding: 0px
+ margin: 0px
+ display: none
+ li
+ list-style: none
+ padding: 0px
+ margin: 0px
+ a
+ color: #333
+ text-decoration: none
+ display: block
+ line-height: 1.5em
+ height: 1.5em
+ background-position: 6px center
+ background-repeat: no-repeat
+ outline: none
+ padding: 1px 5px
+ padding-left: 8px
+
+ LI
+ &.hover A
+ color: #FFF
+ background-color: #3399FF
+ &.disabled A
+ color: #AAA
+ cursor: default
+ &.hover.disabled A
+ background-color: transparent
+ &.separator
+ border-top: solid 1px #CCC
+
+/*
+ * Adding Icons
+ *
+ * You can add icons to the context menu by adding
+ * classes to the respective LI element(s)
+ *
+ *.contextMenu li.edit A { background-image: url(images/page_white_edit.png); }
+ *.contextMenu li.cut A { background-image: url(images/cut.png); }
+ *.contextMenu li.copy A { background-image: url(images/page_white_copy.png); }
+ *.contextMenu li.paste A { background-image: url(/images/page_white_paste.png); }
+ *.contextMenu li.delete A { background-image: url(/images/icons/page_white_delete.png); }
+ *.contextMenu LI.quit A { background-image: url(/images/door.png); }
View
2 app/stylesheets/partials/_users.sass
@@ -1,7 +1,7 @@
#user
#new
form
- width: 400px
+ width: 500px
#video
border: 5px solid gray
View
1 app/stylesheets/public.sass
@@ -12,6 +12,7 @@
@import partials/facebox.sass
@import partials/slidebox.sass
@import partials/jquery.date_input.sass
+@import partials/jquery.contextMenu.sass
@import partials/todos.sass
@import partials/notes.sass
View
3 app/views/layouts/public.html.haml
@@ -6,9 +6,8 @@
= h(yield(:title) || "Todopia")
%meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
%link{ :href => "/favicon.png", :rel => "icon", :type => "image/png" }
- = stylesheet_link_tag 'compiled/public.css', :media => 'screen'
+ = stylesheet_link_tag 'compiled/public.css', 'ui-lightness/jquery-ui-1.8.custom', :media => 'screen'
= stylesheet_link_tag 'compiled/print.css', :media => 'print'
- = stylesheet_link_tag 'ui-lightness/jquery-ui-1.8.custom', 'jquery.contextMenu', 'jquery.date_input', :cache => true
= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js", 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.0/jquery-ui.min.js', 'jquery.livequery', 'jquery.contextMenu'
= javascript_include_tag 'jquery.form', 'jquery.cookie', 'facebox', 'jquery.labelify', 'flash', 'GrowingInput', 'TextboxList', 'TextboxList.Autocomplete', 'jquery.qtip-1.0.0-rc3.min', 'jquery.hotkeys', 'slidebox', 'jquery.date_input', :cache => 'cached/all'
= javascript_include_tag 'controllers/public/tag_groups', 'application', "controllers/#{params[:controller]}"
View
8 app/views/postoffice/email_todos.text.html.haml
@@ -22,11 +22,11 @@
= render :partial => 'postoffice/todos/todo', :collection => @shared
- unless unfiled_todos(nil,@user).empty?
- - unless tag_groups_empty?(@user)
- %p{:style => 'margin-bottom: 2em'}
+ %p{:style => 'margin-bottom: 2em'}
+ - unless tag_groups_empty?(@user)
%h2{:style => 'margin-bottom: .25em'}= "AND ZE REST... (#{unfiled_todos(nil,@user).count})"
- %table{:width => '100%'}
- = render :partial => 'postoffice/todos/todo', :collection => unfiled_todos(nil,@user)
+ %table{:width => '100%'}
+ = render :partial => 'postoffice/todos/todo', :collection => unfiled_todos(nil,@user)
%div{:style => 'margin-top: 2em; border-top:1px solid gray; padding-top: 1em; font-size: .85em'}
Sent from
View
120 public/stylesheets/compiled/public.css
@@ -1129,6 +1129,78 @@ a img {
border-color: #cccccc;
}
+/* Generic context menu styles */
+/* line 5, ../../../app/stylesheets/partials/_jquery.contextMenu.sass */
+.contextMenu {
+ position: absolute;
+ width: 120px;
+ z-index: 99999;
+ border: solid 1px #cccccc;
+ background: #eeeeee;
+ padding: 0px;
+ margin: 0px;
+ display: none;
+}
+/* line 23, ../../../app/stylesheets/partials/_jquery.contextMenu.sass */
+.contextMenu li {
+ list-style: none;
+ padding: 0px;
+ margin: 0px;
+}
+/* line 31, ../../../app/stylesheets/partials/_jquery.contextMenu.sass */
+.contextMenu a {
+ color: #333333;
+ text-decoration: none;
+ display: block;
+ line-height: 1.5em;
+ height: 1.5em;
+ background-position: 6px center;
+ background-repeat: no-repeat;
+ outline: none;
+ padding: 1px 5px;
+ padding-left: 8px;
+}
+/* line 57, ../../../app/stylesheets/partials/_jquery.contextMenu.sass */
+.contextMenu LI.hover A {
+ color: white;
+ background-color: #3399ff;
+}
+/* line 63, ../../../app/stylesheets/partials/_jquery.contextMenu.sass */
+.contextMenu LI.disabled A {
+ color: #aaaaaa;
+ cursor: default;
+}
+/* line 69, ../../../app/stylesheets/partials/_jquery.contextMenu.sass */
+.contextMenu LI.hover.disabled A {
+ background-color: transparent;
+}
+/* line 73, ../../../app/stylesheets/partials/_jquery.contextMenu.sass */
+.contextMenu LI.separator {
+ border-top: solid 1px #cccccc;
+}
+
+/*
+ * * Adding Icons
+ *
+ * *
+ *
+ * * You can add icons to the context menu by adding
+ *
+ * * classes to the respective LI element(s)
+ *
+ * *
+ *
+ * *.contextMenu li.edit A { background-image: url(images/page_white_edit.png); }
+ *
+ * *.contextMenu li.cut A { background-image: url(images/cut.png); }
+ *
+ * *.contextMenu li.copy A { background-image: url(images/page_white_copy.png); }
+ *
+ * *.contextMenu li.paste A { background-image: url(/images/page_white_paste.png); }
+ *
+ * *.contextMenu li.delete A { background-image: url(/images/icons/page_white_delete.png); }
+ *
+ * *.contextMenu LI.quit A { background-image: url(/images/door.png); } */
/* line 2, ../../../app/stylesheets/partials/_todos.sass */
#todo #new {
display: none;
@@ -1379,7 +1451,7 @@ a img {
}
/* line 11, ../../../app/stylesheets/partials/_notes.sass */
#notes #index .note p, #notes #list .note p {
- margin-bottom: 2em;
+ margin-bottom: 1.75em;
}
/* line 14, ../../../app/stylesheets/partials/_notes.sass */
#notes #index .note .row, #notes #list .note .row {
@@ -1466,7 +1538,7 @@ a img {
/* line 3, ../../../app/stylesheets/partials/_users.sass */
#user #new form {
- width: 400px;
+ width: 500px;
}
/* line 6, ../../../app/stylesheets/partials/_users.sass */
#user #new #video {
@@ -1478,39 +1550,39 @@ a img {
-webkit-border-radius: 5px;
}
-/* line 22, ../../../app/stylesheets/public.sass */
+/* line 23, ../../../app/stylesheets/public.sass */
html, body {
margin: 0px;
padding: 0px 0.2em;
}
-/* line 26, ../../../app/stylesheets/public.sass */
+/* line 27, ../../../app/stylesheets/public.sass */
body {
background-color: white;
font-family: Verdana, Helvetica, Arial;
font-size: 14px;
width: 99%;
}
-/* line 33, ../../../app/stylesheets/public.sass */
+/* line 34, ../../../app/stylesheets/public.sass */
body a {
color: blue;
}
-/* line 35, ../../../app/stylesheets/public.sass */
+/* line 36, ../../../app/stylesheets/public.sass */
body a img {
border: none;
}
-/* line 39, ../../../app/stylesheets/public.sass */
+/* line 40, ../../../app/stylesheets/public.sass */
body .clear {
clear: both;
height: 0;
overflow: hidden;
}
-/* line 44, ../../../app/stylesheets/public.sass */
+/* line 45, ../../../app/stylesheets/public.sass */
body .labelHighlight {
color: #999999;
text-align: right;
}
-/* line 48, ../../../app/stylesheets/public.sass */
+/* line 49, ../../../app/stylesheets/public.sass */
body .toolbar {
border-radius: 4px;
-moz-border-radius: 4px;
@@ -1520,21 +1592,21 @@ body .toolbar {
padding: 0.5em 0.25em;
min-width: 400px;
}
-/* line 54, ../../../app/stylesheets/public.sass */
+/* line 55, ../../../app/stylesheets/public.sass */
body .toolbar table {
width: 100%;
}
-/* line 57, ../../../app/stylesheets/public.sass */
+/* line 58, ../../../app/stylesheets/public.sass */
body .toolbar table td.left {
text-align: left;
width: 33%;
min-width: 140px;
}
-/* line 62, ../../../app/stylesheets/public.sass */
+/* line 63, ../../../app/stylesheets/public.sass */
body .toolbar table td.center {
min-width: 150px;
}
-/* line 64, ../../../app/stylesheets/public.sass */
+/* line 65, ../../../app/stylesheets/public.sass */
body .toolbar table td.center img {
border-radius: 4px;
-moz-border-radius: 4px;
@@ -1545,7 +1617,7 @@ body .toolbar table td.center img {
width: 1.5em;
height: 1.5em;
}
-/* line 71, ../../../app/stylesheets/public.sass */
+/* line 72, ../../../app/stylesheets/public.sass */
body .toolbar table td.center h1 {
color: white;
font-size: 14pt;
@@ -1554,25 +1626,25 @@ body .toolbar table td.center h1 {
margin: 0;
padding: 0;
}
-/* line 79, ../../../app/stylesheets/public.sass */
+/* line 80, ../../../app/stylesheets/public.sass */
body .toolbar table td.center h1.screen_only {
display: inline;
}
-/* line 82, ../../../app/stylesheets/public.sass */
+/* line 83, ../../../app/stylesheets/public.sass */
body .toolbar table td.right {
width: 33%;
min-width: 100px;
}
-/* line 86, ../../../app/stylesheets/public.sass */
+/* line 87, ../../../app/stylesheets/public.sass */
body #container {
background: white;
margin: 0px;
}
-/* line 91, ../../../app/stylesheets/public.sass */
+/* line 92, ../../../app/stylesheets/public.sass */
body #flash #flash_messages {
margin: 1em 0.5em;
}
-/* line 94, ../../../app/stylesheets/public.sass */
+/* line 95, ../../../app/stylesheets/public.sass */
body #flash #flash_messages.notice, body #flash #flash_messages.error, body #flash #flash_messages.warning, body #flash #flash_messages .notice, body #flash #flash_messages .error, body #flash #flash_messages .warning {
border-radius: 4px;
-moz-border-radius: 4px;
@@ -1582,26 +1654,26 @@ body #flash #flash_messages.notice, body #flash #flash_messages.error, body #fla
font-size: 0.9em;
padding: 1em;
}
-/* line 100, ../../../app/stylesheets/public.sass */
+/* line 101, ../../../app/stylesheets/public.sass */
body #flash #flash_messages.notice, body #flash #flash_messages .notice {
background-color: #ccffcc;
border: solid 1px #66cc66;
}
-/* line 104, ../../../app/stylesheets/public.sass */
+/* line 105, ../../../app/stylesheets/public.sass */
body #flash #flash_messages.error, body #flash #flash_messages .error {
background-color: #ffcccc;
border: solid 1px #cc6666;
}
-/* line 108, ../../../app/stylesheets/public.sass */
+/* line 109, ../../../app/stylesheets/public.sass */
body #flash #flash_messages.warning, body #flash #flash_messages .warning {
background-color: #ffde00;
border: solid 1px #cccc33;
}
-/* line 112, ../../../app/stylesheets/public.sass */
+/* line 113, ../../../app/stylesheets/public.sass */
body .print_only {
display: none;
}
-/* line 115, ../../../app/stylesheets/public.sass */
+/* line 116, ../../../app/stylesheets/public.sass */
body .ui-datepicker {
font-size: 12px;
width: 200px;
View
62 public/stylesheets/jquery.contextMenu.css
@@ -1,62 +0,0 @@
-/* Generic context menu styles */
-.contextMenu {
- position: absolute;
- width: 120px;
- z-index: 99999;
- border: solid 1px #CCC;
- background: #EEE;
- padding: 0px;
- margin: 0px;
- display: none;
-}
-
-.contextMenu li {
- list-style: none;
- padding: 0px;
- margin: 0px;
-}
-
-.contextMenu a {
- color: #333;
- text-decoration: none;
- display: block;
- line-height: 1.5em;
- height: 1.5em;
- background-position: 6px center;
- background-repeat: no-repeat;
- outline: none;
- padding: 1px 5px;
- padding-left: 8px;
-}
-
-.contextMenu LI.hover A {
- color: #FFF;
- background-color: #3399FF;
-}
-
-.contextMenu LI.disabled A {
- color: #AAA;
- cursor: default;
-}
-
-.contextMenu LI.hover.disabled A {
- background-color: transparent;
-}
-
-.contextMenu LI.separator {
- border-top: solid 1px #CCC;
-}
-
-/*
- Adding Icons
-
- You can add icons to the context menu by adding
- classes to the respective LI element(s)
-
-.contextMenu li.edit A { background-image: url(images/page_white_edit.png); }
-.contextMenu li.cut A { background-image: url(images/cut.png); }
-.contextMenu li.copy A { background-image: url(images/page_white_copy.png); }
-.contextMenu li.paste A { background-image: url(/images/page_white_paste.png); }
-.contextMenu li.delete A { background-image: url(/images/icons/page_white_delete.png); }
-.contextMenu LI.quit A { background-image: url(/images/door.png); }
-*/

0 comments on commit f16c5a3

Please sign in to comment.
Something went wrong with that request. Please try again.