developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallery update

This commit is contained in:
devin 2012-08-21 14:31:25 +08:00 committed by Christophe Vilayphiou
parent a2ed9e3350
commit 01eae75ad0
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb vendored
View File

@ -162,7 +162,7 @@ var galleryAPI = function(){
var $img = $("<div class='rgalbum'><a title='"+album.description+"' href='?album="+album._id+"'><img src='"+album.cover_path+"' width='120px' height='90px'/></a><span class='albumname'>"+album.name+"</span><span class='tagnames'></span></div>"); var $img = $("<div class='rgalbum'><a title='"+album.description+"' href='?album="+album._id+"'><img src='"+album.cover_path+"' width='120px' height='90px'/></a><span class='albumname'>"+album.name+"</span><span class='tagnames'></span></div>");
var tag_string = ""; var tag_string = "";
for(tag in album.tag_names){ for(tag in album.tag_names){
tag_string+= '<span class="tag_item">' + album.tag_names[tag] + '</span>'; tag_string+= '<span class="label label-tags">' + album.tag_names[tag] + '</span>';
} }
$img.find(".tagnames").html(tag_string); $img.find(".tagnames").html(tag_string);
g.albumArea.find("#imgholder").append($img); g.albumArea.find("#imgholder").append($img);

20
vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css vendored
View File

@ -495,10 +495,11 @@
} }
.tag_search input[type=text] { .tag_search input[type=text] {
box-shadow: none; box-shadow: none;
width: 170px; width: 92px;
height: 25px; height: 25px;
line-height: 25px; line-height: 25px;
padding: 3px 6px 3px 24px; padding: 3px 6px 3px 24px;
border: 0;
border-top: solid 1px #fff; border-top: solid 1px #fff;
} }
.tag_search input[type=text]:focus { .tag_search input[type=text]:focus {
@ -510,8 +511,14 @@
top: 50%; top: 50%;
margin-top: -7px; margin-top: -7px;
} }
#tag_panel .bt-save { #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;
} }
@ -539,3 +546,10 @@
.o_album .rgbody { .o_album .rgbody {
margin: 10px 8px; margin: 10px 8px;
} }
.o_gallery .tagnames {
display: inline-block;
}
.o_gallery .label-tags {
display: inline-block;
margin: 0 6px 6px 0;
}

4
vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/index.html.erb vendored
View File

@ -92,8 +92,8 @@
</ul> </ul>
</div> </div>
</div> </div>
<a class="btn bt-save" style="position:absolute; bottom: 0;"><i class="icon-ok"></i><%= I18n.t("gallery.save") %></a> <div class="tag_search"><div class="icon-search"></div><input type="text" value="<%= t('gallery.search_tags') %>" onblur="if(this.value=='')this.value='<%= t('gallery.search_tags') %>';" onfocus="if(this.value=='<%= t("gallery.search_tags") %>')this.value='';" id="tag_search_box"><div class="tag_save"><a class="btn bt-save"><i class="icon-ok"></i><%= I18n.t("gallery.save") %></a></div></div>
<div class="tag_search"><div class="icon-search"></div><input type="text" value="<%= t('gallery.search_tags') %>" onblur="if(this.value=='')this.value='<%= t('gallery.search_tags') %>';" onfocus="if(this.value=='<%= t("gallery.search_tags") %>')this.value='';" id="tag_search_box"></div>
</div> </div>
<% end %> <% end %>
<script type="text/javascript"> <script type="text/javascript">