taskwarrior-web 1.0.12 → 1.0.13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/CHANGELOG.md +8 -1
  2. data/lib/taskwarrior-web/app.rb +9 -0
  3. data/lib/taskwarrior-web/public/js/application.js +11 -13
  4. data/lib/taskwarrior-web/views/task_form.erb +1 -1
  5. data/taskwarrior-web.gemspec +1 -1
  6. metadata +24 -24
data/CHANGELOG.md CHANGED
@@ -1,3 +1,10 @@
1
+ ## v1.0.13 (11/22/12)
2
+
3
+ * Added support for `task-web.filter.badge` option to control the Fluid badge
4
+ count. See [the wiki][2] for more information.
5
+
6
+ [2]: http://github.com/theunraveler/taskwarrior-web/wiki/Additional-.taskrc-options
7
+
1
8
  ## v1.0.12 (11/22/12)
2
9
 
3
10
  * Miscellaneous styling fixes and improvements
@@ -14,7 +21,7 @@
14
21
  * Added the SimpleNavigation library for navigation, and moved a bunch of stuff
15
22
  to ActiveSupport.
16
23
 
17
- [1]: http://github.com/theunraveler/taskwarrior-web/wiki/Filters-for-the-task-listing-page
24
+ [1]: http://github.com/theunraveler/taskwarrior-web/wiki/Additional-.taskrc-options
18
25
 
19
26
  ## v1.0.9 (11/19/12)
20
27
 
data/lib/taskwarrior-web/app.rb CHANGED
@@ -105,6 +105,15 @@ class TaskwarriorWeb::App < Sinatra::Base
105
105
  self.class.task_count
106
106
  end
107
107
 
108
+ get '/ajax/badge-count/?' do
109
+ if filter = TaskwarriorWeb::Config.property('task-web.filter.badge')
110
+ total = TaskwarriorWeb::Task.query(:description => filter).count
111
+ else
112
+ total = self.class.task_count
113
+ end
114
+ total == 0 ? '' : total.to_s
115
+ end
116
+
108
117
  post '/ajax/task-complete/:id/?' do
109
118
  # Bummer that we have to directly use Command here, but apparently tasks
110
119
  # cannot be filtered by UUID.
data/lib/taskwarrior-web/public/js/application.js CHANGED
@@ -56,11 +56,11 @@ var initTaskCompletion = function() {
56
56
  type: 'POST',
57
57
  success: function(data) {
58
58
  refreshPageContents();
59
- set_message(data === '' ? 'Task marked as completed.' : data, 'alert-success');
59
+ set_message(data === '' ? 'Task marked as completed.' : data);
60
60
  row.fadeOut();
61
61
  },
62
62
  error: function(data) {
63
- set_message('There was an error when marking the task as completed.', 'alert-error');
63
+ set_message('There was an error when marking the task as completed.', 'error');
64
64
  container.html(checkbox);
65
65
  }
66
66
  });
@@ -69,28 +69,26 @@ var initTaskCompletion = function() {
69
69
 
70
70
  // Count updating.
71
71
 
72
- var getCount = function(callback) {
73
- $.ajax({
74
- url: '/ajax/count',
75
- success: callback
76
- });
77
- };
78
-
79
72
  var refreshDockBadge = function() {
80
73
  if (window.hasOwnProperty('fluid')) {
81
- getCount(function(data) {
74
+ $.get('/ajax/badge-count', function(data) {
82
75
  window.fluid.dockBadge = data;
83
76
  });
84
77
  }
85
78
  };
86
79
 
87
80
  var refreshSubnavCount = function() {
88
- getCount(function(data) {
81
+ $.get('/ajax/count', function(data) {
89
82
  $('#subnav-bar ul li:first-child a span.badge').text(data);
90
83
  });
91
84
  };
92
85
 
86
+ /**
87
+ * Set a flash message for user feedback.
88
+ *
89
+ * @param string msg The text of the message.
90
+ * @param string [severity] The severity of the message.
91
+ */
93
92
  function set_message(msg, severity) {
94
- severity = severity ? severity : 'info';
95
- $('#flash-messages').append('<div class="alert ' + severity + '">' + msg + '</div>');
93
+ $('#flash-messages').append('<div class="alert alert-' + (severity || 'success') + '">' + msg + '</div>');
96
94
  }
data/lib/taskwarrior-web/views/task_form.erb CHANGED
@@ -25,7 +25,7 @@
25
25
  <label for="task-tags" class="control-label">Tags</label>
26
26
  <div class="controls">
27
27
  <input type="textfield" id="task-tags" name="task[tags]" value="<%= @task.tags.join(', ') unless @task.nil? %>" autocomplete="off" />
28
- <div class="description">Enter tags separated by commas or spaces (e.g. <em>each, word will,be a tag</em>)</div>
28
+ <span class="help-block">Enter tags separated by commas or spaces (e.g. <em>each, word will,be a tag</em>)</span>
29
29
  </div>
30
30
  </div>
31
31
 
data/taskwarrior-web.gemspec CHANGED
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
3
3
 
4
4
  Gem::Specification.new do |s|
5
5
  s.name = "taskwarrior-web"
6
- s.version = '1.0.12'
6
+ s.version = '1.0.13'
7
7
  s.platform = Gem::Platform::RUBY
8
8
  s.authors = ["Jake Bell"]
9
9
  s.email = ["jake@theunraveler.com"]
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: taskwarrior-web
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.12
4
+ version: 1.0.13
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-11-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sinatra
16
- requirement: &70123076122640 !ruby/object:Gem::Requirement
16
+ requirement: &70281201384300 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70123076122640
24
+ version_requirements: *70281201384300
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: thin
27
- requirement: &70123076120340 !ruby/object:Gem::Requirement
27
+ requirement: &70281201383540 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70123076120340
35
+ version_requirements: *70281201383540
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: parseconfig
38
- requirement: &70123075730540 !ruby/object:Gem::Requirement
38
+ requirement: &70281201381840 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70123075730540
46
+ version_requirements: *70281201381840
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: vegas
49
- requirement: &70123075727940 !ruby/object:Gem::Requirement
49
+ requirement: &70281200991580 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70123075727940
57
+ version_requirements: *70281200991580
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rinku
60
- requirement: &70123075726560 !ruby/object:Gem::Requirement
60
+ requirement: &70281200989300 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70123075726560
68
+ version_requirements: *70281200989300
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: versionomy
71
- requirement: &70123075725580 !ruby/object:Gem::Requirement
71
+ requirement: &70281200987560 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70123075725580
79
+ version_requirements: *70281200987560
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: activesupport
82
- requirement: &70123075724880 !ruby/object:Gem::Requirement
82
+ requirement: &70281200986500 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *70123075724880
90
+ version_requirements: *70281200986500
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: sinatra-simple-navigation
93
- requirement: &70123076100220 !ruby/object:Gem::Requirement
93
+ requirement: &70281200985920 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *70123076100220
101
+ version_requirements: *70281200985920
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: rake
104
- requirement: &70123076099160 !ruby/object:Gem::Requirement
104
+ requirement: &70281200984440 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70123076099160
112
+ version_requirements: *70281200984440
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: rack-test
115
- requirement: &70123076098320 !ruby/object:Gem::Requirement
115
+ requirement: &70281201360300 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70123076098320
123
+ version_requirements: *70281201360300
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: rspec
126
- requirement: &70123076097080 !ruby/object:Gem::Requirement
126
+ requirement: &70281201359320 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *70123076097080
134
+ version_requirements: *70281201359320
135
135
  description: This gem provides a graphical frontend for the Taskwarrior task manager.
136
136
  It is based on Sinatra.
137
137
  email:
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
219
219
  version: '0'
220
220
  segments:
221
221
  - 0
222
- hash: -3441978643579448486
222
+ hash: 3651661756966679752
223
223
  requirements: []
224
224
  rubyforge_project: taskwarrior-web
225
225
  rubygems_version: 1.8.11