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

Merge commit 'ef3fddd863dcfe90f2a352206bdef0ff85af53f0' into openness 

Conflicts:
	vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
This commit is contained in:
Matthew K. Fu JuYuan 2012-11-21 18:45:46 +08:00
parent f9b5f71930 ef3fddd863
commit 1dc44e34ac
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb vendored
View File

@ -290,6 +290,7 @@ var calendarAPI = function(){
}) })
var doneEventArray = new Array(); var doneEventArray = new Array();
var makerow = function(events){ var makerow = function(events){
var $eventrow =null; var $eventrow =null;
var currow = 0; var currow = 0;
var curdate = 0; var curdate = 0;
@ -371,6 +372,7 @@ var calendarAPI = function(){
if(recordcurdate) if(recordcurdate)
doneEventArray.push(evnt.index); doneEventArray.push(evnt.index);
} }
} }

2
vendor/built_in_modules/gallery/app/controllers/panel/gallery/front_end/albums_controller.rb vendored
View File

@ -10,6 +10,7 @@ class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
@album.tag_ids.each do |tag| @album.tag_ids.each do |tag|
@tags << GalleryTag.find(tag)[I18n.locale] @tags << GalleryTag.find(tag)[I18n.locale]
end end
end end
def get_albums def get_albums
@ -96,6 +97,7 @@ class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
tags.each do |tag| tags.each do |tag|
@tagnames << GalleryTag.find(tag)[I18n.locale] @tagnames << GalleryTag.find(tag)[I18n.locale]
end end
@back_link = panel_gallery_front_end_album_path(@albumid)
end end

2
vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/index.html.erb vendored
View File

@ -36,7 +36,7 @@
gallery.loadAlbums(gallery.urlVars['tag']); gallery.loadAlbums(gallery.urlVars['tag']);
}else{ }else{
gallery.loadArea = "albums"; gallery.loadArea = "albums";
g.loadAlbums("all"); gallery.loadAlbums("all");
} }
</script> </script>

2
vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/show.html.erb vendored
View File

@ -20,7 +20,7 @@
<!-- tag end --> <!-- tag end -->
<div class="form-actions form-fixed pagination-right rghead"> <div class="form-actions form-fixed pagination-right rghead">
<div class="rgfn"> <div class="rgfn">
<a class="bt-back rgbt" title="<%= I18n.t("gallery.back_to_albums") %>" href="gallery"><i class="icon-arrow-left"></i> <%= I18n.t("gallery.back_to_albums") %></a> <a class="bt-back rgbt" title="<%= I18n.t("gallery.back_to_albums") %>" href="<%= panel_gallery_front_end_albums_path %>"><i class="icon-arrow-left"></i> <%= I18n.t("gallery.back_to_albums") %></a>
</div> </div>
</div> </div>
</div> </div>

2
vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/theater.html.erb vendored
View File

@ -42,7 +42,7 @@
<!-- tag end --> <!-- tag end -->
<div class="form-actions form-fixed pagination-right rghead"> <div class="form-actions form-fixed pagination-right rghead">
<div class="rgfn"> <div class="rgfn">
<a class="bt-back rgbt" title="<%= I18n.t("gallery.back_to_albums") %>" href="gallery?id=<%= @albumid %>"><i class="icon-arrow-left"></i> <%= I18n.t("gallery.back_to_albums") %></a> <a class="bt-back rgbt" title="<%= I18n.t("gallery.back_to_albums") %>" href="<%= @back_link %>"><i class="icon-arrow-left"></i> <%= I18n.t("gallery.back_to_albums") %></a>
</div> </div>
</div> </div>
</div> </div>