Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu

vendor/built_in_modules/gallery/app/controllers/panel/gallery/widget/albums_controller.rb

@@ -1,7 +1,13 @@
 class Panel::Gallery::Widget::AlbumsController < OrbitWidgetController
 
 	def widget1
-		@settings = {"vertical"=>2,"horizontal"=>6}   #[note] horizontal has it's limitation from 2 to 6
+		vertical = 2
+		horizontal = 6 
+
+		vertical = @wiget_options[:vertical] if (@wiget_options.has_key?(:vertical) && @wiget_options[:vertical] < vertical)
+		horizontal = @wiget_options[:horizontal] if (@wiget_options.has_key?(:horizontal) && @wiget_options[:horizontal] < horizontal)	
+		
+		@settings = {"vertical"=>vertical,"horizontal"=>horizontal}   #[note] horizontal has it's limitation from 2 to 6
 		@class = "c" + @settings["horizontal"].to_s
 		@total = @settings["vertical"] * @settings["horizontal"]
 		@rnd = Random.new

vendor/built_in_modules/gallery/app/views/panel/gallery/widget/albums/widget1.html.erb

@@ -3,8 +3,6 @@
   <%#= javascript_include_tag "cycle" %>
 <%# end %>
 <div class="four columns">
-	<h4>Gallery Widget</h4>
-	<p>WIDGET 1</p>
 	<div class="widget_gallery w1 <%= @class %>">
 		<ul>
 			<% @images.each do |image| %>

vendor/built_in_modules/gallery/config/locales/en.yml

@@ -33,3 +33,6 @@ en:
     set_cover: Set as Album Cover
     sure?: "Are you sure?"
     no_description: Description Unavailable
+    widget_option:
+       horizontal: Horizontal Pictures
+       vertical: Vertical  Pictures

vendor/built_in_modules/gallery/config/locales/zh_tw.yml

@@ -32,4 +32,7 @@ zh_tw:
     cover: 封面
     set_cover: 設為封面
     sure?: "你確定嗎?"
-    no_description: 沒有描述
+    no_description: 沒有描述
+    widget_option:
+       horizontal: 水平圖片數量     
+       vertical: 垂直圖片數量