fixed some small html-code errors

workaround to the problem with firefox not sizing div/table correctly if tabs(\t) are used in <pre> tags --> for now replaced with 2 spaces on output. removed some backup copies of the editor from the versioncontrol. added gitignore
universal · May 20, 2008 · d9fb3a5 · d9fb3a5
1 parent 6d02357
commit d9fb3a5
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 289 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+log
+tmp
+*.log
+*.output
+*.sqlite3
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -5,15 +5,16 @@
 <head>
   <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
   <title><%= controller.controller_name %>: <%= controller.action_name %></title>
-  <%= stylesheet_link_tag 'scaffold' %>
+  <%= stylesheet_link_tag 'application' %>
   <%- %w{active4d all_hallows_eve amy blackboard brilliance_black brilliance_dull cobalt dawn eiffel espresso_libre idle iplastic lazy mac_classic magicwb_amiga pastels_on_dark spacecadet sunburst twilight zenburnesque}.each do |theme| -%>
     	<%= require_syntax_css theme%>
   <%- end -%>
   <%= javascript_include_tag :defaults %>
 </head>
 <body>
-
-<p style="color: green"><%= flash[:notice] %></p>
+<% if flash[:notice] -%>
+<p style="color: green"><%= flash[:notice] -%></p>
+<% end -%>
 <%= yield  %>
 <table>
   <tfoot>

diff --git a/app/views/layouts/pastes.html.erb b/app/views/layouts/pastes.html.erb
diff --git a/app/views/pastes/_code.html.erb~ b/app/views/pastes/_code.html.erb~
diff --git a/app/views/pastes/_form.html.erb~ b/app/views/pastes/_form.html.erb~
diff --git a/app/views/pastes/edit.html.erb~ b/app/views/pastes/edit.html.erb~
diff --git a/app/views/pastes/index.html.erb~ b/app/views/pastes/index.html.erb~
diff --git a/app/views/pastes/new.html.erb~ b/app/views/pastes/new.html.erb~
diff --git a/app/views/pastes/show.html.erb b/app/views/pastes/show.html.erb
@@ -1,22 +1,20 @@
 <table>
   <thead>
-
     <tr>
       <th>Language: <%=h @paste.language %></th>
       <th>Theme: <%= select_tag :themes, options_for_select(%w{active4d all_hallows_eve amy blackboard brilliance_black brilliance_dull cobalt dawn eiffel espresso_libre idle iplastic lazy mac_classic magicwb_amiga pastels_on_dark spacecadet sunburst twilight zenburnesque}), :onChange => "changeStyle(this.value)", :id => "theme_picker" %></th>
+    </tr>
   </thead>
   <tbody>
-    </tr>
     <tr>
-      <td colspan="2">
-        <div id="code">
-          <%=c @paste.code, :syntax => @paste.language %>
-        </div>
+      <td colspan="2" id="code" style="width: auto;">
+          <%=c @paste.code.gsub(/\t/, '  '), :syntax => @paste.language %>
       </td>
     </tr>
     <tr>
       <td><%= link_to 'Edit', edit_paste_path(@paste) %></td>
       <td><%= link_to 'Back', pastes_path %></td>
+		</tr>
   </tbody>
 </table>
 

diff --git a/app/views/pastes/show.html.erb~ b/app/views/pastes/show.html.erb~
diff --git a/config/routes.rb~ b/config/routes.rb~
diff --git a/public/stylesheets/scaffold.css → public/stylesheets/application.css b/public/stylesheets/scaffold.css → public/stylesheets/application.css
@@ -88,6 +88,12 @@ table caption {text-align: left; text-transform: uppercase;  padding-bottom: 10p
 
 table thead th {background: #3A4856; padding: 15px 10px; color: #fff; text-align: left; font-weight: normal;}
 
+table thead a {color: #FFFFFF; text-decoration: none; border-bottom: 1px solid #FFFFFF;}  
+
+table thead a:visited {color: #AFAFAF;}
+
+table thead a:hover {color: #000;} 
+
 table tbody, table thead {border-left: 1px solid #EAECEE; border-right: 1px solid #EAECEE;}
 
 table tbody {border-bottom: 1px solid #EAECEE;}

diff --git a/public/stylesheets/scaffold.css~ b/public/stylesheets/scaffold.css~