[template-welcome-page] Refactor templates page

Rodrigo Souto
1 parent da9bf73d
Showing 8 changed files with 47 additions and 8 deletions Show diff stats
app/views/admin_panel/_signup_welcome_screen.html.erb
app/views/templates/index.html.erb
public/designs/icons/tango/mod/16x16/mimetypes/appearance.png
public/designs/icons/tango/mod/16x16/mimetypes/blocks.png
public/designs/icons/tango/mod/16x16/mimetypes/header-footer.png
public/designs/icons/tango/mod/16x16/mimetypes/welcome-page.png
public/designs/icons/tango/style.css
public/stylesheets/application.css
@@ -5,7 +5,7 @@
 <p>
 <div class='description'>
-  <%= _('If this content is left blank, the following page will be displayed to the user.') %><br/><br/>
+  <%= _('If this content is left blank, the following page will be displayed to the user:') %><br/><br/>
 </div>
 <p>
 <%= render :file => 'home/welcome' %>
@@ -10,14 +10,27 @@
   <div class='template-kind'>
     <h2><%= title %></h2>
     <%= button :add, _('New...'), {:action => "create_#{kind}_template"}, :title => _("Create a new template for %s") % title.downcase %>
-    <ul>
+    <table class='actions'>
+      <tr>
+        <th><%= _('Template') %></th>
+        <th><%= _('Actions') %></th>
+      </tr>
       <% templates.each do |template| %>
-        <li>
-          <%= image_tag "icons-app/#{kind}-icon.png" %>
-          <%= link_to(template.name, {:controller => 'profile_editor', :profile => template.identifier}, :title => _('Edit template "%s"') % template.name ) %>
-        </li>
+        <tr>
+          <td>
+            <%#= image_tag "icons-app/#{kind}-icon.png" %>
+            <%= link_to(template.name, {:controller => 'profile_editor', :profile => template.identifier}, :title => _('Edit template "%s"') % template.name ) %>
+          </td>
+          <td>
+            <%= button_without_text 'edit', _('Edit settings'), {:controller => 'profile_editor', :profile => template.identifier, :action => 'edit'} %>
+            <%= button_without_text 'welcome-page', _('Edit welcome page'), {:controller => 'profile_editor', :profile => template.identifier, :action => 'welcome_page'} %>
+            <%= button_without_text 'blocks', _('Edit sideblocks'), {:controller => 'profile_design', :profile => template.identifier, :action => 'index'} %>
+            <%= button_without_text 'appearance', _('Edit appearance'), {:controller => 'profile_themes', :profile => template.identifier, :action => 'index'} %>
+            <%= button_without_text 'header-footer', _('Edit header/footer'), {:controller => 'profile_editor', :profile => template.identifier, :action => 'header_footer'} %>
+          </td>
+        </tr>
       <% end %>
-    </ul>
+    </table>
   </div>
 <% end %>
@@ -85,6 +85,10 @@
 .icon-application-vnd-oasis-opendocument-text         { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png) }
 .icon-application-vnd-oasis-opendocument-spreadsheet  { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png) }
 .icon-application-vnd-oasis-opendocument-presentation { background-image: url(Tango/16x16/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png) }
+.icon-welcome-page   { background-image: url(mod/16x16/mimetypes/welcome-page.png) }
+.icon-blocks         { background-image: url(mod/16x16/mimetypes/blocks.png) }
+.icon-header-footer  { background-image: url(mod/16x16/mimetypes/header-footer.png) }
+.icon-appearance     { background-image: url(Tango/16x16/apps/preferences-desktop-wallpaper.png) }
 .icon-media-pause  { background-image: url(Tango/16x16/actions/media-playback-pause.png) }
 .icon-media-play   { background-image: url(Tango/16x16/actions/media-playback-start.png) }
@@ -118,8 +118,30 @@ a img {
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
 }
-/*********************************************************/
+table.actions {
+  table-layout: fixed;
+  width: 100%;
+}
+
+table.actions img {
+  width: 16px;
+  height: 16px;
+}
+
+table.actions a.icon {
+  display: block;
+  border: none;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+table.actions td:last-child {
+  text-align: center;
+}
+
+/*********************************************************/
 #spinner {
   z-index: 10;
	@@ -5,7 +5,7 @@		@@ -5,7 +5,7 @@
5		5
6	<p>	6	<p>
7	<div class='description'>	7	<div class='description'>
8	- <%= _('If this content is left blank, the following page will be displayed to the user.') %><br/><br/>	8	+ <%= _('If this content is left blank, the following page will be displayed to the user:') %><br/><br/>
9	</div>	9	</div>
10	<p>	10	<p>
11	<%= render :file => 'home/welcome' %>	11	<%= render :file => 'home/welcome' %>
	@@ -10,14 +10,27 @@		@@ -10,14 +10,27 @@
10	<div class='template-kind'>	10	<div class='template-kind'>
11	<h2><%= title %></h2>	11	<h2><%= title %></h2>
12	<%= button :add, _('New...'), {:action => "create_#{kind}_template"}, :title => _("Create a new template for %s") % title.downcase %>	12	<%= button :add, _('New...'), {:action => "create_#{kind}_template"}, :title => _("Create a new template for %s") % title.downcase %>
13	- <ul>	13	+ <table class='actions'>
		14	+ <tr>
		15	+ <th><%= _('Template') %></th>
		16	+ <th><%= _('Actions') %></th>
		17	+ </tr>
14	<% templates.each do \|template\| %>	18	<% templates.each do \|template\| %>
15	- <li>
16	- <%= image_tag "icons-app/#{kind}-icon.png" %>
17	- <%= link_to(template.name, {:controller => 'profile_editor', :profile => template.identifier}, :title => _('Edit template "%s"') % template.name ) %>
18	- </li>	19	+ <tr>
		20	+ <td>
		21	+ <%#= image_tag "icons-app/#{kind}-icon.png" %>
		22	+ <%= link_to(template.name, {:controller => 'profile_editor', :profile => template.identifier}, :title => _('Edit template "%s"') % template.name ) %>
		23	+ </td>
		24	+ <td>
		25	+ <%= button_without_text 'edit', _('Edit settings'), {:controller => 'profile_editor', :profile => template.identifier, :action => 'edit'} %>
		26	+ <%= button_without_text 'welcome-page', _('Edit welcome page'), {:controller => 'profile_editor', :profile => template.identifier, :action => 'welcome_page'} %>
		27	+ <%= button_without_text 'blocks', _('Edit sideblocks'), {:controller => 'profile_design', :profile => template.identifier, :action => 'index'} %>
		28	+ <%= button_without_text 'appearance', _('Edit appearance'), {:controller => 'profile_themes', :profile => template.identifier, :action => 'index'} %>
		29	+ <%= button_without_text 'header-footer', _('Edit header/footer'), {:controller => 'profile_editor', :profile => template.identifier, :action => 'header_footer'} %>
		30	+ </td>
		31	+ </tr>
19	<% end %>	32	<% end %>
20	- </ul>	33	+ </table>
21	</div>	34	</div>
22	<% end %>	35	<% end %>
23		36
	@@ -118,8 +118,30 @@ a img {		@@ -118,8 +118,30 @@ a img {
118	-moz-border-radius: 3px;	118	-moz-border-radius: 3px;
119	-webkit-border-radius: 3px;	119	-webkit-border-radius: 3px;
120	}	120	}
121	-/*********************************************************/
122		121
		122	+table.actions {
		123	+ table-layout: fixed;
		124	+ width: 100%;
		125	+}
		126	+
		127	+table.actions img {
		128	+ width: 16px;
		129	+ height: 16px;
		130	+}
		131	+
		132	+table.actions a.icon {
		133	+ display: block;
		134	+ border: none;
		135	+ white-space: nowrap;
		136	+ overflow: hidden;
		137	+ text-overflow: ellipsis;
		138	+}
		139	+
		140	+table.actions td:last-child {
		141	+ text-align: center;
		142	+}
		143	+
		144	+/*********************************************************/
123		145
124	#spinner {	146	#spinner {
125	z-index: 10;	147	z-index: 10;