Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Spen
|
7d1141ee60 |
No files matched your search
@@ -81,7 +81,7 @@ function customOpenSlide() {
|
||||
} else {
|
||||
$('#pageslide form').prop('method', 'post')
|
||||
};
|
||||
_type == 'page' ? pageSetting(element.data('id'), _edit) : linkSetting(element.data('id'), _edit, pageslide);
|
||||
_type == 'page' ? pageSetting(element.data('id'), _edit) : linkSetting(element.data('id'), _edit);
|
||||
}
|
||||
});
|
||||
$iFrame.pageslide({
|
||||
@@ -237,8 +237,8 @@ function pageSetting(id, edit) {
|
||||
};
|
||||
};
|
||||
|
||||
function linkSetting(id, edit, ps) {
|
||||
$linkPublishedTrue = ps.find('#link_is_published_true');
|
||||
function linkSetting(id, edit) {
|
||||
$linkPublishedTrue = $('#link_is_published_true');
|
||||
_status = edit;
|
||||
if(_status) {
|
||||
$.ajax({
|
||||
@@ -250,7 +250,6 @@ function linkSetting(id, edit, ps) {
|
||||
})
|
||||
.done(function(data) {
|
||||
_linkData = data;
|
||||
console.log($linkPublishedTrue)
|
||||
data.public ? $linkPublishedTrue.prop('checked', true) : $linkPublishedTrue.prop('checked', false);
|
||||
$linkPublishedTrue.prop('checked') ? $('.link-options').slideDown(300) : $('.link-options').slideUp(300);
|
||||
$.each(_linkData.link, function(index, val) {
|
||||
|
||||
@@ -54,9 +54,10 @@ class Admin::DesignsController < OrbitBackendController
|
||||
when 'javascripts', 'themes'#, 'images'
|
||||
@object = @design.send(params[:type]).find(params[:object_id])
|
||||
end
|
||||
|
||||
Dir.mktmpdir('f_path') { |dir|
|
||||
temp_file = File.new(dir + '/' + File.basename(@object.file.url), 'w+')
|
||||
temp_file.write(params[:html_code].force_encoding('UTF-8'))
|
||||
temp_file.write(params[:file][:content].force_encoding('UTF-8'))
|
||||
@object.remove_file!
|
||||
@object.file = temp_file
|
||||
@object.save
|
||||
|
||||
@@ -341,18 +341,9 @@ class ApplicationController < ActionController::Base
|
||||
else
|
||||
objects = get_viewable(object_class, query)
|
||||
end
|
||||
|
||||
if (!user_signed_in? && object_class == "bulletin")
|
||||
objects = get_bulletins_for_open_backend(objects)
|
||||
end
|
||||
|
||||
Kaminari.paginate_array(filter_authorized_objects(objects)).page(params[:page]).per(10)
|
||||
end
|
||||
|
||||
def get_bulletins_for_open_backend(objects)
|
||||
objects.select{|object| object.is_rejected == false && object.is_pending == false}
|
||||
end
|
||||
|
||||
def get_string_value_from_object(object)
|
||||
s = object.name_translations[I18n.locale.to_s] unless s rescue nil
|
||||
s = object.title_translations[I18n.locale.to_s] unless s rescue nil
|
||||
|
||||
@@ -126,7 +126,7 @@
|
||||
</div>
|
||||
|
||||
<% @design.javascripts.each do |js| %>
|
||||
<div class="clearfix tab-pane fade active in" id="<%= dom_id js %>">
|
||||
<div class="clearfix tab-pane fade active in" id="#<%= dom_id js %>">
|
||||
<%= render :partial => 'tab_form', :locals => {:type => :javascripts, :object => js} %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
@@ -279,8 +279,8 @@ module OrbitCoreLib
|
||||
end
|
||||
|
||||
def check_user_can_use
|
||||
unless current_or_guest_user.admin? || (@module_app.is_manager?(current_or_guest_user) if @module_app.present?) || (@module_app.is_sub_manager?(current_or_guest_user) if @module_app.present?) || (@module_app.can_approve?(current_or_guest_user) if @module_app.present?)
|
||||
redirect_to admin_dashboards_url
|
||||
unless current_or_guest_user.admin? || @module_app.is_manager?(current_or_guest_user) || @module_app.is_sub_manager?(current_or_guest_user) || @module_app.can_approve?(current_or_guest_user)
|
||||
redirect_to root_url
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
+5
-10
@@ -220,19 +220,14 @@ var galleryAPI = function(){
|
||||
|
||||
$img.fadeOut(200,function(){
|
||||
g.loadstart();
|
||||
if($rslide.hasClass("fullscreen")){
|
||||
|
||||
if($rslide.hasClass("fullscreen"))
|
||||
$img.attr({"src":dom.attr("data-content")}).css("height","100%").load(function(){
|
||||
g.loadcomplete();
|
||||
$img.fadeIn(200);
|
||||
});
|
||||
}else{
|
||||
$img.attr({"src":dom.attr("data-content")}).css("height","auto").load(function(){
|
||||
console.log(dom.attr("data-content"));
|
||||
g.loadcomplete();
|
||||
$img.fadeIn(200);
|
||||
});;
|
||||
}
|
||||
else
|
||||
$img.attr({"src":dom.attr("data-content")}).css("height","auto");
|
||||
|
||||
if($rslide.hasClass("fullscreen")){
|
||||
$img.css({"padding":($rslide.height()-$img.height())/2})
|
||||
}
|
||||
@@ -241,7 +236,7 @@ var galleryAPI = function(){
|
||||
if(rcom.getInternetExplorerVersion() == -1){
|
||||
|
||||
if(pageurl!=window.location){
|
||||
pageurl = window.location.pathname.replace("/","")+"?id="+pageurl+"&controller_action=theater";
|
||||
pageurl = "gallery?id="+pageurl+"&controller_action=theater";
|
||||
window.history.pushState({path:pageurl},'',pageurl);
|
||||
}
|
||||
}else{
|
||||
|
||||
+1
-4
@@ -144,9 +144,6 @@
|
||||
-moz-transition: all 0.3s ease;
|
||||
}
|
||||
.rslide.fullscreen { position: fixed; z-index: 99; }
|
||||
.rslide.fullscreen .comp img{
|
||||
width: auto;
|
||||
}
|
||||
.rslideinside {
|
||||
}
|
||||
.comp {
|
||||
@@ -159,7 +156,7 @@
|
||||
-webkit-transition: all 0.3s ease;
|
||||
-moz-transition: all 0.3s ease;
|
||||
}
|
||||
.comp img{ display: block; width: 100%; height: auto; margin: 0 auto; cursor: pointer; min-height: 250px; }
|
||||
.comp img{ display: block; width: auto; height: auto; margin: 0 auto; cursor: pointer; min-height: 250px; }
|
||||
.comp .full{ width: auto; height: auto; max-width: 100%; max-height: 100%; }
|
||||
.rslidenav {
|
||||
position: absolute;
|
||||
|
||||
Vendored
+5
-6
@@ -25,7 +25,7 @@ class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
|
||||
end
|
||||
else
|
||||
@categoryids.each do |id|
|
||||
category = Category.find(id)
|
||||
category = GalleryCategory.find(id)
|
||||
if @tags
|
||||
if @tags.kind_of?(Array)
|
||||
@tags.each do |tag|
|
||||
@@ -44,9 +44,8 @@ class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
|
||||
@albs = Array.new
|
||||
album.each do |values|
|
||||
tags = Tag.find(values.tagged_ids).map{|t| t.name}
|
||||
category = Category.find(values.category_id).title
|
||||
|
||||
@albs << {"_id"=>values.id,"show_path"=>panel_gallery_front_end_album_path(values),"cover"=>values.cover,"cover_path"=>values.cover_path,"description"=>values.description,"category_name"=>category,"gallery_category_id" => values.category_id,"name"=>values.name,"tag_ids"=>values.tag_ids,"tag_names"=>tags}
|
||||
category = GalleryCategory.find(values.gallery_category_id).name
|
||||
@albs << {"_id"=>values.id,"show_path"=>panel_gallery_front_end_album_path(values),"cover"=>values.cover,"cover_path"=>values.cover_path,"description"=>values.description,"category_name"=>category,"gallery_category_id" => values.gallery_category_id,"name"=>values.name,"tag_ids"=>values.tag_ids,"tag_names"=>tags}
|
||||
end
|
||||
@output << @albs
|
||||
end
|
||||
@@ -86,8 +85,8 @@ class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
|
||||
@albumid = @image.gallery_album_id
|
||||
@album = GalleryAlbum.find(@albumid)
|
||||
@images = @album.gallery_images.all
|
||||
tags = @album.tagged_ids
|
||||
@tagnames = Tag.find(tags).map{|t| t.name}
|
||||
tags = @album.tag_ids
|
||||
@tagnames = Tag.find(tags.tagged_ids).map{|t| t.name}
|
||||
@back_link = panel_gallery_front_end_album_path(@albumid)
|
||||
end
|
||||
end
|
||||
+1
-1
@@ -20,7 +20,7 @@
|
||||
</script>
|
||||
<% content_for :page_specific_javascript do %>
|
||||
<%= javascript_include_tag "galleryAPI_frontend" %>
|
||||
<%#= javascript_include_tag "jquery.tinyscrollbar" %>
|
||||
<%= javascript_include_tag "jquery.tinyscrollbar" %>
|
||||
<%= javascript_include_tag "rss" %>
|
||||
<% end %>
|
||||
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@
|
||||
|
||||
<% content_for :page_specific_javascript do %>
|
||||
<%= javascript_include_tag "galleryAPI_frontend" %>
|
||||
<%#= javascript_include_tag "jquery.tinyscrollbar" %>
|
||||
<%= javascript_include_tag "jquery.tinyscrollbar" %>
|
||||
<%= javascript_include_tag "rss" %>
|
||||
<% end %>
|
||||
|
||||
|
||||
Reference in new issue
Block a user