Permalink
Browse files

Punches can be viewed / edited in admin

  • Loading branch information...
1 parent aa4503f commit f866ea7c79f4d581261d2c7943d3db4e8fc4980a @bernardo bernardo committed Nov 19, 2011
View
@@ -16,8 +16,8 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" scope="PROVIDED" name="rack-cache (v1.1, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="bcrypt-ruby (v3.0.1, Ruby SDK 1.9.2-p180) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rack-cache (v1.1, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="multi_json (v1.0.3, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack-test (v0.6.1, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="uglifier (v1.1.0, Ruby SDK 1.9.2-p180) [gem]" level="application" />
@@ -28,21 +28,21 @@
<orderEntry type="library" scope="PROVIDED" name="i18n (v0.6.0, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="thor (v0.14.6, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="arel (v2.2.1, Ruby SDK 1.9.2-p180) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="tzinfo (v0.3.31, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="coffee-script (v2.2.0, Ruby SDK 1.9.2-p180) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="tzinfo (v0.3.31, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rdoc (v3.11, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="hike (v1.2.1, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="tilt (v1.3.3, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="builder (v3.0.0, Ruby SDK 1.9.2-p180) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="rack (v1.3.5, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rake (v0.9.2.2, Ruby SDK 1.9.2-p180) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="rack (v1.3.5, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="bundler (v1.0.21, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="coffee-rails (v3.1.1, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="ansi (v1.4.1, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack-ssl (v1.3.2, Ruby SDK 1.9.2-p180) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="turn (v0.8.3, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="json (v1.6.1, Ruby SDK 1.9.2-p180) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="turn (v0.8.3, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sass-rails (v3.1.5, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="polyglot (v0.3.3, Ruby SDK 1.9.2-p180) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="mime-types (v1.17.2, Ruby SDK 1.9.2-p180) [gem]" level="application" />
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -18,6 +18,7 @@ end
gem 'jquery-rails'
gem 'bourbon'
+gem 'will_paginate'
# To use ActiveModel has_secure_password
gem 'bcrypt-ruby', '~> 3.0.0'
View
@@ -108,6 +108,7 @@ GEM
uglifier (1.1.0)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
+ will_paginate (3.0.2)
PLATFORMS
ruby
@@ -123,3 +124,4 @@ DEPENDENCIES
sqlite3
turn
uglifier (>= 1.0.3)
+ will_paginate
@@ -22,18 +22,18 @@ $(->
# Edit punch datetimes
- $('.punch_time_display .punch_show_form_link').click ->
+ $('#punches').on 'click', '.punch_show_form_link', ->
parent = $(this).parent('.punch_time_display').hide()
parent_dom_id = parent.attr('meta-dom-id')
punch_time_forms.filter('[meta-dom-id="' + parent_dom_id + '"]').insertAfter(parent)
return false
- $('.punch_time_form .punch_show_display_link').click ->
+ $('#punches').on 'click', '.punch_show_display_link', ->
parent = $(this).parent('.punch_time_form')
parent.siblings('.punch_time_display').show()
parent.detach()
return false
- punch_time_forms = $('.punch_time_form').detach()
+ punch_time_forms = $('#punches .punch_time_form').detach()
)
@@ -10,7 +10,6 @@ body * {margin: 0; padding: 0; font-family: "helvetica neue",helvetica,arial,san
p {margin: 0 0 1em; font-size: 14px;}
@import "bourbon";
-@import "grid";
@import "forms";
@import "general";
@@ -37,3 +36,11 @@ p {margin: 0 0 1em; font-size: 14px;}
+
+
+
+
+
+
+
+
@@ -1,5 +1,7 @@
body {
zoom: 200%;
+ max-width: 640px;
+ margin: auto;
}
.mobile body{
@@ -48,6 +50,7 @@ h1{
}
padding: 10px 0;
+ width: 100%;
}
@@ -100,6 +103,7 @@ table.punch_item {
margin: 4px 0;
padding: 5px;
background-color: #ccc;
+ width: 100%;
}
table.punch_item.exit {
@@ -157,6 +161,13 @@ table.punch_item.entrance {
margin-right:5px;
}
}
+
+ .stats_line.green .name, .stats_line.green .value {
+ color: #929257 !important;
+ }
+ .stats_line.red .name, .stats_line.red .value {
+ color: red !important;
+ }
}
#link_bar{
Oops, something went wrong.

0 comments on commit f866ea7

Please sign in to comment.