diff --git a/app/controllers/admin/ad_banners_controller.rb b/app/controllers/admin/ad_banners_controller.rb index 5d39e51..8652ff6 100644 --- a/app/controllers/admin/ad_banners_controller.rb +++ b/app/controllers/admin/ad_banners_controller.rb @@ -1,4 +1,5 @@ class Admin::AdBannersController < OrbitAdminController + before_action ->(module_app = @app_title) { set_variables module_app } def index @banners = Banner.all diff --git a/app/views/admin/ad_banners/_index.html.erb b/app/views/admin/ad_banners/_index.html.erb index 4752f8b..769fb17 100644 --- a/app/views/admin/ad_banners/_index.html.erb +++ b/app/views/admin/ad_banners/_index.html.erb @@ -111,7 +111,7 @@ font-weight: normal; } .bottomnav{ - z-index: 999; + /*z-index: 999;*/ } .ad-banner-detail{ display: none; @@ -167,7 +167,7 @@ margin: 0; } .ad-image-btn{ - padding: 2px 25px; + padding: 2px 20px; line-height: 22px; color: #FFF; background: #000; @@ -198,7 +198,12 @@ text-align: center; font-size: 16px; } - @media all and (max-width: 768px) { + @media all and (max-width: 1000px) { + .ad-banner-info table{ + display: none; + } + } + @media all and (max-width: 767px) { .ad-banner-detail{ position: relative; margin-bottom: 10px; @@ -227,6 +232,7 @@ + <% if can_edit_or_delete?(banner) %>
+ <% end %>
@@ -268,6 +275,7 @@
+ <% if can_edit_or_delete?(banner) %>
@@ -310,6 +318,7 @@ <% end %>
+ <% end %> <% if ((i+1)%3==0) or (i+1 == @banners.count) %>
<% end %> diff --git a/app/views/admin/ad_banners/index.html.erb b/app/views/admin/ad_banners/index.html.erb index 2eed65f..5b79e3f 100644 --- a/app/views/admin/ad_banners/index.html.erb +++ b/app/views/admin/ad_banners/index.html.erb @@ -3,40 +3,44 @@ <%= javascript_include_tag "cycle2" %> <%= javascript_include_tag "ad_banner/banner_preview" %> <% end %> + -
-
- " data-id="new" data-fx="fade" class="btn btn-primary open-slide" href="#"> - <%= t("ad_banner.new_banner") %> - -
- -
-
-
- - - - +<% if current_user.is_admin? or current_user.is_manager?(@module_app) %> + -
-
-
- <%= form_for :ad_banner, url: nil, remote: true do |f| %> -
- <%= render :partial => "form", :locals => { :f => f } %> -
- <%= t(:cancel) %> - <%= f.submit t(:submit), class: 'btn btn-primary btn-small' %> -
-
- <% end %> + +
+
+ + + + +
+
+
+
+ <%= form_for :ad_banner, url: nil, remote: true do |f| %> +
+ <%= render :partial => "form", :locals => { :f => f } %> +
+ <%= t(:cancel) %> + <%= f.submit t(:submit), class: 'btn btn-primary btn-small' %> +
+
+ <% end %> +
-
-<%= render 'layouts/delete_modal', delete_options: @delete_options %> \ No newline at end of file + <%= render 'layouts/delete_modal', delete_options: @delete_options %> +<% end %> \ No newline at end of file