fix dir

brownman · Nov 21, 2012 · 47b9b3c · 47b9b3c
1 parent 255b9b1
commit 47b9b3c
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 55 deletions.
diff --git a/.sass-cache/dde4918d3d6e6208f003e8a059cae43f879f4cbf/bootstrap_and_overrides.css.scssc b/.sass-cache/dde4918d3d6e6208f003e8a059cae43f879f4cbf/bootstrap_and_overrides.css.scssc
diff --git a/app/assets/javascripts/backbone/templates/comments/comment.jst.ejs b/app/assets/javascripts/backbone/templates/comments/comment.jst.ejs
@@ -10,14 +10,9 @@
     </div>
     <div id="collapseOne<%= obj.id %>" class="accordion-body collapse child1">
       <div class="accordion-inner">
-          log info
           <div class='details'>
-                            <label class="checkbox " for="direction">
-                                <br>
 
-                                direction(ltr):  
-                                <input  type="checkbox" name="direction" class="span9 direction checkbox " <%= obj.direction ? 'checked="checked"' : '' %> />
-                            </label>
+
 
 
 
@@ -52,6 +47,10 @@
 </div>
 
 <div class='all'>
+    <label class="checkbox span12" >
+      <input type="checkbox" name="direction" class='direction' <%= obj.direction ? 'checked="checked"' : '' %> >direction(ltr):
+    </label>
+
     <input  type="button" name="show" value='hide' class="span12 hide1 " <%= obj6 ? 'checked="checked"' : '' %> />
 
     <br>

diff --git a/app/assets/javascripts/backbone/templates/comments/comment.jst.ejs~ b/app/assets/javascripts/backbone/templates/comments/comment.jst.ejs~
@@ -10,14 +10,9 @@
     </div>
     <div id="collapseOne<%= obj.id %>" class="accordion-body collapse child1">
       <div class="accordion-inner">
-          log info
           <div class='details'>
-                            <label class="checkbox " for="direction">
-                                <br>
 
-                                direction(ltr):  
-                                <input  type="checkbox" name="direction" class="span9 direction checkbox " <%= obj.direction ? 'checked="checked"' : '' %> />
-                            </label>
+
 
 
 
@@ -48,21 +43,14 @@
       </div>
     </div>
   </div>
-  <div class="accordion-group">
-    <div class="accordion-heading">
-      <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseTwo">
-        Collapsible Group Item #2
-      </a>
-    </div>
-    <div id="collapseTwo" class="accordion-body collapse">
-      <div class="accordion-inner">
-        Anim pariatur cliche...
-      </div>
-    </div>
-  </div>
+
 </div>
 
 <div class='all'>
+    <label class="checkbox span12" >
+      <input type="checkbox" name="direction" class='direction span3' <%= obj.direction ? 'checked="checked"' : '' %> >direction(ltr):
+    </label>
+
     <input  type="button" name="show" value='hide' class="span12 hide1 " <%= obj6 ? 'checked="checked"' : '' %> />
 
     <br>

diff --git a/app/assets/javascripts/backbone/templates/comments/new.jst.ejs b/app/assets/javascripts/backbone/templates/comments/new.jst.ejs
@@ -6,9 +6,6 @@
   <input  rows="1" wrap="hard" type="text" name="title" class="title" value="<%= title %>" />
 
 
-  <label for="direction"> direction:</label>
-  <input  rows="1" type="checkbox" name="direction" class="direction" <%= direction ? 'checked="checked"' : '' %>  />
-
 
   <label for="content"> content:</label>
   <textarea  rows="1" wrap="hard" type="text" name="content" class="content" value="<%= content %>" />

diff --git a/app/assets/javascripts/backbone/templates/comments/new.jst.ejs~ b/app/assets/javascripts/backbone/templates/comments/new.jst.ejs~
@@ -15,6 +15,9 @@
 
 <input type="submit" value="Submit">
 </form>  
-<input type='text' class='errors'>errors: </input>
+<br>
+errors: 
+<input type='text' class='errors'></input>
+
 
 </div>
diff --git a/app/assets/javascripts/backbone/templates/posts/post.jst.ejs b/app/assets/javascripts/backbone/templates/posts/post.jst.ejs
@@ -6,12 +6,13 @@
 <input class="title" value=<%= post.title %> >title: </input>
 
 
-<a href="#/posts<%= post.id %>/edit" class="edit">edit</a>
 
-<a href="/posts#/<%= post.id %>/destroy" class="destroy">delete</a>
+
 
 <a class="c_length" >length:<%= length %>  </a>
 
+<a href="/posts#/<%= post.id %>/destroy" class="destroy">delete</a>
+
 
 
       </div>

diff --git a/app/assets/javascripts/backbone/templates/posts/post.jst.ejs~ b/app/assets/javascripts/backbone/templates/posts/post.jst.ejs~
@@ -6,12 +6,13 @@
 <input class="title" value=<%= post.title %> >title: </input>
 
 
-<a href="#/posts<%= post.id %>/edit" class="edit">edit</a>
 
-<a href="/posts#/<%= post.id %>/destroy" class="destroy">delete</a>
+
 
 <a class="c_length" >length:<%= length %>  </a>
 
+<a href="/posts#/<%= post.id %>/destroy" class="destroy">\tdelete</a>
+
 
 
       </div>
@@ -22,7 +23,6 @@
         <div class="new_comment">new_comment:</div>
 
 
-        <div class="child_info" >child info:</div>
 
         <div class="comments" >comments:</div>
 

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -12,15 +12,4 @@
  *= require_tree .
 */
 
-input[type="checkbox"]{
-	position:absolute;
-	left:0;
-	top:0;
-	width:auto;
-	display:inline-block;
-	}
 
-label.checkbox{
-	position:relative;
-	float: left;
-	}
diff --git a/app/assets/stylesheets/application.css~ b/app/assets/stylesheets/application.css~
@@ -12,15 +12,4 @@
  *= require_tree .
 */
 
-input[type="checkbox"]{
-	position:absolute;
-	left:0;
-	top:0;
-	width:auto;
-	display:inline-block;
-	}
 
-label.checkbox{
-	position:relative;
-	float: right;
-	}
diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.scss b/app/assets/stylesheets/bootstrap_and_overrides.css.scss
@@ -129,3 +129,4 @@ font-weight:bold;
 display: none;
 
 }
+