From 4ee22611a6c0ede23a50d7c269ebba6b74f1c0c5 Mon Sep 17 00:00:00 2001 From: Manson Wang Date: Wed, 19 Feb 2014 14:48:52 +0800 Subject: [PATCH] Update for template page --- app/controllers/admin/sites_controller.rb | 1 - app/views/admin/authorizations/index.html.erb | 2 +- app/views/admin/designs/_design.html.erb | 23 +- app/views/admin/designs/_designs.html.erb | 21 +- app/views/admin/designs/index.html.erb | 221 +++++++++++++++++- 5 files changed, 234 insertions(+), 34 deletions(-) diff --git a/app/controllers/admin/sites_controller.rb b/app/controllers/admin/sites_controller.rb index d2dbc83..503769f 100644 --- a/app/controllers/admin/sites_controller.rb +++ b/app/controllers/admin/sites_controller.rb @@ -151,7 +151,6 @@ class Admin::SitesController < OrbitBackendController result = "success" Bundler.with_clean_env { `cd #{Rails.root} && bundle install && touch tmp/restart.txt` } end - %x(git stash pop) unless need_stash render :text => result end diff --git a/app/views/admin/authorizations/index.html.erb b/app/views/admin/authorizations/index.html.erb index 1f81d94..8e01d0e 100644 --- a/app/views/admin/authorizations/index.html.erb +++ b/app/views/admin/authorizations/index.html.erb @@ -35,6 +35,6 @@
<%= link_to content_tag(:i, nil, class: "icons-plus") + ' ' + t(:add), '#', class: 'btn btn-primary select_user_modal', rel: admin_modal_select_authorizations_path(@module_app.key, @type, @object) %> - <%= link_to content_tag(:i, nil, class: "icon-trash") + ' ' + t(:delete), '#', id: 'remove_users', class: 'btn btn-danger', rel: admin_remove_users_authorizations_path(@module_app.key, @type, @object) %> + <%= link_to content_tag(:i, nil, class: "icon-trash") + ' ' + t(:delete_), '#', id: 'remove_users', class: 'btn btn-danger', rel: admin_remove_users_authorizations_path(@module_app.key, @type, @object) %>
diff --git a/app/views/admin/designs/_design.html.erb b/app/views/admin/designs/_design.html.erb index d0d5add..bcf8e0a 100644 --- a/app/views/admin/designs/_design.html.erb +++ b/app/views/admin/designs/_design.html.erb @@ -1,15 +1,20 @@ - - <%= check_box_tag 'to_delete[]', design.id, false, :class => "checkbox_in_list" %> - - <%= design.title %> -
-
+ + + + +
+
+
<%= t(:template_store) %>
+
+ + + + + + +
+ + Loading template store... + +
+ +
+ +
+
+ +
<%= 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 + + + +