diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index 85763949..614424d7 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -69,7 +69,7 @@ <%= content_tag :li, :class => active_for_controllers('orbit_galleries','/panel/gallery/back_end/tags') do -%> - <%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.orbit_gallery'), panel_gallery_back_end_orbit_gallery_path %> + <%= link_to content_tag(:i, nil, :class => 'icons-picture') + t('admin.orbit_gallery'), panel_gallery_back_end_orbit_gallery_path %> <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('orbit_galleries') ) do -%> <%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %> <%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %> diff --git a/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb b/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb index 98398497..8c9c8d37 100644 --- a/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb +++ b/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb @@ -84,7 +84,7 @@ var galleryAPI = function(){ } this.loadAlbums = function(id){ - var headbtn = $('" href="albums" onclick="return false;"><%= I18n.t("gallery.add_album") %>'); + var headbtn = $('" href="albums" onclick="return false;"><%= I18n.t("gallery.add_album") %>'); headbtn.click(function(){g.makeNewAlbum();}) g.albumArea.find(".rghead .rgfn").html(headbtn); g.albumArea.find("#imgholder").empty(); @@ -118,12 +118,12 @@ var galleryAPI = function(){ this.loadImages = function(id){ //'); g.albumArea.find(".rghead .rgfn").html(headarea); g.albumArea.find(".rghead .rgfn a.bt-add").click(function(){ @@ -310,8 +310,8 @@ var galleryAPI = function(){ }) } - var head = $('"><%= I18n.t("gallery.back_to_photos") %>'); - var head1 = $('" href="" ><%= I18n.t("gallery.edit") %>'); + var head = $('"><%= I18n.t("gallery.back_to_photos") %>'); + var head1 = $('" href="" ><%= I18n.t("gallery.edit") %>'); g.albumArea.find("#imgholder").load("theater?pic="+id,function(theater,response,xhr){ if(xhr.status == 404){ $(this).text("<%= I18n.t('gallery.pic_not_found') %>."); @@ -388,12 +388,10 @@ var galleryAPI = function(){ } $("#filter").remove(); g.albumArea.css("margin-top",""); - var head ='"><%= I18n.t("gallery.back_to_photos") %>'; - head+=''; - head+='"><%= I18n.t("gallery.back_to_photos") %>'; + head+=''; + head+=''; g.albumArea.find(".rghead .rgfn").html(head); - - rcom.bindDomToHead($(".rghead")); g.albumArea.find("#imgholder").load("edit_album?aid="+id,function(data,response,xhr){ if(xhr.status == 404){ $(this).text("<%= I18n.t('gallery.album_not_found') %>"); diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/edit_album.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/edit_album.html.erb index a2acd706..6dc2232f 100644 --- a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/edit_album.html.erb +++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/edit_album.html.erb @@ -34,7 +34,7 @@ <% end %> -
+
\ No newline at end of file diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/index.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/index.html.erb index eba948e7..2ac01b05 100644 --- a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/index.html.erb +++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/index.html.erb @@ -56,21 +56,23 @@ -->