From 5f90be20a2cdb12fe7331189612ba0a81bf80ece Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 26 Feb 2015 15:09:42 +0800 Subject: [PATCH] update Templates storn & Module storn UI --- app/views/admin/designs/_design.html.erb | 4 +- app/views/admin/designs/_designs.html.erb | 7 +- app/views/admin/designs/index.html.erb | 213 +++++------------- app/views/admin/module_store/index.html.erb | 195 +++------------- app/views/admin/store/_store.html.erb | 15 +- app/views/admin/store/template_store.html.erb | 15 +- 6 files changed, 115 insertions(+), 334 deletions(-) diff --git a/app/views/admin/designs/_design.html.erb b/app/views/admin/designs/_design.html.erb index 9b92116..c1ad137 100644 --- a/app/views/admin/designs/_design.html.erb +++ b/app/views/admin/designs/_design.html.erb @@ -1,9 +1,9 @@ -
<%= design['title'] %>
+ <%= design['title'] %> -

<%= design['author'] %>

+ <%= design['author'] %> <%= radio_button_tag 'design_default', design['key'], (current_site.template && current_site.template.eql?(design['key']) ? true : false), :class => 'design_default toggle-check', :rel => admin_site_change_design_path(:site_id=>current_site.id, :design_key=>design['key']) %> diff --git a/app/views/admin/designs/_designs.html.erb b/app/views/admin/designs/_designs.html.erb index 16ff916..7a2c2b3 100644 --- a/app/views/admin/designs/_designs.html.erb +++ b/app/views/admin/designs/_designs.html.erb @@ -1,11 +1,10 @@ - Templates Title - Designer - Status + Templates Title + Designer + Status - <%= render :partial => 'design', :collection => @designs %> \ No newline at end of file diff --git a/app/views/admin/designs/index.html.erb b/app/views/admin/designs/index.html.erb index 7ab5ccc..70a47c1 100644 --- a/app/views/admin/designs/index.html.erb +++ b/app/views/admin/designs/index.html.erb @@ -1,122 +1,14 @@ - <%= stylesheet_link_tag "lib/wrap-nav"%> - <%= stylesheet_link_tag "lib/main-list"%> - <%= stylesheet_link_tag "lib/mt-list"%> - <%= stylesheet_link_tag "lib/filter"%> - <%= stylesheet_link_tag "lib/togglebox"%> + <%= stylesheet_link_tag "lib/wrap-nav"%> + <%= stylesheet_link_tag "lib/main-list"%> + <%= stylesheet_link_tag "lib/mt-list"%> + <%= stylesheet_link_tag "lib/filter"%> + <%= stylesheet_link_tag "lib/togglebox"%> + <%= stylesheet_link_tag "admin/store"%> - <%= javascript_include_tag 'lib/footable-0.1' %> - <%= javascript_include_tag 'lib/all-list' %> - <%= javascript_include_tag 'lib/retina' %> - + <%= javascript_include_tag 'lib/footable-0.1' %> + <%= javascript_include_tag 'lib/all-list' %> + <%= javascript_include_tag 'lib/retina' %> @@ -129,53 +21,56 @@ <%= image_tag("preloader.gif", size: "50") %> - -
- -
-
-
<%= t(:installed_templates) %>
-
+
+
+ +
+
+
+
+ +
+
- - <%= render 'designs' %> - -
-
-
- + <%= render 'designs' %> +
+
-
- -
-
-
<%= t(:template_store) %>
-
- <%= render :partial => "admin/store/store", :locals => {:section => "templates"} %> -
-
-
+
+
+
-
-
-
- - -
- <%#= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:upload), upload_package_admin_designs_path, :class => 'btn btn-primary pull-right' %> + <%= render :partial => "admin/store/store", :locals => {:section => "templates"} %> +
+
+ +
+ + + <%#= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:upload), upload_package_admin_designs_path, :class => 'btn btn-primary pull-right' %> + \ No newline at end of file diff --git a/app/views/admin/module_store/index.html.erb b/app/views/admin/module_store/index.html.erb index 1b1614f..a053f70 100644 --- a/app/views/admin/module_store/index.html.erb +++ b/app/views/admin/module_store/index.html.erb @@ -1,139 +1,14 @@ - <%= stylesheet_link_tag "lib/wrap-nav"%> - <%= stylesheet_link_tag "lib/main-list"%> - <%= stylesheet_link_tag "lib/mt-list"%> - <%= stylesheet_link_tag "lib/filter"%> - <%= stylesheet_link_tag "lib/togglebox"%> + <%= stylesheet_link_tag "lib/wrap-nav"%> + <%= stylesheet_link_tag "lib/main-list"%> + <%= stylesheet_link_tag "lib/mt-list"%> + <%= stylesheet_link_tag "lib/filter"%> + <%= stylesheet_link_tag "lib/togglebox"%> + <%= stylesheet_link_tag "admin/store"%> - <%= javascript_include_tag 'lib/footable-0.1' %> - <%= javascript_include_tag 'lib/all-list' %> - <%= javascript_include_tag 'lib/retina' %> - + <%= javascript_include_tag 'lib/footable-0.1' %> + <%= javascript_include_tag 'lib/all-list' %> + <%= javascript_include_tag 'lib/retina' %> <%= flash[:notice] rescue nil%> @@ -159,34 +34,32 @@
-
- -
-
-
<%= t(:installed_modules) %>
-
- - - -
-
-
- -
+
+
+ +
+
+
+
+
-
- -
-
-
<%= t(:module_store) %>
-
- <%= render :partial => "admin/store/store", :locals => {:section => "apps"} %> -
-
-
-
-
-
+
+ <%= render :partial => "admin/store/store", :locals => {:section => "apps"} %> +
+
+
+