diff --git a/vendor/built_in_modules/gallery/app/assets/images/gallery/pbar-ani.gif b/vendor/built_in_modules/gallery/app/assets/images/gallery/pbar-ani.gif deleted file mode 100755 index 6edd1742..00000000 Binary files a/vendor/built_in_modules/gallery/app/assets/images/gallery/pbar-ani.gif and /dev/null differ 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 85614059..6be6ed5b 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 @@ -165,7 +165,7 @@ var galleryAPI = function(){ var $img = $("
"+album.name+"
"); var tag_string = ""; for(tag in album.tag_names){ - tag_string+= '' + album.tag_names[tag] + ''; + tag_string+= '' + album.tag_names[tag] + ''; } $img.find(".tagnames").html(tag_string); g.albumArea.find("#imgholder").append($img); diff --git a/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css b/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css index 045e1bc2..9875ef9a 100755 --- a/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css +++ b/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css @@ -43,17 +43,10 @@ .rgalbum, .rgphoto { float: left; margin: 0 10px 24px 0; } .rgalbum { padding: 16px; - margin: 0 8px 8px 0; - border: solid 1px #ccc; + margin: 0; + border-right: solid 1px #ccc; + border-bottom: solid 1px #ccc; height: 180px; - border-radius: 4px; - - transition: all 0.3s ease; - -webkit-transition: all 0.3s ease; - -moz-transition: all 0.3s ease; -} -.rgalbum:hover { - box-shadow: 0 0 6px rgba(0,0,0,0.2); } .rgalbum img { transition: all, 0.5s ease; @@ -62,23 +55,8 @@ -ms-transition: all, 0.5s ease; } .rgphoto { } -.rgphoto a { - display: block; - padding: 4px; - border: solid 1px #ddd; - background-color: #fff; - border-radius: 4px; - transition: all, 0.3s ease; - -webkit-transition: all, 0.3s ease; - -moz-transition: all, 0.3s ease; -} -.rgphoto a:hover { - border-color: #999; - box-shadow: 0 3px 6px rgba(0,0,0,0.2); -} .rgphoto img, .rgphoto_edit img { - display: block; - border-radius: 3px; + display: block; transition: all, 0.3s ease; -webkit-transition: all, 0.3s ease; -moz-transition: all, 0.3s ease; @@ -104,6 +82,7 @@ clear: both; overflow: hidden; margin-bottom: 10px; + border-bottom: solid 1px #fcfcfc; } .albumname_edit label { width: 120px; @@ -357,6 +336,23 @@ padding: 6px; } .rgphoto_edit .rgbtsg.active { display: inline-block; } +/* +.bt-add { background-position: 0 -106px; } +.bt-add:hover { background-position: 0 -296px; } +.bt-add:active { background-position: 0 -486px; } +.bt-del { background-position: 0 -144px; } +.bt-del:hover { background-position: 0 -334px; } +.bt-del:active { background-position: 0 -524px; } +.bt-edit { background-position: 0 -182px; } +.bt-edit:hover { background-position: 0 -372px; } +.bt-edit:active { background-position: 0 -562px; } +.bt-back { background-position: 0 -676px; } +.bt-back:hover { background-position: 0 -714px; } +.bt-back:active { background-position: 0 -752px; } +.bt-save, .bt-finish { background-position: 0 -220px; } +.bt-save:hover, .bt-finish:hover { background-position: 0 -410px; } +.bt-save:active, .bt-finish:active { background-position: 0 -600px; } +*/ .bt-finish { display: block; float: right; clear: both; } .bt-addnew { margin: 0 auto; @@ -495,14 +491,8 @@ top: 50%; margin-top: -7px; } -#tag_panel .tag_save { - position: absolute; - right: 0; - bottom: 0; - height: 31px; - border-left: solid 1px #ccc; - background-color: #fff; - padding: 2px 4px 0 4px; +#tag_panel .bt-save { + } @@ -527,21 +517,6 @@ } #orbit_gallery .form-actions { background-color: whiteSmoke; } -.o_gallery .tagnames { - display: inline-block; +.o_album .rgbody { + margin: 10px 8px; } -.o_gallery .label-tags { - display: inline-block; - margin: 0 6px 6px 0; -} - -.o_gallery .rgbody, .o_album .rgbody { - padding: 10px 8px; -} - -#categories .add-album .control-label { - text-align: left; - width: 100px; - padding-left: 12px; - padding-right: 12px; -} \ No newline at end of file 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 3291942f..c9869032 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 @@ -4,17 +4,42 @@
  • <%= t('gallery.edit') %>
    • -
    -
    - <% @site_valid_locales.each_with_index do |locale, i| %> - <% if i == 0 %> -
    - <% else %> -
    + +
    + <% i = 0 %> + <% @site_valid_locales.each do |locale| %> + <% if i == 0 %> +
    + <% else %> +
    + <% end %> + <% i = 1 %> +
    + +
    +
    +
    + <% @images.each do |image| %> +
    + +
    + +
    +
    + <% if image.id.to_s == @cover %> + + <% else %> + + <% end %> + + +
    +
    <% end %>
    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 51b0a527..c98dd323 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 @@ -92,8 +92,8 @@
    -
    ')this.value='';" id="tag_search_box">
    <%= I18n.t("gallery.save") %>
    - + <%= I18n.t("gallery.save") %> +
    ')this.value='';" id="tag_search_box">
    <% end %>