Merge branch 'various_bugs' into nccu_master

Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb

app/views/admin/assets/_asset.html.erb

@@ -10,8 +10,8 @@
 			</ul>
 		</div>
 	</td>
-	<td><%= asset.data.file.content_type %></td>
-	<td><%= number_to_human_size(asset.data.file.file_length) %></td>
+	<td><%= asset.data.file.content_type rescue nil %></td>
+	<td><%= number_to_human_size(asset.data.file.file_length) rescue nil %></td>
 	<td><%= asset.description rescue nil %></td>
 	<td>
 		<div class="label-group">

app/views/admin/assets/create1.js.erb

@@ -2,7 +2,6 @@
 // Uncomment and change this document.domain value if you are loading the script cross subdomains
 // document.domain = 'moxiecode.com';
 
-// var tinymce=null,tinyMCEPopup,tinyMCE;tinyMCEPopup={init:function(){var b=this,a,c;a=b.getWin();tinymce=a.tinymce;tinyMCE=a.tinyMCE;b.editor=tinymce.EditorManager.activeEditor;b.params=b.editor.windowManager.params;b.features=b.editor.windowManager.features;b.dom=b.editor.windowManager.createInstance("tinymce.dom.DOMUtils",document);if(b.features.popup_css!==false){b.dom.loadCSS(b.features.popup_css||b.editor.settings.popup_css)}b.listeners=[];b.onInit={add:function(e,d){b.listeners.push({func:e,scope:d})}};b.isWindow=!b.getWindowArg("mce_inline");b.id=b.getWindowArg("mce_window_id");b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return(!window.frameElement&&window.dialogArguments)||opener||parent||top},getWindowArg:function(c,b){var a=this.params[c];return tinymce.is(a)?a:b},getParam:function(b,a){return this.editor.getParam(b,a)},getLang:function(b,a){return this.editor.getLang(b,a)},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},resizeToInnerSize:function(){var a=this;setTimeout(function(){var b=a.dom.getViewPort(window);a.editor.windowManager.resizeBy(a.getWindowArg("mce_width")-b.w,a.getWindowArg("mce_height")-b.h,a.id||window)},10)},executeOnLoad:function(s){this.onInit.add(function(){eval(s)})},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;if(!a.isWindow&&tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}},requireLangPack:function(){var b=this,a=b.getWindowArg("plugin_url")||b.getWindowArg("theme_url");if(a&&b.editor.settings.language&&b.features.translate_i18n!==false&&b.editor.settings.language_load!==false){a+="/langs/"+b.editor.settings.language+"_dlg.js";if(!tinymce.ScriptLoader.isDone(a)){document.write('<script type="text/javascript" src="'+tinymce._addVer(a)+'"><\/script>');tinymce.ScriptLoader.markDone(a)}}},pickColor:function(b,a){this.execCommand("mceColorPicker",true,{color:document.getElementById(a).value,func:function(e){document.getElementById(a).value=e;try{document.getElementById(a).onchange()}catch(d){}}})},openBrowser:function(a,c,b){tinyMCEPopup.restoreSelection();this.editor.execCallback("file_browser_callback",a,document.getElementById(a).value,c,window)},confirm:function(b,a,c){this.editor.windowManager.confirm(b,a,c,window)},alert:function(b,a,c){this.editor.windowManager.alert(b,a,c,window)},close:function(){var a=this;function b(){a.editor.windowManager.close(window);tinymce=tinyMCE=a.editor=a.params=a.dom=a.dom.doc=null}if(tinymce.isOpera){a.getWin().setTimeout(b,0)}else{b()}},_restoreSelection:function(){var a=window.event.srcElement;if(a.nodeName=="INPUT"&&(a.type=="submit"||a.type=="button")){tinyMCEPopup.restoreSelection()}},_onDOMLoaded:function(){var b=tinyMCEPopup,d=document.title,e,c,a;if(b.domLoaded){return}b.domLoaded=1;if(b.features.translate_i18n!==false){c=document.body.innerHTML;if(tinymce.isIE){c=c.replace(/ (value|title|alt)=([^"][^\s>]+)/gi,' $1="$2"')}document.dir=b.editor.getParam("directionality","");if((a=b.editor.translate(c))&&a!=c){document.body.innerHTML=a}if((a=b.editor.translate(d))&&a!=d){document.title=d=a}}if(!b.editor.getParam("browser_preferred_colors",false)||!b.isWindow){b.dom.addClass(document.body,"forceColors")}document.body.style.display="";if(tinymce.isIE){document.attachEvent("onmouseup",tinyMCEPopup._restoreSelection);b.dom.add(b.dom.select("head")[0],"base",{target:"_self"})}b.restoreSelection();b.resizeToInnerSize();if(!b.isWindow){b.editor.windowManager.setTitle(window,d)}else{window.focus()}if(!tinymce.isIE&&!b.isWindow){tinymce.dom.Event._add(document,"focus",function(){b.editor.windowManager.focus(b.id)})}tinymce.each(b.dom.select("select"),function(f){f.onkeydown=tinyMCEPopup._accessHandler});tinymce.each(b.listeners,function(f){f.func.call(f.scope,b.editor)});if(b.getWindowArg("mce_auto_focus",true)){window.focus();tinymce.each(document.forms,function(g){tinymce.each(g.elements,function(f){if(b.dom.hasClass(f,"mceFocus")&&!f.disabled){f.focus();return false}})})}document.onkeyup=tinyMCEPopup._closeWinKeyHandler},_accessHandler:function(a){a=a||window.event;if(a.keyCode==13||a.keyCode==32){a=a.target||a.srcElement;if(a.onchange){a.onchange()}return tinymce.dom.Event.cancel(a)}},_closeWinKeyHandler:function(a){a=a||window.event;if(a.keyCode==27){tinyMCEPopup.close()}},_wait:function(){if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);tinyMCEPopup._onDOMLoaded()}});if(document.documentElement.doScroll&&window==window.top){(function(){if(tinyMCEPopup.domLoaded){return}try{document.documentElement.doScroll("left")}catch(a){setTimeout(arguments.callee,0);return}tinyMCEPopup._onDOMLoaded()})()}document.attachEvent("onload",tinyMCEPopup._onDOMLoaded)}else{if(dLine truncated
 var returnurl = "<%= @asset.data.url %>";
 var returntitle = "<%= show_all_fields(@asset, 'title') %>";
 var returndescription = "<%= show_all_fields(@asset, 'description') %>";

app/views/admin/attributes/_attribute_field.html.erb

@@ -9,11 +9,21 @@
 	  <% end %>
 	<% end %>
   <td class='select_type'>
-    <%= f.select :markup, LIST[:markups], {}, {:style => "width:90px"} %>
-    <div <%= attribute_field[:markup].eql?('select') ? nil : "style='display:none'"%>>
-      <%= t(:options) %>:
-      <%= f.select "select_list_options", attribute_field.select_list_options, :style => "width:130px" %>
-    </div>
+    <ul>
+      <li>markup<%= f.select :markup, LIST[:markups].keys, {}, {:style => "width:90px"} %> </li>
+      <li>markup_value<%= f.text_field :markup_value,:size=>50 %></li>
+      <li>markup_options<%= f.text_field :markup_options,:size=>50 %></li>
+      <li>locale<%= f.check_box :locale,{},true,false %></li>
+      <li>built_in<%= f.check_box :built_in,{},true,false %></li>
+      <li>disabled<%= f.check_box :disabled,{},true,false %></li>
+      <li>add_more<%= f.check_box :add_more,{},true,false %></li>
+      <li>neutral_title<%= f.text_field :neutral_title,:size=>50 %></li>
+      <li>neutral_for<%= f.select :neutral_for, VALID_LOCALES, {}, {:style => "width:90px"} %> </li>
+    <!--  
+      <li><%#= attribute_field[:markup].eql?('select') ? nil : "style='display:none'"%> </li>
+      <li><%#= t(:options) %>: <%#= f.text_field :markup_value%></li>
+    -->
+    </ul>
   </td>
   <td class="action">
 		<% if attribute_field.new_record? %>

app/views/admin/dashboards/index.html.erb

@@ -1,3 +1,6 @@
+<% content_for :page_specific_css do -%>
+    <%= stylesheet_link_tag "item" %>
+<% end -%>
 <div id="isotope">
     <div class="item element">
         <h3><i class="icons-content"></i><%= t(:content) %></h3>

app/views/admin/designs/_form.html.erb

@@ -1,60 +1,22 @@
-<% content_for :page_specific_css do %>
-	<%= stylesheet_link_tag "design"  %>
+<%= form_for @design, :url => admin_design_path(@design), :html => {:class => 'form-horizontal'}, :remote => true do |f| %>
+  <%= f.error_messages %>
+  <div class="control-group">
+		<%= f.label :title, t(:title), :class => "control-label" %>
+    <div class="controls">
+			<%= f.text_field :title %>
+    </div>
+  </div>
+  <div class="control-group">
+		<%= f.label :author, t(:author), :class => "control-label" %>
+    <div class="controls">
+			<%= f.text_field :author %>
+    </div>
+  </div>
+  <div class="control-group">
+		<%= f.label :intro, t(:intro), :class => "control-label" %>
+    <div class="controls">
+			<%= f.text_field :intro %>
+    </div>
+  </div>
+    <%= f.submit t('update') %>
 <% end %>
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "design"  %>
-<% end %>
-
-<p>
-	<%= f.label :title, t(:title) %>
-	<%= f.text_field :title, :class => 'text'   %>
-</p>
-<p>
-	<%= f.label :author, t(:author) %>
-	<%= f.text_field :author, :class => 'text' %>
-</p>
-
-<p>
-	<%= f.label :intro, t(:intro) %>
-	<%= f.text_field :intro, :class => 'text' %>
-</p>
-
-<p>
-	<%= f.label "layout", t(:layout) %>
-	<% if @design.layout.blank? %>
-		<%= fields_for 'design[layout]' do |f| %>
-			<%= f.file_field :file %>
-			<%#= f.hidden_field :to_save, :value => true %>
-		<% end %>
-	<% else %>
-	  <%= File.basename (@design.layout.file.url)  %>
-	<% end %> 
-</p>
-<p>
-	<%= f.label "default_css", t(:default_css) %>
-	<% if @design.default_css.blank? %>
-		<%= fields_for 'design[default_css]' do |f| %>
-	    <%= f.file_field :file %>
-			<%#= f.hidden_field :to_save, :value => true %>
-		<% end %>
-	<% else %>
-	  <%= File.basename (@design.default_css.file.url) rescue "" %>
-	<% end %> 
-</p>
-<p>
-	<%= f.label :themes, t(:themes) %>
-	<ul>
-		<% @design.themes.each do |theme| %>
-			<%= render :partial => 'design_file', :object => theme, :locals => { :field_name => "themes", :f => f, :classes => "r_destroy, r_edit" } %>
-		<% end %>
-	</ul>
-	<%= render :partial => 'new_design_file', :object => @design.themes.build, :locals => { :field_name => "themes", :f => f, :classes => "r_destroy" } %>
-</p>
-
-<p>
-	<%#= render :partial => 'design_file', :locals => { :object => @design, :field_name => "javascripts", :f => f, :classes => "r_destroy, r_edit" } %>
-</p>
-
-<p>
-	<%#= render :partial => 'design_file', :locals => { :object => @design, :field_name => "images", :f => f, :classes => "r_destroy, r_snapshot" } %>
-</p>

app/views/admin/designs/_image.html.erb

@@ -0,0 +1,6 @@
+<tr>
+  <td><%= image.name %></td>
+  <td><%= image_tag image.file.thumb %></td>
+  <td><%= number_to_human_size(image.file.file.file_length) %></td>
+  <td><%= image.file.url %></td>
+</tr>

app/views/admin/designs/_images.html.erb

@@ -0,0 +1,40 @@
+<table id='image_list' class="table table-striped">
+  <thead>
+    <tr>
+      <th class="span1"><%= t(:name) %></th>
+      <th class="span1"><%= t(:image) %></th>
+      <th class="span1"><%= t(:size) %></th>
+      <th class="span4"><%= t(:url) %></th>
+    </tr>
+  </thead>
+  <tbody id="tbody_assets" class="sort-holder">
+    <%= render :partial => 'image', :collection => @design.images %>
+  </tbody>
+</table>
+
+
+<div class="modal hide fade" id="imageModal" tabindex="-1" role="dialog" aria-labelledby="imageModalLabel" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3 id="imageModalLabel">Add image</h3>
+  </div>
+  <%= form_for :image, :url => upload_image_admin_design_path, :html => {:id => 'ajaxForm', :class => 'form-horizontal'}, :method => :post do |f| %>
+    <div class="modal-body">
+      <div class="control-group">
+        <%= f.label :image, t(:image), :class => "control-label" %>
+        <div class="controls">
+          <%= f.file_field :file %>
+        </div>
+      </div>
+    </div>
+    <div class="modal-footer">
+      <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+      <%= f.submit t(:add), :class => "btn btn-primary" %>
+    </div>
+  <% end %>
+</div>
+
+
+<div class="form-actions form-fixed pagination-right">
+  <button class="btn btn-primary" href="#imageModal" data-toggle="modal"><%= t(:add) %></button>
+</div>

app/views/admin/designs/_tab_form.html.erb

@@ -0,0 +1,8 @@
+<%= form_for :file, :url => update_file_admin_design_path(:type => type, :object_id => object.id), :remote => true, :method => :post do |f| %>
+  <div id='post-body-content'>
+    <%= f.text_area :content, :class => 'middle', :value => object.file.read.force_encoding('UTF-8') %>
+  </div>
+  <div class="form-actions form-fixed pagination-right">
+    <button class="btn btn-primary"><%= t(:save) %></button>
+  </div>
+<% end %>

app/views/admin/designs/edit.html.erb

@@ -1,13 +1,43 @@
 <% content_for :side_bar do %>
-	<%= render 'admin/sites/side_bar' %>
+	<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 <h1><%= t('editing.design') %></h1>
 
-<%= form_for @design, :url => admin_design_path(@design),:html => {:multipart => true} do |f| %>
-  <%= f.error_messages %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <p>
-    <%= f.submit t('update') %> <%= link_back %>
-  </p>
-<% end %>
+<ul class="nav nav-tabs" id="myTab">
+  <li class="active"><a href="#info" data-toggle="tab"><%= t('design.info') %></a></li>
+  <li><a href="#layout" data-toggle="tab"><%= @design.layout.name %></a></li>
+  <li><a href="#css_default" data-toggle="tab"><%= @design.css_default.name %></a></li>
+  <li><a href="#css_reset" data-toggle="tab"><%= @design.css_reset.name %></a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('design.themes') %> <b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <% @design.themes.each do |theme| %>
+        <li><a href="#<%= dom_id theme %>" data-toggle="tab"><%= theme.name %></a></li>
+      <% end %>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('design.javascripts') %> <b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <% @design.javascripts.each do |js| %>
+        <li><a href="#<%= dom_id js %>" data-toggle="tab"><%= js.name %></a></li>
+      <% end %>
+    </ul>
+  </li>
+  <li><a href="#images" data-toggle="tab"><%= t('design.images') %></a></li>
+</ul>
+ 
+<div class="tab-content">
+  <div class="tab-pane active" id="info"><%= render :partial => 'form' %></div>
+  <div class="tab-pane" id="layout"><%= render :partial => 'tab_form', :locals => {:type => :layout, :object => @design.layout} %></div>
+  <div class="tab-pane" id="css_default"><%= render :partial => 'tab_form', :locals => {:type => :css_default, :object => @design.css_default} %></div>
+  <div class="tab-pane" id="css_reset"><%= render :partial => 'tab_form', :locals => {:type => :css_reset, :object => @design.css_reset} %></div>
+  <% @design.themes.each do |theme| %>
+    <div class="tab-pane" id="<%= dom_id theme %>"><%= render :partial => 'tab_form', :locals => {:type => :css_reset, :object => theme} %></div>
+  <% end %>
+  <% @design.javascripts.each do |js| %>
+    <div class="tab-pane" id="<%= dom_id js %>"><%= render :partial => 'tab_form', :locals => {:type => :css_reset, :object => js} %></div>
+  <% end %>
+  <div class="tab-pane" id="images"><%= render :partial => 'images' %></div>
+</div>

app/views/admin/designs/index.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-	<%= render 'admin/sites/side_bar' %>
+	<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 <%= render 'filter' %>

app/views/admin/designs/update_file.js.erb

@@ -0,0 +1 @@
+// $('.modal').modal('hide')

app/views/admin/designs/upload_image.html.erb

@@ -0,0 +1,9 @@
+<% if !request.xhr? %>
+<textarea>
+<% end %>
+$('#image_list').append("<%= j render :partial => 'image', :object => @image %>");
+$('#imageModal').modal('hide');
+$('#ajaxForm').resetForm();
+<% if !request.xhr? %>
+</textarea>
+<% end %>

app/views/admin/module_apps/reload_frontend_pages.js.erb

@@ -1,3 +1,5 @@
 $('#app_page_url').html("<%= escape_javascript(select 'page', 'app_frontend_url', @module_app.app_pages) %>");
-$('#app_page_category').html("<%= j (select 'page', 'category', @categories.collect{|category| [category.title, category.id]}, {:include_blank => true}) if @categories %>");
-$('#app_page_tag').html("<%= j (select 'page', 'tag', @tags.collect{|tag| [tag[I18n.locale], tag.id]}, {:include_blank => true}) if @tags %>");
+$('#app_page_frontend_style').html("<%= escape_javascript(select 'page', 'frontend_style', @module_app.widgets[@frontend_path]) if !@frontend_path.blank? %>");
+$('#app_page_category').html("<%= j (select 'page', 'category', @categories.collect{|category| [category.i18n_variable[I18n.locale], category.id]}, {:include_blank => true}) if @categories %>");
+$('#app_page_tag').html("<%= j (select 'page', 'tag', @tags.collect{|tag| [tag[I18n.locale], tag.id]}, {:include_blank => true}) if @tags %>");
+$('#app_page_frontend_field').html("<%= j render '../admin/pages/frontend_fields' %>")

app/views/admin/page_parts/_module_widget.html.erb

@@ -14,7 +14,13 @@
 </span>
 
 <span id='widget_list'>
-	<%= f.select :widget_path, @module_app.widgets.collect{|widget| [widget.humanize, widget]}, :selected => @part.widget_path %>
+	<%#= f.select :widget_path, @module_app.widgets.collect{|widget| [widget.humanize, widget]}, :selected => @part.widget_path %>
+	<%= f.select :widget_path, @module_app.widgets.collect{|k,v| [k.humanize, k]}, {}, { :selected => @part.widget_path, :rel => admin_page_parts_path } %>
+</span>
+
+<span id='widget_style_list'>
+	<%#= f.select :widget_style, @widget_style, :selected => @part.widget_style %>
+	<%= select('page_part','widget_style', @widget_style, :selected => @part[:widget_style], :include_blank => true ) rescue ''%>
 </span>
 
 :
@@ -25,4 +31,22 @@
 <%= t :or_lower %>
 <span id="widget_tag">
 	<%= render 'widget_tags' %>
-</span>
+</span>
+
+<span id='widget_field'>
+	
+	<%= render 'widget_fields' %>
+					
+	<%#= f.label :widget_field %>
+	<%# @module_app.widget_fields.each_with_index do |widget_field, i| %>
+		<%#= i+1 %>
+		<%#= select_tag "page_part[widget_field][]", options_for_select(@module_app.widget_fields.collect{|widget_field| [widget_field.humanize, widget_field]}, (@part.widget_field ? @part.widget_field[i] : nil) ), :include_blank => true %> <br />
+	<%# end %>	
+	
+	<%#= select_tag "page_part[widget_field][]", options_for_select(@module_app.widget_fields.collect{|widget_field| [widget_field.humanize, widget_field]}, @part.widget_field.collect{|widget_field| widget_field}), {:multiple => :multiple, :size => 6} %>
+</span>
+
+<div id="widget_data_count">
+<%= f.label :widget_data_count %>
+<%= f.text_field :widget_data_count %>
+</div>

app/views/admin/page_parts/_widget_fields.html.erb

@@ -0,0 +1,12 @@
+	
+	<% if (@module_app && @module_app.widget_fields) %>
+	
+	<%= label_tag('widget_field') %>
+	
+	<% @module_app.widget_fields.each_with_index do |widget_field, i| %>
+		<%= i+1 %>
+		<%= select_tag "page_part[widget_field][]", options_for_select(@module_app.widget_fields.collect{|widget_field| [widget_field.humanize, widget_field]}, (@part[:widget_field][i][0] if (@part && !@part[:widget_field].blank? && !@part[:widget_field][i].blank?)) ), :include_blank => true %>
+		<%= select_tag "page_part[widget_field_type][]", options_for_select(LIST[:widget_field_type].collect{|widget_field| [widget_field.humanize, widget_field]}, (@part[:widget_field][i][1] if (@part && !@part[:widget_field].blank? && !@part[:widget_field][i].blank?)) ), :include_blank => true %> <br />
+	<% end %>
+	
+	<% end %>	

app/views/admin/page_parts/reload_widget_styles.js.erb

@@ -0,0 +1 @@
+$('#widget_style_list select').html("<%= j options_for_select(@module_app.widgets[params[:id]]) %>")

app/views/admin/page_parts/reload_widgets.js.erb

@@ -1,3 +1,5 @@
-$('#widget_list select').html("<%= j options_for_select(@module_app.widgets.collect{|widget| [widget.humanize, widget]}) %>")
-$('#widget_category').html("<%= j render 'widget_categories' %>")
-$('#widget_tag').html("<%= j render 'widget_tags' %>")
+$('#widget_list select').html("<%= j options_for_select(@module_app.widgets.collect{|k,v| k}) %>");
+$('#widget_style_list').html("<%= escape_javascript(select 'page_part', 'widget_style', @module_app.widgets[@widget_path]) if !@widget_path.blank? %>");
+$('#widget_field').html("<%= j render 'widget_fields' %>");
+$('#widget_category').html("<%= j render 'widget_categories' %>");
+$('#widget_tag').html("<%= j render 'widget_tags' %>");

app/views/admin/pages/_form.html.erb

@@ -42,15 +42,27 @@
 		<span id="app_page_url">
 			<%= select('page','app_frontend_url', @app_frontend_urls, :selected => @item.app_frontend_url ) rescue ''%>
 		</span>
+		<span id="app_page_frontend_style">
+			<%= select('page','frontend_style', @frontend_style, :selected => @item[:frontend_style], :include_blank => true ) rescue ''%>
+		</span>
 		<span id="app_page_category">
 			<%= select('page','category', @categories.collect{|category| [category.title, category.id]}, :selected => @item[:category], :include_blank => true ) rescue ''%>
 		</span>
 		<span id="app_page_tag">
 			<%= select('page','tag', @tags.collect{|tag| [tag[I18n.locale], tag.id]}, :selected => @item[:tag], :include_blank => true ) rescue ''%>
 		</span>
+		<span id="app_page_frontend_field">
+			<%= render 'frontend_fields' %>
+		</span>
 		<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
 	</div>
 </div>
+<div class="control-group">
+	<%= f.label :frontend_data_count, t('admin.frontend_data_count'), :class => 'control-label' %>
+	<div class="controls">
+		<%= f.text_field :frontend_data_count %>
+	</div>
+</div>
 <div class="control-group">
 	<%= f.label :is_published, "#{t(:is_published)} ?", :class => 'control-label' %>
 	<div class="controls">

app/views/admin/pages/_frontend_fields.html.erb

@@ -0,0 +1,11 @@
+	
+	<% if (@module_app && @module_app.widget_fields) %>
+		<%= label_tag('frontend_field & frontend_field_type') %>
+		<% @module_app.widget_fields.each_with_index do |frontend_field, i| %>
+			<%= i+1 %>
+			<%= select_tag "page[frontend_field][]", options_for_select(@module_app.widget_fields.collect{|frontend_field| [frontend_field.humanize, frontend_field]}, (@item[:frontend_field][i][0] if (@item && !@item[:frontend_field].blank? && !@item[:frontend_field][i].blank?)) ), :include_blank => true %>
+			<%= select_tag "page[frontend_field_type][]", options_for_select(LIST[:widget_field_type].collect{|frontend_field| [frontend_field.humanize, frontend_field]}, (@item[:frontend_field][i][1] if (@item && !@item[:frontend_field].blank? && !@item[:frontend_field][i].blank?)) ), :include_blank => true %> <br />
+		<% end %>			
+	<% end %>	
+	
+	

app/views/admin/plugins/index.html.erb

@@ -0,0 +1,26 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+
+        <div id="isotope" class="user-data">
+            <div id="module-nav">
+                <div class="arrow_next pull-right"><i class="icon-chevron-right"></i></div>
+                <div class="arrow_prev pull-left"><i class="icon-chevron-left"></i></div>
+                <div class="module-nav-view">
+                    <ul class="nav nav-pills">
+                        <%= content_tag :li, :class=>(params[:show_plugin_profile].nil? ? "active" : nil) do %>
+                            <%= link_to t("admin.new_admin.users.all_plugin_summary")%>
+                        <% end -%>
+                        <% @plugins.each do |plugin| %>
+                            <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.name ? "active" : nil) do %>
+                                <%= link_to plugin.name, :show_plugin_profile => plugin.name %>
+                            <% end -%>    
+                        <% end -%>
+
+
+                    </ul>
+                </div>
+            </div>
+            <%= render :partial => @right_partial %>
+        </div>

app/views/admin/sites/_side_bar.html.erb

@@ -13,5 +13,5 @@
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('designs') do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-window-block') + t(:template), admin_designs_path %>
+	<%= link_to content_tag(:i, nil, :class => 'icons-window-block') + content_tag(:span, t(:template)), admin_designs_path %>
 <% end -%>

app/views/admin/sites/language.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-	<%= render 'side_bar' %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 language.html.erb

app/views/admin/sites/mail_setting.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-	<%= render 'side_bar' %>
+	<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 <div id="poststuff">

app/views/admin/sites/site_info.html.erb

@@ -1,5 +1,7 @@
+<% # encoding: utf-8 %>
+
 <% content_for :side_bar do %>
-	<%= render 'side_bar' %>
+	<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 <div id="poststuff">
@@ -79,6 +81,24 @@
 								<% end %>
 							</div>
 						</div>
+						<div class="control-group">
+							<label class="control-label"><%= t 'site.default_image' %></label>
+							<div class="controls">
+								<%= f.file_field :default_image, :id => "input-upload", :class => 'upload', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
+								<span id='fu' class="file-name"></span>
+							  <!--請程式務必將圖片尺寸加入到行內裡-->
+							  <% if @site.default_image %>
+								<%= image_tag( @site.default_image, :size=>"120x120") rescue ''%>
+							  <% else %>
+								<img class="pull-left upload-picture" src="/assets/default-img.png" />
+							  <% end %>
+								<br>
+								<% if @site.default_image.file %>
+								  <%= f.check_box :remove_default_image %>
+								  <%= t('刪除已上傳檔案') %>
+								<% end %>
+							</div>
+						</div>
 					<% end %>
 				<% end %>
 			</div>

app/views/admin/sites/sitemap.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-	<%= render 'side_bar' %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 

app/views/admin/sites/system_info.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-	<%= render 'side_bar' %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 system_info.html.erb

app/views/admin/sites/ui_theme.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-	<%= render 'side_bar' %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 ui_theme.html.erb

app/views/admin/users_new_interface/_deled_quick_edit.html.erb

@@ -0,0 +1,16 @@
+  <div class="quick-edit">
+                            <ul class="nav nav-pills hide">
+                                <li><a href="#"><%= t("admin.new_admin.action.edit")%> </a></li>
+                                <li class="dropdown">
+                                    <a href="#" data-toggle="dropdown" class="dropdown-toggle"><%= t("admin.new_admin.action.quick_edit")%><b class="caret"></b></a>
+                                    <ul class="dropdown-menu" id="menu1">
+                                        <li><a href="#"># TODO:Basic</a></li>
+                                        <li><a href="#"># TODO:Picture</a></li>
+                                        <li><a href="#"># TODO:Tags</a></li>
+                                        <li><a href="#"># TODO:Link</a></li>
+                                        <li><a href="#"># TODO:File</a></li>
+                                    </ul>
+                                </li>
+                                <li><a href="#"><%= t("admin.new_admin.action.delete")%></a></li>
+                            </ul>
+                        </div>

app/views/admin/users_new_interface/_filter.html.erb

@@ -0,0 +1,78 @@
+        <div class="subnav">
+            <div class="btn-group pull-right view-mode">
+                <form action="" method="get">
+                <button class="btn <%= "active" if params[:at].blank? %>"><i class="icon-align-justify"></i> <%= t("admin.new_admin.show_mode.index")%></button>
+                <button name="at" value="summary" class="btn <%= "active" if params[:at] == "summary" %>"><i class="icon-th-list"></i> <%= t("admin.new_admin.show_mode.summary")%></button>
+                <button name="at" value="thumbnail" class="btn <%= "active" if params[:at] == "thumbnail" %>"><i class="icon-th-large"></i> <%= t("admin.new_admin.show_mode.thumbnail")%></button>
+            </form>
+            </div>
+            <ul class="nav nav-pills filter">
+                <li class="accordion-group">
+                    <div class="accordion-heading">
+                        <a href="#collapse-status" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("admin.new_admin.table_header.status")%> <b class="web-symbol"></b></a>
+                    </div>
+                </li>
+                <li class="accordion-group">
+                    <div class="accordion-heading">
+                        <a href="#collapse-category" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("admin.new_admin.table_header.category")%> <b class="web-symbol"></b></a>
+                    </div>
+                </li>
+                <li class="accordion-group">
+                    <div class="accordion-heading">
+                        <a href="#collapse-tags" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("admin.new_admin.table_header.tags")%> <b class="web-symbol"></b></a>
+                    </div>
+                </li>
+            </ul>
+            <div class="filters">
+                <div class="accordion-body collapse" id="collapse-status">
+                    <div class="accordion-inner" data-toggle="buttons-checkbox">
+                        <a href="#" class="btn">Full-Time</a>
+                        <a href="#" class="btn">Part-time</a>
+                        <a href="#" class="btn">Adjunct</a>
+                        <a href="#" class="btn">Distinguished</a>
+                    </div>
+                    <div class="filter-clear">
+                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t("admin.new_admin.table_header.clear_filter")%></a>
+                    </div>
+                </div>
+                <div class="accordion-body collapse" id="collapse-category">
+                    <div class="accordion-inner" data-toggle="buttons-checkbox">
+                        <% @sub_roles.each do |sr|%>
+                            <a href="#" class="btn"><%= sr.title%></a>
+                        <% end -%>
+                    </div>
+                    <div class="filter-clear">
+                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t("admin.new_admin.table_header.clear_filter")%></a>
+                    </div>
+                </div>
+                <div class="accordion-body collapse" id="collapse-tags">
+                    <div class="accordion-inner" data-toggle="buttons-checkbox">
+                        <% @sub_role_tags.each do |sr_tag|%>
+                            <a href="#" class="btn"><%= sr_tag[I18n.locale] %></a>
+                        <% end -%>
+                    </div>
+                    <div class="filter-clear">
+                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t("admin.new_admin.table_header.clear_filter")%></a>
+                    </div>
+                </div>
+                <% if params[:at].blank?  #header for index%>
+                    <div class="table-label">
+                        <table class="table main-list">
+                            <thead>
+                                <tr>
+                                    <th class="span1">
+                                        <input type="checkbox">
+                                        <a href class="list-remove"><i class="icon-minus-sign"></i></a>
+                                    </th>
+                                <th id="sort-roles" class="sort span3"><%= t("admin.new_admin.attributes.roles")%><b class="web-symbol"></b></th>
+                                <th id="sort-name" class="sort span1-2 select active"><%= t("admin.new_admin.attributes.name")%><b class="web-symbol"></b></th>
+                                <th id="sort-email" class="sort span2"><%= t("admin.new_admin.attributes.publications")%><b class="web-symbol"></b></th>
+                                <th id="sort-admin" class="sort span2"><%= t("admin.new_admin.attributes.courses")%><b class="web-symbol"></b></th>
+                                <th id="sort-admin" class="sort span2"><%= t("admin.new_admin.attributes.followers")%><b class="web-symbol"></b></th>
+                            </tr>
+                        </thead>
+                    </table>
+                </div>
+                <% end -%>
+            </div>
+        </div>

app/views/admin/users_new_interface/_form.html.erb

@@ -0,0 +1,107 @@
+  <div class="user-info">
+      <div class="user-avatar pull-left">
+          <p class="reflective"></p>
+            <% if @user.avatar? %>
+              <%= image_tag(@user.avatar.thumb.url) %>
+            <% else %>
+              <%= image_tag "person.png" %>
+            <% end %>
+            <%= file_field_tag 'file' %>
+            <%= hidden_field_tag :avatar_cache %>
+      </div>
+      <label>
+    <%= f.check_box :admin %>
+  <span><%= t(:admin) %>：</span>
+  </label>
+  </div>
+
+<%= render :partial=>"infos"%>
+<%= render :partial=>"roles"%>
+
+<% content_for :page_specific_javascript do -%>
+<script>
+        // $('.site-map').masonry({
+        //     itemSelector: '.map-block',
+        //     columnWidth: 450,
+        //     isAnimated: true
+        // });
+  $(document).ready(function(){
+        function subrole_disable_field( triggled_object, switch_value_str){
+          var switch_field = triggled_object.attr("for");
+          $("input.subrole_disable_field[for="+switch_field+"]").val(switch_value_str)
+        }
+
+       function checkSwitch() {
+           $(".groups").each(function() {
+               $(this).find('.form-horizontal > .hide').length < $(this).find('.form-horizontal > div').length ? $(this).removeClass("disabled") : $(this).addClass("disabled")
+           });
+       }
+        function checkMultipleInput() {
+            $(".multipleInput").each(function() {
+                $(this).find('.controls').length==1 ? $(this).addClass("plural") : $(this).removeClass("plural")
+            });
+        }
+        function removeInput(){
+            $(".removeInput").click(function (){
+                $(this).parents(".controls").remove();
+                checkMultipleInput();
+                return false;
+            });
+        }
+        checkSwitch();
+        checkMultipleInput();
+        removeInput();
+        $(".help-block a").click(function (){
+            var $CloneTarget = $(this).parents(".controls").prev(".multipleInput").find('.controls:last');
+            $(this).parents(".controls").prev(".multipleInput").append($CloneTarget.clone());
+            $(this).parents(".controls").prev(".multipleInput").find('.controls:last input').val("");
+            removeInput();
+            checkMultipleInput();
+            return false;
+        })
+        $(".status select").each(function (i) {
+            $(this).change(function () {
+                $(".status option:selected").eq(i).each(function () {
+                    if($(this).attr("value")=="alumna") {
+                        $(this).parents(".status").nextAll(".graduated").removeClass("hide");
+                        $(this).parents(".status").nextAll(".graduated").find("select").removeAttr("disabled");
+                    }else{
+                        $(this).parents(".status").nextAll(".graduated").addClass("hide");
+                        $(this).parents(".status").nextAll(".graduated").find("select").attr({disabled:''});
+                    }
+                });
+            })
+        })
+        $('.onoff').click(function () {
+            if($(this).parents("h4").length==1) {
+                $(this).parents(".map-block").toggleClass("disabled");
+                $(this).parents(".map-block").find(".form-horizontal").toggleClass("hide");
+                if($(this).parents(".map-block").hasClass("disabled")){
+                    $(this).text("OFF");
+                    // console.log("LV1");
+                    // console.log($(this));
+                }else{
+                    $(this).text("ON");
+                    // console.log("LV1");
+                    // console.log($(this));
+                }
+            }
+            if($(this).parents("legend").length==1) {
+                $(this).toggleClass("disabled");
+                $(this).parents("legend").next("div").toggleClass("hide");
+                if($(this).parents("legend").next("div").hasClass("hide")){
+                    $(this).text("OFF");
+                    console.log("LV2");
+                    subrole_disable_field($(this),"true");
+                }else{
+                    $(this).text("ON");
+                    console.log("LV2");
+                    subrole_disable_field($(this),"false");
+                }
+                checkSwitch();
+            }
+           return false;
+        });
+      })
+    </script>
+<% end -%>

app/views/admin/users_new_interface/_index_paginator.html.erb

@@ -0,0 +1,8 @@
+       <div class="form-actions form-fixed pagination-right">
+            <%= link_to(new_admin_users_new_interface_path,:class=> "btn btn-primary pull-right") do%>
+                <i class="icon-plus icon-white"></i><%= t("admin.new_admin.action.add")%>
+            <% end -%>
+            <div class="paginationFixed" id="user_pagination">
+               <%= paginate @users, :params => {:inner => false}%>
+            </div>
+        </div>

app/views/admin/users_new_interface/_info.html.erb

@@ -0,0 +1,12 @@
+<div class="map-block back">
+  <h4><span><%= info.title %></span></h4>
+  <div class="form-horizontal">
+      
+    <% info.attribute_fields.each  do |af|%>
+        <%= af.block_helper(@user,@form_index)%>
+        <% @form_index = @form_index +1 %>
+    <% end %>
+
+
+  </div>
+</div>

app/views/admin/users_new_interface/_infos.html.erb

@@ -0,0 +1,4 @@
+  <!--<span><%#= t(:email) %>：</span> -->
+  <%#= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t(:email)};}", :value => (@user.email.blank? ? t(:email) : @user.email), :class => 'user_mail' %>
+
+<%=render :partial=>"info",:collection=>Info.all%>

app/views/admin/users_new_interface/_js_and_css.html.erb

@@ -0,0 +1,7 @@
+<% content_for :page_specific_css do -%>
+    <%= stylesheet_link_tag "member" %>
+    <%= stylesheet_link_tag "item"%>
+<% end -%>
+<% content_for :page_specific_javascript do -%>
+    <%#= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
+<% end -%>

app/views/admin/users_new_interface/_plugin_summary.html.erb

@@ -0,0 +1,46 @@
+                <div class="item element">
+                    <h3><i class="icons-content"></i>Module Name</h3>
+                    <div class="detail w-a h-a">
+                        <table class="table table-striped">
+                            <thead>
+                                <tr>
+                                    <th>模組</th>
+                                    <th class="span2">數量</th>
+                                </tr>
+                            </thead>
+                        </table>
+                        <div class="detal-list my_scroll">
+                            <div class="scrollbar">
+                                <div class="track">
+                                    <div class="thumb">
+                                        <div class="end"></div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="viewport">
+                                <div class="overview">
+                                    <table class="table table-striped">
+                                        <tbody>
+                                            <tr>
+                                                <td>University</td>
+                                                <td class="span2">2,304</td>
+                                            </tr>
+                                            <tr>
+                                                <td>Master</td>
+                                                <td class="span2">783</td>
+                                            </tr>
+                                            <tr>
+                                                <td>Doctor</td>
+                                                <td class="span2">45</td>
+                                            </tr>
+                                            <tr>
+                                                <td>Staff</td>
+                                                <td class="span2">62</td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>

app/views/admin/users_new_interface/_role.html.erb

@@ -0,0 +1,25 @@
+<div class="groups map-block back">
+  <h4><span><%= role.title %></span></h4>
+  <div class="form-horizontal">
+
+
+
+  <% role.sub_roles.each do |sub_role| %>  
+      <% sub_role_disable = @user.sub_roles.include?(sub_role) ?   false : true    %>
+      <%= hidden_field_tag("user[disable_sub_role][id][#{sub_role.id}]",sub_role_disable,:for=>@form_index,:class=>"subrole_disable_field",:value=>sub_role_disable)%>
+      <%#= hidden_field_tag("[user][new_attribute_values][sub_role][disable][#{sub_role.id}]",sub_role_disable)%>
+      <legend>
+        <button  for=<%=@form_index%> class="onoff pull-right  <%= sub_role_disable ? 'disabled' : '' %> ">ON</button><%= sub_role.title %>
+      </legend>
+    <div class="controls-block <%= sub_role_disable ? 'hide' : '' %>" >
+    <% sub_role.attribute_fields.each  do |af|%>
+        <%= af.block_helper(@user,@form_index)%>
+        <% @form_index = @form_index +1 %>
+    <% end %>
+    </div>
+
+  <% end %>
+
+    
+  </div>
+</div>

app/views/admin/users_new_interface/_roles.html.erb

@@ -0,0 +1 @@
+<%=render :partial=>"role",:collection=>Role.all%>

app/views/admin/users_new_interface/_show_roles.html.erb

@@ -0,0 +1,10 @@
+<div class="roles <%= show_roles.key %>">
+    <div class="label-line">
+        <hr />
+    </div>
+    <table class="table">
+        <tbody>
+                <%= render :partial => 'show_sub_role',:collection=> @user.get_sub_roles_by_role(show_roles)%>
+        </tbody>
+    </table>
+</div>

app/views/admin/users_new_interface/_show_sub_role.html.erb

@@ -0,0 +1,7 @@
+<tr><td class="span1"><%= show_sub_role.title %></td></tr>
+<% show_sub_role.attribute_fields.each do |item|%>
+  <tr>
+      <td class="span1"><%= item.title %></td>
+      <td><%= show_attribute_value(@user.get_attribute_value(item).get_value_by_locale(I18n.locale)) %></td>
+  </tr>
+<% end %>

app/views/admin/users_new_interface/_side_bar.html.erb

@@ -0,0 +1,16 @@
+<%= content_tag :li, :class => active_for_controllers('users_new_interface')  do -%>
+  <%= link_to content_tag(:i, nil, :class => 'icons-member')+ content_tag(:span, t('admin.new_admin.user')), admin_users_new_interface_index_path %>
+    <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('users_new_interface')) do -%>
+      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.all_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_users_new_interface_index_path), :class => active_for_action('users_new_interface', 'index') %>
+      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.add_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_admin_users_new_interface_path), :class => active_for_action('users_new_interface', 'new') %>
+      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_roles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, ), :class => active_for_action('users_new_interfacexx', 'index') %>
+      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_info') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, ), :class => active_for_action('users_new_interfacexx', 'index') %>
+    <% end -%>
+<% end -%>
+
+<%= content_tag :li, :class => active_for_controllers('plugins')  do -%>
+  <%= link_to content_tag(:i, nil, :class => 'icons-pie')+ content_tag(:span, t('admin.plugins')), admin_plugins_path %>
+    <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('plugins')) do -%>
+      <%= content_tag :li, link_to((t('admin.all_plugins') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_plugins_path), :class => active_for_action('users_new_interface', 'index') %>
+    <% end -%>
+<% end -%>

app/views/admin/users_new_interface/_sort_headers.html.erb

@@ -0,0 +1,7 @@
+<%#= render_sort_bar(true, delete_admin_assets_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]),
+ ['title', 'title','span4', 'admin.title'],
+                          ['description', 'description', 'span1-2', 'admin.data'],
+                          ['intro', 'intro', 'span1-2', 'admin.file_type'],
+                          ['intro', 'intro', 'span1-2', 'admin.file_length'],
+                          ['intro', 'intro', 'span1-2', 'admin.description'],
+                          ['intro', 'intro', 'span1-2', 'admin.tags']).html_safe %>

app/views/admin/users_new_interface/_temp_form.html.erb

@@ -0,0 +1,31 @@
+<div id="person" class="clear">
+  <% if @user.avatar? %>
+    <%= image_tag(@user.avatar.thumb.url) %>
+  <% else %>
+    <%= image_tag "person.png" %>
+  <% end %>
+  <%= file_field_tag 'file' %>
+  <%= hidden_field_tag :avatar_cache %>
+  <label>
+  <span><%= t('admin.email') %>：</span>
+  <%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t('admin.email')};}", :value => (@user.email.blank? ? t('admin.email') : @user.email), :class => 'user_mail' %>
+  </label>
+  <label>
+    <%= f.check_box :admin %>
+  <span><%= t('admin.admin') %>：</span>
+  </label>
+  <label>
+  
+  </label>
+  <table>
+    <tr>
+    <%=render :partial=>"temp_profile",:collection=>Info.all%>
+    <tr>
+    <tr> <span><%= t('admin.role') %>：</span> </tr>
+    <tr>
+  <%= render :partial=>"temp_sub_role_from",:collection=>@user.sub_roles %>
+</tr>
+</table>
+</div>
+
+

app/views/admin/users_new_interface/_temp_profile.html.erb

@@ -0,0 +1,7 @@
+<td>
+<%= temp_profile.title %>
+<% temp_profile.attribute_fields.each  do |af|%>
+  <%= af.block_helper(@user,@form_index)%>
+  <% @form_index = @form_index +1 %>
+<% end %>
+</td>

app/views/admin/users_new_interface/_temp_sub_role_from.html.erb

@@ -0,0 +1,10 @@
+<td>
+<%= temp_sub_role_from.title%>
+
+<ul>
+<% temp_sub_role_from.attribute_fields.each do |af| %>
+    <li><%= af.block_helper(@user,@form_index) %></li>
+    <% @form_index = @form_index +1 %>
+<% end %>
+</ul>
+</td>

app/views/admin/users_new_interface/_user_basic.html.erb

@@ -0,0 +1,32 @@
+  <%#= devise_error_messages! %>
+
+  <div class="map-block back">
+                <h4><span><%=t('admin.user_new_interface.sys_basic_form')%></span></h4>
+
+                <div class="form-horizontal">
+                    <div class="control-group">
+                        <%= f.label t('admin.user_new_interface.email'),:class=>"control-label" %><br />
+                        <div class="controls">
+                            <%= f.email_field :email %>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-horizontal">
+                    <div class="control-group">
+                        <%= f.label t('admin.user_new_interface.password'),:class=>"control-label" %>
+                        <div class="controls">
+                            <%= f.password_field :password %>
+                        </div>
+                    </div>
+                  </div>
+
+                  <div class="form-horizontal">
+                    <div class="control-group">
+                      <%= f.label t('admin.user_new_interface.password_confirmation'),:class=>"control-label" %>
+                          <div class="controls">
+                              <%= f.password_field :password_confirmation %>
+                        </div>
+                    </div>
+                </div>
+            </div>

app/views/admin/users_new_interface/_user_for_listing.html.erb

@@ -0,0 +1,22 @@
+                <tr class="with_action">
+                    <td class="span1"><input type="checkbox"></td>
+                    <td class="span3">
+                        <div class="label-group">
+                            <div class="label-td"><!-- 
+                                <span class="label label-teacher"># TODO:Teacher</span>
+                                <span class="label label-student"># TODO:Student</span>
+                                <span class="label label-staff"># TODO:Staff</span> -->
+                            </div>
+                        </div>
+                    </td>
+                    <td class="span1-2">
+                        <%= link_to user_for_listing.name,admin_users_new_interface_path(user_for_listing) %>
+                        <%#= render "deled_quick_edit"%>
+                    </td>
+                    <td class="span2"><%= Random.rand(1000)%></td>
+                    <td class="span2"><%= Random.rand(10)%></td>
+                    <td class="span2">
+                        <%= Random.rand(10000)%>
+                        <p class="gender male"></p>
+                    </td>
+                </tr>

app/views/admin/users_new_interface/_user_for_summary.html.erb

@@ -0,0 +1,30 @@
+                <li class="pull-left">
+                    <table class="rolesTag">
+                        <tbody>
+                            <tr>
+                                <td class="teacher"></td>
+                                <td class="staff"></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <div class="clear user">
+                        <p class="gender male"></p>
+                        <div class="user-avatar pull-left">
+                            <p class="reflective"></p>
+                            <%= show_avatar(user_for_summary) %>
+                        </div>
+                        <div class="user-meta">
+                            <p class="user-name">
+                                <%= link_to user_for_summary.name,admin_users_new_interface_path(user_for_summary)%>
+                            </p>
+                            <div class="user-title">
+                                <span>#TODO 教授兼系主任</span><span>#TODO 大學部校友</span>
+                            </div>
+                            <ul class="user-itemborder clear">
+                                <li class="pull-left"><span>#TODO 258</span>Publications</li>
+                                <li class="pull-left"><span>#TODO 16</span>Courses</li>
+                                <li class="pull-left"><span>#TODO 10,578</span>Followers</li>
+                            </ul>
+                        </div>
+                    </div>
+                </li>

app/views/admin/users_new_interface/_user_for_thumbnail.html.erb

@@ -0,0 +1,22 @@
+                <li class="pull-left">
+                    <table class="rolesTag">
+                        <tbody>
+                            <tr>
+                                <td class="teacher"></td>
+                                <td class="staff"></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <div class="user">
+                        <p class="gender male"></p>
+                        <div class="user-avatar">
+                            <p class="reflective"></p>
+                            <%= show_avatar(user_for_thumbnail) %>
+                        </div>
+                        <div class="user-meta">
+                            <p class="user-name">
+                                <%= link_to user_for_thumbnail.name,admin_users_new_interface_path(user_for_thumbnail)%>
+                            </p>
+                        </div>
+                    </div>
+                </li>

app/views/admin/users_new_interface/_user_role.html.erb

@@ -0,0 +1,16 @@
+                        <div class="roles <%= role_class %>">
+                            <div class="label-line">
+                                <hr />
+                                <span><%= t(i18n)%></span>
+                            </div>
+                            <table class="table">
+                                <tbody>
+                                    <% items.each do |item| %>
+                                        <tr>
+                                            <td class="span1"><%= item[:name] %></td>
+                                            <td><%= show_attribute_value(item[:value]) %></td>
+                                        </tr>
+                                    <% end -%>
+                                </tbody>
+                            </table>
+                        </div>

app/views/admin/users_new_interface/edit.html.erb

@@ -0,0 +1,28 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<% content_for :page_specific_css do -%>
+    <%= stylesheet_link_tag "member" %>
+    <%= stylesheet_link_tag "site-map" %>
+    <%= stylesheet_link_tag "isotope" %>
+<% end -%>
+<% content_for :page_specific_javascript do -%>
+    <%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
+    <%= javascript_include_tag "inc/modal-preview" %>
+    <%= javascript_include_tag "lib/contenteditable" %>
+<% end -%>
+
+
+<%= content_tag :div,:class=>"user-role site-map"  do%>
+
+    <%= form_for @user, :url => admin_users_new_interface_path(@user), :html => { :multipart => true } do |f| %>
+      <%= f.error_messages %>
+      <%= render :partial => 'form', :locals => { :f => f } %>
+      <div class="button_bar">
+        <%= link_back %>
+      <%= link_to t('update'), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
+      </div>
+    <% end -%>
+
+<% end -%>

app/views/admin/users_new_interface/index.html.erb

@@ -0,0 +1,24 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<%= render :partial => "js_and_css"%>
+
+<%= render :partial => "filter"%>
+  <table class="table main-list member-list">
+    <thead>
+      <tr>
+        <th class="span1"></th>
+        <th class="span3"></th>
+        <th class="span1-2"></th>
+        <th class="span2"></th>
+        <th class="span2"></th>
+        <th class="span2"></th>
+      </tr>
+    </thead>
+    <tbody id="tbody_users">
+      <%= render :partial => "user_for_listing",:collection=> @users%>
+    </tbody>
+  </table>
+
+<%= render :partial=> "index_paginator" %>

app/views/admin/users_new_interface/index.js.erb

@@ -0,0 +1,3 @@
+$("#sort_headers").html("<%= j render 'sort_headers' %>");
+$("#tbody_users").html("<%= j render :partial => 'user_for_listing', :collection => @users %>");
+$("#user_pagination").html("<%= j paginate @users, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>");

app/views/admin/users_new_interface/index_summary.html.erb

@@ -0,0 +1,13 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<%= render :partial => "js_and_css"%>
+
+<%= render :partial => "filter"%>
+    <div class="member-abstract">
+        <ul class="clear" id="summary_block_users">
+                <%= render :partial=>"user_for_summary",:collection=> @users%>
+        </ul>
+    </div>
+<%= render :partial=> "index_paginator" %>

app/views/admin/users_new_interface/index_summary.js.erb

@@ -0,0 +1,3 @@
+$("#sort_headers").html("<%= j render 'sort_headers' %>");
+$("#summary_block_users").html("<%= j render :partial => 'user_for_summary', :collection => @users %>");
+$("#user_pagination").html("<%= j paginate @users, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>");

app/views/admin/users_new_interface/index_thumbnail.html.erb

@@ -0,0 +1,12 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<%= render :partial => "js_and_css"%>
+
+<%= render :partial => "filter"%>
+    <div class="member-large">
+        <ul class="clear" id="thumbnail_block_users">
+            <%= render :partial=>"user_for_thumbnail",:collection=> @users%>
+        </div>
+<%= render :partial=> "index_paginator" %>

app/views/admin/users_new_interface/index_thumbnail.js.erb

@@ -0,0 +1,3 @@
+$("#sort_headers").html("<%= j render 'sort_headers' %>");
+$("#thumbnail_block_users").html("<%= j render :partial => 'user_for_thumbnail', :collection => @users %>");
+$("#user_pagination").html("<%= j paginate @users, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>");

app/views/admin/users_new_interface/new.html.erb

@@ -0,0 +1,30 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<% content_for :page_specific_css do -%>
+    <%= stylesheet_link_tag "member" %>
+    <%= stylesheet_link_tag "site-map" %>
+    <%= stylesheet_link_tag "isotope" %>
+<% end -%>
+<% content_for :page_specific_javascript do -%>
+    <%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
+    <%= javascript_include_tag "inc/modal-preview" %>
+    <%= javascript_include_tag "lib/contenteditable" %>
+<% end -%>
+
+
+<%= content_tag :div,:class=>"user-role site-map"  do%>
+    <%= form_for @user, :url =>  admin_users_new_interface_index_path, :html => { :multipart => true },:method => :post do |f| %>
+
+      <%= f.error_messages %>
+      <%= render :partial => 'user_basic', :locals => {:f => f}%>
+      <%= render :partial => 'form', :locals => { :f => f } %>
+      <div class="button_bar">
+        <%#= link_back %>
+      <%#= link_to t('update'), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
+      <%= f.submit%>
+      </div>
+    <% end -%>
+
+<% end -%>

app/views/admin/users_new_interface/plugin_dashbroad.html.erb

@@ -0,0 +1,10 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+            <div class="member-plugin">
+                <% #binding.pry%>
+                <%= render :partial=> 'plugin_summary'%>
+                <%= render :partial=> 'plugin_summary'%>
+                <%= render :partial=> 'plugin_summary'%>
+            </div>

app/views/admin/users_new_interface/show.html.erb

@@ -0,0 +1,63 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<%= render :partial => "js_and_css"%>
+
+        <div id="isotope" class="user-data">
+            <div id="module-nav">
+                <div class="arrow_next pull-right"><i class="icon-chevron-right"></i></div>
+                <div class="arrow_prev pull-left"><i class="icon-chevron-left"></i></div>
+                <div class="module-nav-view">
+                    <ul class="nav nav-pills">
+                        <%= content_tag :li, :class=>(params[:show_plugin_profile].nil? ? "active" : nil) do %>
+                            <%= link_to t("admin.new_admin.users.all_plugin_summary")%>
+                        <% end -%>
+                        <% @plugins.each do |plugin| %>
+                            <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.name ? "active" : nil) do %>
+                                <%= link_to plugin.name, :show_plugin_profile => plugin.name %>
+                            <% end -%>    
+                        <% end -%>
+
+
+                    </ul>
+                </div>
+            </div>
+            <%=render :partial => @right_partial %>
+        </div>
+        <div class="user-info">
+            <div id="brand" class="clear">
+                <p class="gender male"></p>
+                <div class="user-avatar pull-left">
+                    <p class="reflective"></p>
+                   <%= show_avatar(@user) %>
+                </div>
+                <p class="user-name">
+                    <%= @user.name%>
+                </p>
+                <p class="user-mail">
+                    <%= @user.email %>
+                </p>
+                <%= link_to "<i class='icon-pencil'></i>#{t('admin.edit')}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-small"%>
+            </div>
+            <div class="user-roles my_scroll">
+                <div class="scrollbar">
+                    <div class="track">
+                        <div class="thumb">
+                            <div class="end"></div>
+                        </div>
+                    </div>
+                </div>
+                <div class="viewport">
+                    <div class="overview">
+                        <%= render :partial=> "user_role",:locals=>{:role_class=>"basic",:i18n=>"admin.new_admin.users.profile",:items=>@profile_data} %>
+                        <%= render :partial=> "show_roles",:collection=>@user.roles %>
+                        <%# @user.sub_roles.each{|sr| render :partial=> "user_role",:locals=>{:role_class=>sr.key.to_s,:i18n=>"admin.new_admin.users.roles.#{sr.key.to_s}",:items=>sr} }%>
+
+                        <%#= render :partial=> "user_role",:locals=>{:role_class=>"teacher",:i18n=>"admin.new_admin.users.roles.teacher",:items=>@teacher_data} %>
+                        <%#= render :partial=> "user_role",:locals=>{:role_class=>"student",:i18n=>"admin.new_admin.users.roles.student",:items=>@student_data}%>
+                        <%#= render :partial=> "user_role",:locals=>{:role_class=>"staff",:i18n=>"admin.new_admin.users.roles.staff",:items=>@staff_data} %>
+                    </div>
+                <div>
+            </div>
+        </div>

app/views/admin/users_new_interface/temp_edit.html.erb

@@ -0,0 +1,27 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+<% end %>
+
+<% content_for :page_specific_css do -%>
+    <%= stylesheet_link_tag "member" %>
+    <%= stylesheet_link_tag "site-map" %>
+    <%= stylesheet_link_tag "isotope" %>
+<% end -%>
+<% content_for :page_specific_javascript do -%>
+    <%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
+    <%= javascript_include_tag "inc/modal-preview" %>
+    <%= javascript_include_tag "lib/contenteditable" %>
+<% end -%>
+
+<%= content_tag :div,:class=>"user-role site-map"  do%>
+
+    <%= form_for @user, :url => admin_users_new_interface_path(@user), :html => { :multipart => true } do |f| %>
+      <%= f.error_messages %>
+      <%= render :partial => 'temp_form', :locals => { :f => f } %>
+      <div class="button_bar">
+        <%= link_back %>
+      <%= link_to t('update'), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
+      </div>
+    <% end -%>
+
+<% end -%>