small ie fix for gallery forntend after routes changed

Merge branch 'development' of https://github.com/Rulingcom/orbit into some_cool_fixes_harry
Updated with Mobile UI working
2013-11-19 12:54:39 +08:00 · 2013-11-19 11:55:36 +08:00 · 2013-11-19 11:33:19 +08:00 · 2013-11-19 01:58:23 +08:00 · 2013-11-18 20:02:02 +08:00 · 2013-11-18 17:11:47 +08:00
6 changed files with 9284 additions and 12 deletions
@@ -4,7 +4,7 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
-//= require jquery
+//= require mobile/jquery-1.7.1
 //= require lib/jquery.preload.min.js
 //= require cycle2
 //= require mobile/jquery.mu.image.resize
@@ -24,10 +24,10 @@ $('#index').live('pageinit',function(){
 	});
 	$(".slideImg").muImageResize({width: $globalW, height: Math.floor($globalW/720*240)});
 	$(this).find(".newpic img").muImageResize({width: 280, height: 200});
-	$('.slideshow').cycle({
-		fx: $effect,
-		timeout: $timeout
-	});
+	// $('.slideshow').cycle({
+	// 	fx: $effect,
+	// 	timeout: $timeout
+	// });
 	$(".newlist").css({
 		"width" : $(".newitem").outerWidth()*(Math.floor($globalW/$(".newitem").outerWidth()))+30,
 	})
@@ -113,10 +113,10 @@ $(window).bind("orientationchange", function(){
 		});

 		$(".slideImg").muImageResize({width: $globalW, height: Math.floor($globalW/720*240)});
-		$('.slideshow').cycle({
-			fx: $effect,
-			timeout: $timeout
-		});
+		// $('.slideshow').cycle({
+		// 	fx: $effect,
+		// 	timeout: $timeout
+		// });

 		$(".newlist").css({
 			"width" : $(".newitem").outerWidth()*(Math.floor($globalW/$(".newitem").outerWidth()))+30,
@@ -171,12 +171,19 @@ div[data-role="page"] {
 	float: left;
 	width: 280px;
 	min-height: 490px;
-	max-height: 490px;
+	/*max-height: 490px;*/
 	background-color: #FFFFFF;
 	padding: 10px;
 	margin: 0 10px 10px 0;
 	box-shadow: 0px 3px 5px rgba(0,0,0,.1);
 }
+.content .orbit-cycle-slideshow {
+	height: 300px;
+}
+.content .orbit-cycle-slideshow img {
+	width: 100%;
+	height: auto;
+}
 #index .content .newpic {
 	width: 280px;
 	height: 200px;
@@ -8,7 +8,7 @@ var galleryAPI = function(){
 	g = this;
 	this.urlVars = rcom.getUrlVars();
 	this.albumArea = $("#orbit_gallery");
-	this.loadArea = null;
+	this.loadArea = "theater";
 	this.tagList = $(".taglist ul");
 	this.loading = $("#loading");
 	// this.authenticated = false;
@@ -57,7 +57,6 @@
  galleryAPI.prototype.locale = "<%= I18n.locale %>";
    	var gallery = new galleryAPI();
    	gallery.initialize();
-    	gallery.loadArea = "theater";
    	gallery.loadTheater("<%= params[:id] %>","<%= params[:image_id] %>");
 </script>
Author	SHA1	Message	Date
harrybomrah	316692d1c3	small ie fix for gallery forntend after routes changed	2013-11-19 12:54:39 +08:00
harrybomrah	6d2043ddaf	Merge branch 'development' of https://github.com/Rulingcom/orbit into some_cool_fixes_harry	2013-11-19 11:55:36 +08:00
saurabhbhatia	44c93c2dde	Updated with Mobile UI working	2013-11-19 11:33:19 +08:00
harrybomrah	5e584f7575	gallery versioning added.. and also the models changed for gallery now more R4 compatible. urls for gallery working fine now..	2013-11-19 01:58:23 +08:00
harrybomrah	abb818c154	gallery_album to album	2013-11-18 20:02:02 +08:00
harrybomrah	441e4ef63a	category click, event click and more button fix	2013-11-18 17:11:47 +08:00