tidied UI

paulwalk · Oct 24, 2010 · d387756 · d387756
1 parent c66d0f6
commit d387756
Show file tree

Hide file tree

Showing 33 changed files with 318 additions and 602 deletions.
diff --git a/app/controllers/clusters_controller.rb b/app/controllers/clusters_controller.rb
diff --git a/app/helpers/clusters_helper.rb b/app/helpers/clusters_helper.rb
diff --git a/app/models/cluster.rb b/app/models/cluster.rb
diff --git a/app/models/topic.rb b/app/models/topic.rb
@@ -1,4 +1,4 @@
 class Topic < ActiveRecord::Base
-  belongs_to :cluster
+  belongs_to :topiccluster
   has_and_belongs_to_many :usecases
 end
diff --git a/app/views/clusters/edit.html.erb b/app/views/clusters/edit.html.erb
diff --git a/app/views/clusters/index.html.erb b/app/views/clusters/index.html.erb
diff --git a/app/views/clusters/new.html.erb b/app/views/clusters/new.html.erb
diff --git a/app/views/clusters/show.html.erb b/app/views/clusters/show.html.erb
diff --git a/app/views/shared/_menu_bar.html.erb b/app/views/shared/_menu_bar.html.erb
@@ -4,12 +4,11 @@
 
 <div id="navibar">
 	<%= link_to_unless_current 'Home',"#{ActionController::Base.relative_url_root}/" %> |
-	<%= link_to_unless_current 'Clusters',"#{ActionController::Base.relative_url_root}/clusters" %> |
+	<%= link_to_unless_current 'Topic Clusters',"#{ActionController::Base.relative_url_root}/topicclusters" %> |
 	<%= link_to_unless_current 'Topics',"#{ActionController::Base.relative_url_root}/topics" %> |
 	<%= link_to_unless_current 'Use Cases',"#{ActionController::Base.relative_url_root}/usecases" %> |
 	<%= link_to_unless_current 'Vocabulary Types',"#{ActionController::Base.relative_url_root}/vocabtypes" %> |
-	<%= link_to_unless_current 'Vocabularies',"#{ActionController::Base.relative_url_root}/vocabs" %> |
-	<%= link_to_unless_current 'Usages',"#{ActionController::Base.relative_url_root}/usages" %>
+	<%= link_to_unless_current 'Vocabularies',"#{ActionController::Base.relative_url_root}/vocabs" %>
 
 	<p style="color: green"><%= flash[:notice] %></p>
 </div>

diff --git a/app/views/topics/edit.html.erb b/app/views/topics/edit.html.erb
@@ -1,28 +1,15 @@
-<h1>Editing topic</h1>
+<%= render :partial => "shared/menu_bar"%>
 
-<% form_for(@topic) do |f| %>
-  <%= f.error_messages %>
+<h2>Editing Topic: <span class="entity-title"><%= @topic.name %></span></h2>
 
-  <p>
-    <%= f.label :name %><br />
-    <%= f.text_field :name %>
-  </p>
-  <p>
-    <%= f.label :url %><br />
-    <%= f.text_field :url %>
-  </p>
-  <p>
-    <%= f.label :note %><br />
-    <%= f.text_area :note %>
-  </p>
-  <p>
-    <%= f.label :cluster %><br />
-    <%= f.text_field :cluster %>
-  </p>
-  <p>
-    <%= f.submit 'Update' %>
-  </p>
-<% end %>
+<div id="tabs">
+	<ul>
+		<li><a href="#tabs-1">General</a></li>
+	</ul>
+	<div id="tabs-1">
+		<%= render :partial => "form" %>
+	</div>
+</div>
 
 <%= link_to 'Show', @topic %> |
 <%= link_to 'Back', topics_path %>
diff --git a/app/views/topics/index.html.erb b/app/views/topics/index.html.erb
@@ -17,7 +17,7 @@
 				<% @topics.each do |topic| %>
 				  <tr>
 				    <td><%= link_to topic.name, topic %></td>
-				    <td><%= link_to topic.cluster.name, topic.cluster %></td>
+				    <td><%= link_to topic.topiccluster.name, topic.topiccluster %></td>
 				    <td class="panel-grid-operations"><%= link_to 'Edit', edit_topic_path(topic) %> | <%= link_to 'Destroy', topic, :confirm => 'Are you sure?', :method => :delete %></td>
 				  </tr>
 				<% end %>

diff --git a/app/views/topics/new.html.erb b/app/views/topics/new.html.erb
@@ -1,27 +1,15 @@
-<h1>New topic</h1>
+<%= render :partial => "shared/menu_bar"%>
 
-<% form_for(@topic) do |f| %>
-  <%= f.error_messages %>
+<h2>New Topic</h2>
+<div id="tabs">
+	<ul>
+		<li><a href="#tabs-1">General</a></li>
+	</ul>
+	<div id="tabs-1">
+		<%= render :partial => "form" %>
+	</div>
+</div>
+
+<%= link_to 'Back', topics_path %>
 
-  <p>
-    <%= f.label :name %><br />
-    <%= f.text_field :name %>
-  </p>
-  <p>
-    <%= f.label :url %><br />
-    <%= f.text_field :url %>
-  </p>
-  <p>
-    <%= f.label :note %><br />
-    <%= f.text_area :note %>
-  </p>
-  <p>
-    <%= f.label :cluster %><br />
-    <%= f.text_field :cluster %>
-  </p>
-  <p>
-    <%= f.submit 'Create' %>
-  </p>
-<% end %>
 
-<%= link_to 'Back', topics_path %>
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
@@ -1,23 +1,33 @@
-<p>
-  <b>Name:</b>
-  <%=h @topic.name %>
-</p>
+<%= render :partial => "shared/menu_bar"%>
 
-<p>
-  <b>Url:</b>
-  <%=h @topic.url %>
-</p>
+<h2>Showing Topic: <span class="entity-title"><%= @topic.name %></span></h2>
 
-<p>
-  <b>Note:</b>
-  <%=h @topic.note %>
-</p>
+<div id="tabs">
+	<ul>
+		<li><a href="#tabs-1">General</a></li>
+	</ul>
+	<div id="tabs-1">
+		<p>
+		  <b>Name:</b>
+		  <%=h @topic.name %>
+		</p>
 
-<p>
-  <b>Cluster:</b>
-  <%=h @topic.cluster %>
-</p>
+		<p>
+		  <b>Url:</b>
+		  <%=h @topic.url %>
+		</p>
 
+		<p>
+		  <b>Note:</b>
+		  <%=h @topic.note %>
+		</p>
+
+		<p>
+		  <b>Cluster:</b>
+		  <%=h @topic.topiccluster.name %>
+		</p>
+	</div>
+</div>
 
 <%= link_to 'Edit', edit_topic_path(@topic) %> |
 <%= link_to 'Back', topics_path %>