Permalink
Browse files

First integration of Bootstrap working.

  • Loading branch information...
aantix committed Dec 19, 2011
1 parent f6d2847 commit 809cfcc8d144935c087fd453c7e05ee3480219d9
View
@@ -14,6 +14,7 @@ gem 'youtube_search', :git => 'git@github.com:aantix/youtube_search.git'
# in production environments by default.
group :assets do
#gem 'bootstrap-sass'
+ gem 'twitter-bootstrap-rails', :git => 'http://github.com/seyhunak/twitter-bootstrap-rails.git'
gem 'sass-rails' #, :git => 'git://github.com/rails/sass-rails'
gem 'coffee-rails' #, :git => 'git://github.com/rails/coffee-rails'
gem 'uglifier'
View
@@ -15,6 +15,17 @@ GIT
specs:
youtube_search (0.1.3)
+GIT
+ remote: http://github.com/seyhunak/twitter-bootstrap-rails.git
+ revision: 0cdce29680de8f904b2d798410d9397095b89664
+ specs:
+ twitter-bootstrap-rails (1.4.2)
+ actionpack
+ jquery-rails (~> 1.0)
+ less
+ less-rails (~> 2.1.0)
+ railties
+
GEM
remote: http://rubygems.org/
specs:
@@ -49,8 +60,6 @@ GEM
addressable (2.2.6)
ansi (1.4.1)
arel (2.2.1)
- bootstrap-sass (1.4.2)
- sass-rails (~> 3.1.0)
builder (3.0.0)
coffee-rails (3.1.1)
coffee-script (>= 2.2.0)
@@ -59,6 +68,8 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.1.3)
+ commonjs (0.2.0)
+ therubyracer (~> 0.9.9)
diff-lcs (1.1.3)
erubis (2.7.0)
execjs (1.2.12)
@@ -86,6 +97,13 @@ GEM
json (1.6.3)
launchy (2.0.5)
addressable (~> 2.2.6)
+ less (2.0.8)
+ commonjs (~> 0.2.0)
+ therubyracer (~> 0.9.9)
+ less-rails (2.1.1)
+ actionpack (~> 3.1.1)
+ less (~> 2.0.7)
+ libv8 (3.3.10.4)
lockfile (2.1.0)
mail (2.3.0)
i18n (>= 0.4.0)
@@ -159,6 +177,8 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
term-ansicolor (1.0.7)
+ therubyracer (0.9.9)
+ libv8 (~> 3.3.10)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
@@ -175,7 +195,6 @@ PLATFORMS
ruby
DEPENDENCIES
- bootstrap-sass
coffee-rails
factory_girl (>= 1.3.2)
growl (>= 1.0.3)
@@ -193,5 +212,6 @@ DEPENDENCIES
spork (> 0.9.0.rc)
turkee!
turn
+ twitter-bootstrap-rails!
uglifier
youtube_search!
@@ -6,4 +6,5 @@
//
//= require jquery
//= require jquery_ujs
+//= require twitter/bootstrap
//= require_tree .
@@ -3,5 +3,5 @@
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
* the top of the compiled file, but it's generally better to create a new file per style scope.
*= require_self
- *= require_tree .
+ *= require_tree .
*/
@@ -1,56 +0,0 @@
-body {
- background-color: #fff;
- color: #333;
- font-family: verdana, arial, helvetica, sans-serif;
- font-size: 13px;
- line-height: 18px; }
-
-p, ol, ul, td {
- font-family: verdana, arial, helvetica, sans-serif;
- font-size: 13px;
- line-height: 18px; }
-
-pre {
- background-color: #eee;
- padding: 10px;
- font-size: 11px; }
-
-a {
- color: #000;
- &:visited {
- color: #666; }
- &:hover {
- color: #fff;
- background-color: #000; } }
-
-div {
- &.field, &.actions {
- margin-bottom: 10px; } }
-
-#notice {
- color: green; }
-
-.field_with_errors {
- padding: 2px;
- background-color: red;
- display: table; }
-
-#error_explanation {
- width: 450px;
- border: 2px solid red;
- padding: 7px;
- padding-bottom: 0;
- margin-bottom: 20px;
- background-color: #f0f0f0;
- h2 {
- text-align: left;
- font-weight: bold;
- padding: 5px 5px 5px 15px;
- font-size: 12px;
- margin: -7px;
- margin-bottom: 0px;
- background-color: #c00;
- color: #fff; }
- ul li {
- font-size: 12px;
- list-style: square; } }
@@ -6,9 +6,12 @@
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>
</head>
+
<body>
-<%= yield %>
+ <div class="container">
+ <%= yield %>
+ </div>
</body>
</html>
@@ -1,41 +1,66 @@
-<%= form_for(@transcription) do |f| %>
- <% if @transcription.errors.any? %>
- <div id="error_explanation">
- <h2><%= pluralize(@transcription.errors.count, "error") %> prohibited this transcription from being saved:</h2>
-
- <ul>
- <% @transcription.errors.full_messages.each do |msg| %>
- <li><%= msg %></li>
- <% end %>
- </ul>
- </div>
- <% end %>
-
- <div class="field clearfix">
- <%= f.label :video_segment_id %><br />
- <%= f.number_field :video_segment_id, :class => 'input' %>
- </div>
- <div class="field">
- <%= f.label :category_id %><br />
- <%= f.number_field :category_id %>
- </div>
- <div class="field">
- <%= f.label :transcription %><br />
- <%= f.text_area :transcription %>
- </div>
- <div class="field">
- <%= f.label :gold_num1 %><br />
- <%= f.number_field :gold_num1 %>
- </div>
- <div class="field">
- <%= f.label :gold_num2 %><br />
- <%= f.number_field :gold_num2 %>
- </div>
- <div class="field">
- <%= f.label :gold_sum %><br />
- <%= f.number_field :gold_sum %>
- </div>
- <div class="actions">
- <%= f.submit %>
+<div class="row">
+ <div class="span16">
+ <%= turkee_form_for(@transcription, params) do |f| %>
+ <fieldset>
+ <% if @transcription.errors.any? %>
+ <div id="error_explanation">
+ <h2><%= pluralize(@transcription.errors.count, "error") %> prohibited this transcription from being
+ saved:</h2>
+
+ <ul>
+ <% @transcription.errors.full_messages.each do |msg| %>
+ <li><%= msg %></li>
+ <% end %>
+ </ul>
+ </div>
+ <% end %>
+
+ <div class="clearfix">
+ <%= f.label :video_segment_id %>
+ <div class="input">
+ <%= f.number_field :video_segment_id, :class => 'xlarge' %>
+ </div>
+ </div>
+ <div class="clearfix">
+ <%= f.label :category_id %>
+ <div class="input">
+ <%= f.number_field :category_id %>
+ </div>
+
+ </div>
+ <div class="clearfix">
+ <%= f.label :transcription %>
+ <div class="input">
+ <%= f.text_area :transcription %>
+ </div>
+
+ </div>
+ <div class="clearfix">
+ <%= f.label :gold_num1 %>
+ <div class="input">
+ <%= f.number_field :gold_num1 %>
+ </div>
+
+ </div>
+ <div class="clearfix">
+ <%= f.label :gold_num2 %>
+ <div class="input">
+ <%= f.number_field :gold_num2 %>
+ </div>
+
+ </div>
+ <div class="clearfix">
+ <%= f.label :gold_sum %>
+ <div class="input">
+ <%= f.number_field :gold_sum %>
+ </div>
+
+ </div>
+ <div class="actions">
+ <%= f.submit(nil,:class => 'btn primary') %>
+ </div>
+ </fieldset>
+ <% end %>
+
</div>
-<% end %>
+</div>

0 comments on commit 809cfcc

Please sign in to comment.