Skip to content

Commit e38770a

Browse files
committed
Added secured Users.
1 parent f4d5c3a commit e38770a

28 files changed

+733
-255
lines changed

Gemfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
source 'https://rubygems.org'
22

3+
gem "twitter-bootstrap-rails", :group => :assets
4+
35
gem 'rails', '3.2.6'
46

57
# Bundle edge Rails instead:
@@ -23,7 +25,7 @@ end
2325
gem 'jquery-rails'
2426

2527
# To use ActiveModel has_secure_password
26-
# gem 'bcrypt-ruby', '~> 3.0.0'
28+
gem 'bcrypt-ruby', '~> 3.0.0'
2729

2830
# To use Jbuilder templates for JSON
2931
# gem 'jbuilder'

Gemfile.lock

+17
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ GEM
2929
i18n (~> 0.6)
3030
multi_json (~> 1.0)
3131
arel (3.0.2)
32+
bcrypt-ruby (3.0.1)
3233
builder (3.0.0)
3334
coffee-rails (3.2.2)
3435
coffee-script (>= 2.2.0)
@@ -37,6 +38,7 @@ GEM
3738
coffee-script-source
3839
execjs
3940
coffee-script-source (1.3.3)
41+
commonjs (0.2.6)
4042
erubis (2.7.0)
4143
execjs (1.4.0)
4244
multi_json (~> 1.0)
@@ -47,6 +49,12 @@ GEM
4749
railties (>= 3.1.0, < 5.0)
4850
thor (~> 0.14)
4951
json (1.7.5)
52+
less (2.2.1)
53+
commonjs (~> 0.2.6)
54+
less-rails (2.2.3)
55+
actionpack (>= 3.1)
56+
less (~> 2.2.0)
57+
libv8 (3.3.10.4)
5058
mail (2.4.4)
5159
i18n (>= 0.4.0)
5260
mime-types (~> 1.16)
@@ -89,11 +97,18 @@ GEM
8997
rack (~> 1.0)
9098
tilt (~> 1.1, != 1.3.0)
9199
sqlite3 (1.3.6)
100+
therubyracer (0.10.1)
101+
libv8 (~> 3.3.10)
92102
thor (0.16.0)
93103
tilt (1.3.3)
94104
treetop (1.4.10)
95105
polyglot
96106
polyglot (>= 0.3.1)
107+
twitter-bootstrap-rails (2.1.0)
108+
actionpack (>= 3.1)
109+
less-rails (~> 2.2.2)
110+
railties (>= 3.1)
111+
therubyracer (~> 0.10.1)
97112
tzinfo (0.3.33)
98113
uglifier (1.2.7)
99114
execjs (>= 0.3.0)
@@ -103,9 +118,11 @@ PLATFORMS
103118
ruby
104119

105120
DEPENDENCIES
121+
bcrypt-ruby (~> 3.0.0)
106122
coffee-rails (~> 3.2.1)
107123
jquery-rails
108124
rails (= 3.2.6)
109125
sass-rails (~> 3.2.3)
110126
sqlite3
127+
twitter-bootstrap-rails
111128
uglifier (>= 1.0.3)
142 KB
Loading

app/assets/images/rails.png

-6.49 KB
Binary file not shown.

app/assets/javascripts/application.js

+1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@
1212
//
1313
//= require jquery
1414
//= require jquery_ujs
15+
//= require twitter/bootstrap
1516
//= require_tree .
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
jQuery ->
2+
$("a[rel=popover]").popover()
3+
$(".tooltip").tooltip()
4+
$("a[rel=tooltip]").tooltip()
+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Place all the behaviors and hooks related to the matching controller here.
2+
# All this logic will automatically be available in application.js.
3+
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/application.css

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
* You're free to add application-wide styles to this file and they'll appear at the top of the
99
* compiled file, but it's generally better to create a new file per style scope.
1010
*
11-
*= require_self
1211
*= require_tree .
12+
*= require_self
1313
*/
14+
15+
body {
16+
/* background-image: url('/assets/extra_clean_paper.png');*/
17+
font-family: 'IM Fell DW Pica', serif;
18+
}

0 commit comments

Comments
 (0)