Merge branch 'master' into 'master'

Fix template js bug. Update announcement and gallery sidebar order and icon.



See merge request !15

app/assets/stylesheets/seminar/background_style/1/js/layout.js

@@ -7,11 +7,19 @@
 			window.clearTimeout(timeout_id)
 		  if (window.innerWidth < 768) {
 			} else {
-		    timeout_id = setTimeout(function(){
+				if($("div.aside").length == 0){
-          if($('.mobile-menu .modules-menu').length > 0){
+					timeout_id = setTimeout(function(){
-			    	$("header .container").append($('.mobile-menu .modules-menu'))
+	          if($('.mobile-menu .modules-menu').length > 0){
-			    }
+				    	$("header .container").append($('.mobile-menu .modules-menu'))
-        }, 500);
+				    }
+	        }, 500);
+				}else{
+					timeout_id = setTimeout(function(){
+	          if($('.modules-menu').length > 0){
+				    	$("div.aside").eq(0).append($('.modules-menu'))
+				    }
+	        }, 500);
+				}
 			}
 		})
 	})

app/assets/stylesheets/seminar/background_style/10/js/layout.js

@@ -0,0 +1,26 @@
+;(function($, win, undefined) {
+  // ECMAScript 5 嚴格模式 
+  'use strict';
+  $(document).ready(function() {
+  	var timeout_id;
+		$(window).resize(function() {
+			window.clearTimeout(timeout_id)
+		  if (window.innerWidth < 768) {
+			} else {
+				if($("div.aside").length == 0){
+					timeout_id = setTimeout(function(){
+	          if($('.mobile-menu .modules-menu').length > 0){
+				    	$("header .container").append($('.mobile-menu .modules-menu'))
+				    }
+	        }, 500);
+				}else{
+					timeout_id = setTimeout(function(){
+	          if($('.modules-menu').length > 0){
+				    	$("div.aside").eq(0).append($('.modules-menu'))
+				    }
+	        }, 500);
+				}
+			}
+		})
+	})
+}(jQuery, window));

app/assets/stylesheets/seminar/background_style/11/js/layout.js

@@ -0,0 +1,26 @@
+;(function($, win, undefined) {
+  // ECMAScript 5 嚴格模式 
+  'use strict';
+  $(document).ready(function() {
+  	var timeout_id;
+		$(window).resize(function() {
+			window.clearTimeout(timeout_id)
+		  if (window.innerWidth < 768) {
+			} else {
+				if($("div.aside").length == 0){
+					timeout_id = setTimeout(function(){
+	          if($('.mobile-menu .modules-menu').length > 0){
+				    	$("header .container").append($('.mobile-menu .modules-menu'))
+				    }
+	        }, 500);
+				}else{
+					timeout_id = setTimeout(function(){
+	          if($('.modules-menu').length > 0){
+				    	$("div.aside").eq(0).append($('.modules-menu'))
+				    }
+	        }, 500);
+				}
+			}
+		})
+	})
+}(jQuery, window));

app/assets/stylesheets/seminar/background_style/12/js/layout.js

@@ -0,0 +1,26 @@
+;(function($, win, undefined) {
+  // ECMAScript 5 嚴格模式 
+  'use strict';
+  $(document).ready(function() {
+  	var timeout_id;
+		$(window).resize(function() {
+			window.clearTimeout(timeout_id)
+		  if (window.innerWidth < 768) {
+			} else {
+				if($("div.aside").length == 0){
+					timeout_id = setTimeout(function(){
+	          if($('.mobile-menu .modules-menu').length > 0){
+				    	$("header .container").append($('.mobile-menu .modules-menu'))
+				    }
+	        }, 500);
+				}else{
+					timeout_id = setTimeout(function(){
+	          if($('.modules-menu').length > 0){
+				    	$("div.aside").eq(0).append($('.modules-menu'))
+				    }
+	        }, 500);
+				}
+			}
+		})
+	})
+}(jQuery, window));

app/assets/stylesheets/seminar/background_style/13/js/layout.js

@@ -0,0 +1,26 @@
+;(function($, win, undefined) {
+  // ECMAScript 5 嚴格模式 
+  'use strict';
+  $(document).ready(function() {
+  	var timeout_id;
+		$(window).resize(function() {
+			window.clearTimeout(timeout_id)
+		  if (window.innerWidth < 768) {
+			} else {
+				if($("div.aside").length == 0){
+					timeout_id = setTimeout(function(){
+	          if($('.mobile-menu .modules-menu').length > 0){
+				    	$("header .container").append($('.mobile-menu .modules-menu'))
+				    }
+	        }, 500);
+				}else{
+					timeout_id = setTimeout(function(){
+	          if($('.modules-menu').length > 0){
+				    	$("div.aside").eq(0).append($('.modules-menu'))
+				    }
+	        }, 500);
+				}
+			}
+		})
+	})
+}(jQuery, window));

app/assets/stylesheets/seminar/background_style/14/js/layout.js

@@ -0,0 +1,26 @@
+;(function($, win, undefined) {
+  // ECMAScript 5 嚴格模式 
+  'use strict';
+  $(document).ready(function() {
+  	var timeout_id;
+		$(window).resize(function() {
+			window.clearTimeout(timeout_id)
+		  if (window.innerWidth < 768) {
+			} else {
+				if($("div.aside").length == 0){
+					timeout_id = setTimeout(function(){
+	          if($('.mobile-menu .modules-menu').length > 0){
+				    	$("header .container").append($('.mobile-menu .modules-menu'))
+				    }
+	        }, 500);
+				}else{
+					timeout_id = setTimeout(function(){
+	          if($('.modules-menu').length > 0){
+				    	$("div.aside").eq(0).append($('.modules-menu'))
+				    }
+	        }, 500);
+				}
+			}
+		})
+	})
+}(jQuery, window));

app/assets/stylesheets/seminar/background_style/15/js/layout.js

@@ -0,0 +1,26 @@
+;(function($, win, undefined) {
+  // ECMAScript 5 嚴格模式 
+  'use strict';
+  $(document).ready(function() {
+  	var timeout_id;
+		$(window).resize(function() {
+			window.clearTimeout(timeout_id)
+		  if (window.innerWidth < 768) {
+			} else {
+				if($("div.aside").length == 0){
+					timeout_id = setTimeout(function(){
+	          if($('.mobile-menu .modules-menu').length > 0){
+				    	$("header .container").append($('.mobile-menu .modules-menu'))
+				    }
+	        }, 500);
+				}else{
+					timeout_id = setTimeout(function(){
+	          if($('.modules-menu').length > 0){
+				    	$("div.aside").eq(0).append($('.modules-menu'))
+				    }
+	        }, 500);
+				}
+			}
+		})
+	})
+}(jQuery, window));

app/assets/stylesheets/seminar/background_style/16/js/layout.js

@@ -0,0 +1,26 @@
+;(function($, win, undefined) {
+  // ECMAScript 5 嚴格模式 
+  'use strict';
+  $(document).ready(function() {
+  	var timeout_id;
+		$(window).resize(function() {
+			window.clearTimeout(timeout_id)
+		  if (window.innerWidth < 768) {
+			} else {
+				if($("div.aside").length == 0){
+					timeout_id = setTimeout(function(){
+	          if($('.mobile-menu .modules-menu').length > 0){
+				    	$("header .container").append($('.mobile-menu .modules-menu'))
+				    }
+	        }, 500);
+				}else{
+					timeout_id = setTimeout(function(){
+	          if($('.modules-menu').length > 0){
+				    	$("div.aside").eq(0).append($('.modules-menu'))
+				    }
+	        }, 500);
+				}
+			}
+		})
+	})
+}(jQuery, window));

app/assets/stylesheets/seminar/background_style/17/js/layout.js

@@ -0,0 +1,26 @@
+;(function($, win, undefined) {
+  // ECMAScript 5 嚴格模式 
+  'use strict';
+  $(document).ready(function() {
+  	var timeout_id;
+		$(window).resize(function() {
+			window.clearTimeout(timeout_id)
+		  if (window.innerWidth < 768) {
+			} else {
+				if($("div.aside").length == 0){
+					timeout_id = setTimeout(function(){
+	          if($('.mobile-menu .modules-menu').length > 0){
+				    	$("header .container").append($('.mobile-menu .modules-menu'))
+				    }
+	        }, 500);
+				}else{
+					timeout_id = setTimeout(function(){
+	          if($('.modules-menu').length > 0){
+				    	$("div.aside").eq(0).append($('.modules-menu'))
+				    }
+	        }, 500);
+				}
+			}
+		})
+	})
+}(jQuery, window));

app/assets/stylesheets/seminar/background_style/2/js/layout.js

@@ -0,0 +1,26 @@
+;(function($, win, undefined) {
+  // ECMAScript 5 嚴格模式 
+  'use strict';
+  $(document).ready(function() {
+  	var timeout_id;
+		$(window).resize(function() {
+			window.clearTimeout(timeout_id)
+		  if (window.innerWidth < 768) {
+			} else {
+				if($("div.aside").length == 0){
+					timeout_id = setTimeout(function(){
+	          if($('.mobile-menu .modules-menu').length > 0){
+				    	$("header .container").append($('.mobile-menu .modules-menu'))
+				    }
+	        }, 500);
+				}else{
+					timeout_id = setTimeout(function(){
+	          if($('.modules-menu').length > 0){
+				    	$("div.aside").eq(0).append($('.modules-menu'))
+				    }
+	        }, 500);
+				}
+			}
+		})
+	})
+}(jQuery, window));

app/assets/stylesheets/seminar/background_style/3/js/layout.js

@@ -0,0 +1,26 @@
+;(function($, win, undefined) {
+  // ECMAScript 5 嚴格模式 
+  'use strict';
+  $(document).ready(function() {
+  	var timeout_id;
+		$(window).resize(function() {
+			window.clearTimeout(timeout_id)
+		  if (window.innerWidth < 768) {
+			} else {
+				if($("div.aside").length == 0){
+					timeout_id = setTimeout(function(){
+	          if($('.mobile-menu .modules-menu').length > 0){
+				    	$("header .container").append($('.mobile-menu .modules-menu'))
+				    }
+	        }, 500);
+				}else{
+					timeout_id = setTimeout(function(){
+	          if($('.modules-menu').length > 0){
+				    	$("div.aside").eq(0).append($('.modules-menu'))
+				    }
+	        }, 500);
+				}
+			}
+		})
+	})
+}(jQuery, window));

app/assets/stylesheets/seminar/background_style/4/js/layout.js

@@ -0,0 +1,26 @@
+;(function($, win, undefined) {
+  // ECMAScript 5 嚴格模式 
+  'use strict';
+  $(document).ready(function() {
+  	var timeout_id;
+		$(window).resize(function() {
+			window.clearTimeout(timeout_id)
+		  if (window.innerWidth < 768) {
+			} else {
+				if($("div.aside").length == 0){
+					timeout_id = setTimeout(function(){
+	          if($('.mobile-menu .modules-menu').length > 0){
+				    	$("header .container").append($('.mobile-menu .modules-menu'))
+				    }
+	        }, 500);
+				}else{
+					timeout_id = setTimeout(function(){
+	          if($('.modules-menu').length > 0){
+				    	$("div.aside").eq(0).append($('.modules-menu'))
+				    }
+	        }, 500);
+				}
+			}
+		})
+	})
+}(jQuery, window));

app/assets/stylesheets/seminar/background_style/5/js/layout.js

@@ -0,0 +1,26 @@
+;(function($, win, undefined) {
+  // ECMAScript 5 嚴格模式 
+  'use strict';
+  $(document).ready(function() {
+  	var timeout_id;
+		$(window).resize(function() {
+			window.clearTimeout(timeout_id)
+		  if (window.innerWidth < 768) {
+			} else {
+				if($("div.aside").length == 0){
+					timeout_id = setTimeout(function(){
+	          if($('.mobile-menu .modules-menu').length > 0){
+				    	$("header .container").append($('.mobile-menu .modules-menu'))
+				    }
+	        }, 500);
+				}else{
+					timeout_id = setTimeout(function(){
+	          if($('.modules-menu').length > 0){
+				    	$("div.aside").eq(0).append($('.modules-menu'))
+				    }
+	        }, 500);
+				}
+			}
+		})
+	})
+}(jQuery, window));

app/assets/stylesheets/seminar/background_style/6/js/layout.js

@@ -0,0 +1,26 @@
+;(function($, win, undefined) {
+  // ECMAScript 5 嚴格模式 
+  'use strict';
+  $(document).ready(function() {
+  	var timeout_id;
+		$(window).resize(function() {
+			window.clearTimeout(timeout_id)
+		  if (window.innerWidth < 768) {
+			} else {
+				if($("div.aside").length == 0){
+					timeout_id = setTimeout(function(){
+	          if($('.mobile-menu .modules-menu').length > 0){
+				    	$("header .container").append($('.mobile-menu .modules-menu'))
+				    }
+	        }, 500);
+				}else{
+					timeout_id = setTimeout(function(){
+	          if($('.modules-menu').length > 0){
+				    	$("div.aside").eq(0).append($('.modules-menu'))
+				    }
+	        }, 500);
+				}
+			}
+		})
+	})
+}(jQuery, window));

app/assets/stylesheets/seminar/background_style/7/js/layout.js

@@ -0,0 +1,26 @@
+;(function($, win, undefined) {
+  // ECMAScript 5 嚴格模式 
+  'use strict';
+  $(document).ready(function() {
+  	var timeout_id;
+		$(window).resize(function() {
+			window.clearTimeout(timeout_id)
+		  if (window.innerWidth < 768) {
+			} else {
+				if($("div.aside").length == 0){
+					timeout_id = setTimeout(function(){
+	          if($('.mobile-menu .modules-menu').length > 0){
+				    	$("header .container").append($('.mobile-menu .modules-menu'))
+				    }
+	        }, 500);
+				}else{
+					timeout_id = setTimeout(function(){
+	          if($('.modules-menu').length > 0){
+				    	$("div.aside").eq(0).append($('.modules-menu'))
+				    }
+	        }, 500);
+				}
+			}
+		})
+	})
+}(jQuery, window));

app/assets/stylesheets/seminar/background_style/8/js/layout.js

@@ -0,0 +1,26 @@
+;(function($, win, undefined) {
+  // ECMAScript 5 嚴格模式 
+  'use strict';
+  $(document).ready(function() {
+  	var timeout_id;
+		$(window).resize(function() {
+			window.clearTimeout(timeout_id)
+		  if (window.innerWidth < 768) {
+			} else {
+				if($("div.aside").length == 0){
+					timeout_id = setTimeout(function(){
+	          if($('.mobile-menu .modules-menu').length > 0){
+				    	$("header .container").append($('.mobile-menu .modules-menu'))
+				    }
+	        }, 500);
+				}else{
+					timeout_id = setTimeout(function(){
+	          if($('.modules-menu').length > 0){
+				    	$("div.aside").eq(0).append($('.modules-menu'))
+				    }
+	        }, 500);
+				}
+			}
+		})
+	})
+}(jQuery, window));

app/assets/stylesheets/seminar/background_style/9/js/layout.js

@@ -0,0 +1,26 @@
+;(function($, win, undefined) {
+  // ECMAScript 5 嚴格模式 
+  'use strict';
+  $(document).ready(function() {
+  	var timeout_id;
+		$(window).resize(function() {
+			window.clearTimeout(timeout_id)
+		  if (window.innerWidth < 768) {
+			} else {
+				if($("div.aside").length == 0){
+					timeout_id = setTimeout(function(){
+	          if($('.mobile-menu .modules-menu').length > 0){
+				    	$("header .container").append($('.mobile-menu .modules-menu'))
+				    }
+	        }, 500);
+				}else{
+					timeout_id = setTimeout(function(){
+	          if($('.modules-menu').length > 0){
+				    	$("div.aside").eq(0).append($('.modules-menu'))
+				    }
+	        }, 500);
+				}
+			}
+		})
+	})
+}(jQuery, window));

custom_announcement/lib/custom_announcement/engine.rb

@@ -96,7 +96,8 @@ module CustomAnnouncement
           puts ['there_was_no_show_option_method',e]
         end
         side_bar do
-          head_label_i18n 'custom_announcement.custom_announcement', icon_class: "icons-megaphone"
+          set_sidebar_order(100) rescue nil
+          head_label_i18n 'custom_announcement.custom_announcement', icon_class: "icon-bullhorn"
           available_for "users"
           active_for_controllers (['admin/custom_announcements'])
           head_link_path "admin_custom_announcements_path"

custom_gallery/lib/custom_gallery/engine.rb

@@ -44,14 +44,14 @@ module CustomGallery
           authorizable
           frontend_enabled
           data_count 1..30
-
           begin
             show_option_items data
           rescue => e
             puts ['there_was_no_show_option_method',e]
           end
           side_bar do
-            head_label_i18n 'custom_gallery.custom_gallery', icon_class: "icons-pictures"
+            set_sidebar_order(100) rescue nil
+            head_label_i18n 'custom_gallery.custom_gallery', icon_class: "fa fa-file-image-o"
             available_for "users"
             active_for_controllers (['admin/custom_galleries','admin/images'])
             head_link_path "admin_custom_galleries_path"