saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Button fixes

This commit is contained in:
Harry Bomrah 2012-08-06 17:49:10 +08:00 committed by chris
parent 69304fda43
commit aef1bfaba3
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/layouts/_side_bar.html.erb
View File

@ -69,7 +69,6 @@
<%= content_tag :li, :class => active_for_controllers('orbit_galleries','tags') do -%>
<%= 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') %>

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

@ -84,7 +84,7 @@ var galleryAPI = function(){
}
this.loadAlbums = function(id){
var headbtn = $('<a class="rgui bt-add rgbt" title="<%= I18n.t("gallery.add_album") %>" href="albums" onclick="return false;"><span><%= I18n.t("gallery.add_album") %></span></a>');
var headbtn = $('<a class="btn btn-primary pull-right" title="<%= I18n.t("gallery.add_album") %>" href="albums" onclick="return false;"><i class="icon-plus icon-white"></i><%= I18n.t("gallery.add_album") %></a>');
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){
//<iframe id="upload_panel" width="100%" scrolling="no" height="300" frameborder="0" src="upload_panel.html?id=16">
var headarea = '<a class="rgui bt-back rgbt" title="<%= I18n.t("gallery.back_to_albums") %>" href="orbit_gallery"><span><%= I18n.t("gallery.back_to_albums") %></span></a> ';
headarea+='<a class="rgui bt-add rgbt" title="<%= I18n.t("gallery.add_images") %>" href="images" onclick="return false;"><span><%= I18n.t("gallery.add_images") %></span></a> ';
headarea+='<a class="rgui bt-del rgbt" title="<%= I18n.t("gallery.del_album") %>" href="delete" onclick="return false;"><span><%= I18n.t("gallery.del_album") %></span></a> ';
headarea+='<a class="rgui bt-edit rgbt" title="<%= I18n.t("gallery.edit") %>" href="orbit_gallery?edit='+id+'" ><span><%= I18n.t("gallery.edit") %></span></a>';
var headarea = '<a class="bt-back btn btn-primary pull-right" title="<%= I18n.t("gallery.back_to_albums") %>" href="orbit_gallery"><i class="icon-plus icon-white"></i><%= I18n.t("gallery.back_to_albums") %></a> ';
headarea+='<a class="bt-add btn btn-primary pull-right" title="<%= I18n.t("gallery.add_images") %>" href="images" onclick="return false;"><i class="icon-plus icon-white"></i><%= I18n.t("gallery.add_images") %></a> ';
headarea+='<a class="bt-del btn btn-primary pull-right" title="<%= I18n.t("gallery.del_album") %>" href="delete" onclick="return false;"><i class="icon-plus icon-white"></i><%= I18n.t("gallery.del_album") %></a> ';
headarea+='<a class="bt-edit btn btn-primary pull-right" title="<%= I18n.t("gallery.edit") %>" href="orbit_gallery?edit='+id+'" ><i class="icon-plus icon-white"></i><%= I18n.t("gallery.edit") %></a>';
headarea = $(headarea);
var uploadpanel = $('<div id="upload_panel_holder" style="display:none; margin: 16px 0 50px 0;"><div class="rgfn"><a class="rgui bt-cls rgbt" title="Close" href="" onclick="return false;"><span id="album_name_span">Close Panel</span></a></div></div>');
var uploadpanel = $('<div id="upload_panel_holder" style="display:none; margin: 16px 0 50px 0;"><div class="rgfn"><a class="bt-cls btn btn-primary pull-right" title="Close" href="" onclick="return false;"><i class="icon-plus icon-white"></i>Close Panel<</a></div></div>');
var frame = $('<iframe id="upload_panel" width="100%" scrolling="no" height="300" frameborder="0" src="upload_panel"></iframe>');
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 = $('<a href="" class="rgui bt-back rgbt" title="<%= I18n.t("gallery.back_to_photos") %>"><span id="album_name_span"><%= I18n.t("gallery.back_to_photos") %></span></a></div>');
var head1 = $('<a class="rgui bt-edit rgbt" title="<%= I18n.t("gallery.edit") %>" href="" ><span><%= I18n.t("gallery.edit") %></span></a>');
var head = $('<a href="" class="bt-back btn btn-primary pull-right" title="<%= I18n.t("gallery.back_to_photos") %>"><i class="icon-plus icon-white"></i><%= I18n.t("gallery.back_to_photos") %></a></div>');
var head1 = $('<a class="bt-edit btn btn-primary pull-right" title="<%= I18n.t("gallery.edit") %>" href="" ><i class="icon-plus icon-white"></i><%= I18n.t("gallery.edit") %></a>');
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 ='<a href="orbit_gallery?album='+id+'" class="rgui bt-back rgbt" title="<%= I18n.t("gallery.back_to_photos") %>"><span id="album_name_span"><%= I18n.t("gallery.back_to_photos") %></span></a></div>';
head+='<a class="rgui bt-del bt-delete rgbt" onclick="return false;" style="display:none;" title="<%= I18n.t("gallery.delete_selected") %>" href=""><span><%= I18n.t("gallery.delete_selected") %></span></a>';
head+='<a class="rgui bt-save rgbt" onclick="return false;" style="display:none;" title="Save" href=""><span>Save</span>';
var head ='<a href="orbit_gallery?album='+id+'" class="bt-back btn btn-primary pull-right" title="<%= I18n.t("gallery.back_to_photos") %>"><i class="icon-plus icon-white"></i><%= I18n.t("gallery.back_to_photos") %></a></div>';
head+='<a class="bt-del bt-delete btn btn-primary pull-right" onclick="return false;" style="display:none;" title="<%= I18n.t("gallery.delete_selected") %>" href=""><i class="icon-plus icon-white"></i><%= I18n.t("gallery.delete_selected") %></a>';
head+='<a class="bt-save btn btn-primary pull-right" onclick="return false;" style="display:none;" title="Save" href=""><i class="icon-plus icon-white"></i>Save</a>';
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') %>");

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

@ -34,7 +34,7 @@
<% end %>
</div>
</div>
<div class="en tab-pane">
<!-- <div class="en tab-pane">
<div class="albumname_edit">
<label for="">Album Name:</label>
<div class="inputui rginput rgih26 w380"><span><input type="text" id='album_name_text' value="<%= @album_name %>" class="txtchange" /></span></div>
@ -59,5 +59,5 @@
</div>
<% end %>
</div>
</div>
</div> -->
</div>

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

@ -56,21 +56,23 @@
</tbody>
</table> -->
<div id="orbit_gallery" class="rg">
<div class="rghead">
<!-- <div class="rghead">
<div class="rgfn">
</div>
</div>
</div> -->
<div class="rgbody">
<div id="imgholder">
</div>
</div>
<div class="form-actions form-fixed pagination-right rghead">
<div class="rgfn">
<!-- <a href="" class="btn btn-primary pull-right"><i class="icon-plus icon-white"></i>新增</a> -->
</div>
</div>
<div class="form-actions form-fixed pagination-right">
<a href="" class="btn btn-primary pull-right"><i class="icon-plus icon-white"></i>新增</a>
<div id="bulletin_pagination" class="paginationFixed"></div>
</div>
<script type="text/javascript">
var gallery = new galleryAPI();
gallery.initialize();