Merge branch 'master' of github.com:concerto/concerto into revised_in…

…fo_arch
concerto · Jul 6, 2012 · 9b2cf79 · 9b2cf79
2 parents 306f8f9 + f31e280
commit 9b2cf79
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app/views/contents/new.html.erb b/app/views/contents/new.html.erb
@@ -1,7 +1,7 @@
 <div class="row-fluid">
   <div class="span2 collapse-right">
     <br /><br />
-    <ul class="nav nav-tabs nav-stacked nav-drawer-left nav-dark">
+    <ul class="nav nav-tabs nav-stacked nav-drawer-left">
       <li class="nav-header">Add content type:</li>
       <% content_types.each do |subclass| %>
   			<li<% if @content.class.to_s == subclass.model_name.human %> class="active"<% end %>>

diff --git a/app/views/templates/new.html.erb b/app/views/templates/new.html.erb
@@ -1,9 +1,10 @@
 <div class="row-fluid">
-  <div class="span2">
-    <h3>Select way to add template:</h3>
-    <ul>
-      <li><%= link_to "Create from Scratch", new_template_path(:type=> "create") %></li>
-      <li><%= link_to "Import Existing", new_template_path(:type=> "import") %></li>
+  <div class="span2 collapse-right">
+    <br /><br />
+    <ul class="nav nav-tabs nav-stacked nav-drawer-left">
+      <li class="nav-header">Add template by:</li>
+      <li<% if @type == "create" %> class="active"<% end %>><%= link_to "Creating from Scratch", new_template_path(:type=> "create") %></li>
+      <li<% if @type == "import" %> class="active"<% end %>><%= link_to "Importing Existing", new_template_path(:type=> "import") %></li>
     </ul>
   </div>
   <div class="span10">