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

app/views/admin/ad_banners/_ad_image_update.html.erb

@@ -2,7 +2,7 @@
 			<%= image_tag ad_image.file rescue nil%> 
 			<p>
 				<%= ad_image.display? ? "[#{t('ad.showing')}]" : "[#{t('ad.not_showing')}]" %>
-				<%= "#{ad_image.post_date ||'NeedReset'  }~#{ad_image.unpost_date || 'NeedReset'}" %>
+				<%= "#{ad_image.post_date} ~ #{ad_image.unpost_date}" %>
 			</p>
                   <%if at_least_module_manager || sub_manager?(ad_image.ad_banner) %>
       			<p>

app/views/admin/ad_banners/new_created_node.js.erb

@@ -11,4 +11,8 @@ $("#ad_banner-tab-content").children(".tab-pane").removeClass("active");
 $('#post-body-content').find(".nav.nav-tabs").children('li[id!="new_ad_banner_tab_but"]').last().addClass("active");
 $("#ad_banner-tab-content").children(".tab-pane").last().addClass("active");
 
-
+<% if params[:action] && params[:action] =='create'%>
+  var trigger = $("#ad_banner-tab-content").children(".tab-pane").last().find(".preview_trigger");
+  new_url = trigger.attr("href").replace(/\/admin\/ad_banners\/.*\/preview/gi,"/admin/ad_banners/<%= @ad_banner.id %>/preview");
+  trigger.attr("href",new_url);
+<% end %>

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

@@ -1,13 +1,7 @@
-<% content_for :page_specific_css do %>
-	<%= stylesheet_link_tag "lib/datepicker"  %>
-<% end %>
 <% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "lib/datepicker"  %>
-	<%= javascript_include_tag "lib/date.format.js"  %>
 	<%= javascript_include_tag "inc/modal-preview" %>
 	<%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
 	<%= javascript_include_tag "inc/jquery.imagesloaded.js" %>
-	
 <% end %>
 
 
@@ -16,62 +10,19 @@
 		<!--Widget start-->
 		<div id="sub-wiget">
           <div id="widget-date" class="widget-box">
-              <div class="widget-action clear">
-                  <a href="#" class="action"><i title="<%= t('ad.set_dates') %>" class="icon-exclamation-sign icon-white tip"></i></a>
+              <div class="widget-action clear tip" title="<%= t('ad.set_dates') %>">
+                  <a href="#" class="action"><i class="icon-exclamation-sign icon-white"></i></a>
               </div>
               <h3 class="widget-title"><i class="icons-calendar"></i><%= t(:date_) %></h3>
               <div class="widget-content clear">
-                  <div id="calendarRange">
-                      <div class="input-append">
-                          <span class="showDate"></span><span class="add-on btn">▼</span>
-													<%= f.hidden_field :parse_post_date,:value => @ad_image.post_date.strftime('%Y / %m / %d') %>
-													<%= f.hidden_field :parse_unpost_date,:value => @ad_image.unpost_date.strftime('%Y / %m / %d')%>
-
-                      </div>
-                      <div id="widgetCalendar">
-                      </div>
-                  </div>
-                  <script type="text/javascript">
-                      var today = new Date();
-                      today = today.format('isoDate');
-                      var state = false;
-                      var arr = state ? "▼" : "▲"
-											var start_date = <%= (@ad_image.post_date.nil?? 'today' : "'#{@ad_image.post_date.strftime('%Y / %m / %d')}'").html_safe %>;
-											var end_date = <%= (@ad_image.unpost_date.nil?? 'today' : "'#{@ad_image.unpost_date.strftime('%Y / %m / %d')}'").html_safe %>;
-                      //calendarRange
-                      $('#calendarRange .showDate').html(start_date+" - "+end_date);
-                      $('#calendarRange .calendarInput').val(start_date+" - "+end_date);
-                      $('#calendarRange #widgetCalendar').DatePicker({
-                          flat: true,
-                          format: 'Y / m / d',
-													date: [start_date,end_date],
-                          calendars: 1,
-                          mode: 'range',
-                          starts: 1,
-                          onChange: function(formated) {
-                              $('#calendarRange .showDate').get(0).innerHTML = formated.join(' - ');
-                              $('#calendarRange .calendarInput').val(formated.join(' - '));
-															start_date = formated[0].replace(/\s/g, "");
-															end_date = formated[1].replace(/\s/g, "");
-															$('#ad_image_parse_post_date').val(start_date);
-															$('#ad_image_parse_unpost_date').val(end_date);
-                          }
-                      });
-                      $('#calendarRange .input-append').bind('click', function(){
-                          var arr = state ? "▼" : "▲"
-                          $('#calendarRange .add-on').html(arr);
-                          $('#calendarRange #widgetCalendar').stop().animate({height: state ? 0 : $('#calendarRange #widgetCalendar div.datepicker').get(0).offsetHeight}, 500);
-                          state = !state;
-                          return false;
-                      });
-                      $('#calendarRange #widgetCalendar div.datepicker').css('position', 'absolute');
-                  </script>  
+                <%= f.datetime_picker :post_date, :picker_type => 'date', :label => t(:start_date) %>
+                <%= f.datetime_picker :unpost_date, :picker_type => 'date', :label => t(:end_date) %>
               </div>
           </div>
 		
 			<div id="widget-picture" class="widget-box">
-        <div class="widget-action clear">
-            <a class="action"><i title="<%= t('ad.upload_pictures') %>" class="icon-exclamation-sign icon-white tip"></i></a>
+        <div class="widget-action clear tip" title="<%= t('ad.upload_pictures') %>" >
+            <a class="action"><iclass="icon-exclamation-sign icon-white"></i></a>
         </div>
         <h3 class="widget-title"><i class="icons-pictures"></i><%= t(:picture) %></h3>
         <div class="widget-content clear">         
@@ -98,18 +49,18 @@
 			</div>
 				
 			<div id="widget-type" class="widget-box">
-					<div class="widget-action clear">
-						<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="<%= t('ad.select_fx') %>"></i></a>
+					<div class="widget-action clear tip" title="<%= t('ad.select_fx') %>">
+						<a class="action"><i class="icon-exclamation-sign icon-white"></i></a>
 					</div>
-					<h3 class="widget-title"><i class="icons-star-thin"></i><%= t(:type) %></h3>
+					<h3 class="widget-title"><i class="icons-target"></i><%= t(:type) %></h3>
 					<div class="widget-content clear">
 						<%= f.select :link_open ,AdImage::LINK_OPEN_TYPES%>
 					</div>
 				</div>
 			
 			<div id="widget-time" class="widget-box widget-size-300">
-					<div class="widget-action clear">
-						<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="<%= t('ad.set_range') %>"></i></a>
+					<div class="widget-action clear tip" title="<%= t('ad.set_range') %>">
+						<a class="action"><i class="icon-exclamation-sign icon-white"></i></a>
 					</div>
 					<h3 class="widget-title"><i class="icons-time"></i><%= t(:frequency) %></h3>
 					<div class="widget-content clear">
@@ -118,10 +69,10 @@
 				</div>
 				
 			<div id="widget-link" class="widget-box widget-size-300">
-					<div class="widget-action clear">
-						<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="<%= t('ad.add_link') %>"></i></a>
+					<div class="widget-action clear tip" title="<%= t('ad.add_link') %>">
+						<a class="action"><i class="icon-exclamation-sign icon-white"></i></a>
 					</div>
-					<h3 class="widget-title"><i class="icons-landscape"></i><%= t(:link) %></h3>
+					<h3 class="widget-title"><i class="icons-link"></i><%= t(:link) %></h3>
 					<div class="widget-content clear">
 						<%= f.text_field :out_link ,:class=> 'span3',:placeholder => t('ad.chinese_2') %>
 					</div>
@@ -143,7 +94,7 @@
 							<%= content_tag :div,:class	=> "tab-pane #{active_when_current_locale_eq locale}",:id=>"#{locale}" do%>
 								<div class="title">
 									<%= f.fields_for :title_translations do |f| %>
-										<%= f.text_field locale, :class=>"ad_image-title post-title", :placeholder => t('ad.chinese_1'), :value => (@ad_image.title_translations[locale] rescue nil) %>
+										<%= f.text_field locale, :class=>"ad_image-title post-title", :placeholder => t('ad.chinese_3'), :value => (@ad_image.title_translations[locale] rescue nil) %>
 									<% end %>
 								</div>
 								<br/>

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

@@ -3,7 +3,7 @@
 <% end -%>
 <div id="isotope">
     <div class="item element">
-        <h3><i class="icons-booklet"></i><%= t(:content) %></h3>
+        <h3><i class="icons-book-2"></i><%= t(:content) %></h3>
         <div class="detail w-a h-a">
             <p class="totle"><span><%= t(:all_content) %></span><%= @module_app_contents_total %></p>
             <table class="table table-striped">
@@ -40,7 +40,7 @@
         </div>
     </div>
 <!--     <div class="item element">
-        <h3><i class="icons-member"></i><a href=""><%= t(:member) %></a></h3>
+        <h3><i class="icons-"></i><a href=""><%= t(:member) %></a></h3>
         <div class="detail w-a h-a">
             <p class="totle"><span><%= t(:all_member) %></span>2,217</p>
             <table class="table table-striped">
@@ -111,7 +111,7 @@
         </div>
     </div>
     <div class="item element">
-        <h3><i class="icons-asset"></i><a href=""><%= t(:file_) %></a></a></h3>
+        <h3><i class="icons-"></i><a href=""><%= t(:file_) %></a></a></h3>
         <div class="detail w-a h-a">
             <p class="totle"><span><%= t(:all_file) %></span>3,422</p>
             <table class="table table-striped">
@@ -445,7 +445,7 @@
 
 
     <div class="item element">
-        <h3><i class="icons-plane"></i><%= t(:traffic) %></h3>
+        <h3><i class="icons-airplane"></i><%= t(:traffic) %></h3>
         <div class="detail w-a h-a">
             <p class="totle"><span><%= t(:total_visitors) %></span><%= display_visitors %></p>
             <table class="table table-striped">
@@ -493,7 +493,7 @@
     </div>
 
     <div class="item element">
-        <h3><i class="icons-update"></i><%= t(:recent_update) %></h3>
+        <h3><i class="icons-cycle"></i><%= t(:recent_update) %></h3>
         <div class="detail noStatistics w-b h-a">
             <table class="table table-striped">
                 <thead>

app/views/admin/items/_site_map_left_bar.html.erb

@@ -3,4 +3,4 @@
 </ol>
 <script type="text/javascript">
 	bindTreeDragHandle();
-</script>
+</script>

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

@@ -0,0 +1,12 @@
+<div class="style_switch well">
+  <label><%= t("default_widget.select_widget_style") %></label>
+  <% if @module_app.widgets[@widget_path].blank? %>
+    <%= t("default_widget.no_support_setting")%>
+  <%else%>
+    <%= select('page_part', 'widget_style', @module_app.widgets[@widget_path]) %>
+  <% end %>
+  <% if(@module_app.widget_options && @module_app.widget_options.has_key?(@widget_path)) %>
+    <label><%= t("default_widget.select_widget_ext_option") %></label>
+    <%= render :partial=> "widget_ext_options" %>  
+  <% end %>
+</div>

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

@@ -0,0 +1,34 @@
+<div id="widget_field" class="well clear">
+
+
+  <div class="rows clear">
+        <span class="span4">
+            <label for="widget_field"><%= t "default_widget.fields_order" %></label>
+        </span>
+
+        <span class="span3">
+            <label for="widget_field"><%= t "default_widget.fields_style" %></label>
+        </span>
+        <span class="span5"></span>
+    </div>
+
+<% @module_app.widget_fields.each_with_index do |widget_field, i| %>
+    <div class="rows clear">
+                        <span class="span4">
+                            <%= i+1 %>
+          <%= select_tag "page_part[widget_field][]", widget_field_options(i), :include_blank => true %>
+                        </span>
+                        <span class="span3">
+          <%= select_tag "page_part[widget_field_type][]", widget_fiield_type_options(i), :include_blank => true %> <br />
+                        </span>
+                        <span class="span5"></span>
+                    </div>
+<% end %>
+<br/>
+  <div class="rows clear">
+    <span class="span4"><%= label_tag t("default_widget.widget_data_count") %></span>
+  </div>
+  <div class="rows clear">
+    <span class="span4"><%= text_field_tag :widget_data_count,@part.widget_data_count %></span>
+  </div>
+</div>

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

@@ -0,0 +1,45 @@
+<div class="style_switch well">
+<label><%= t("default_widget.select_widget_style") %></label>
+    <ul class="clear">
+        <li>
+            <label class="radio style_radio">
+              <%= radio_button_tag :widget_style,"typeA",:checked => style_checked_value(@part,"typeA") %>
+              1
+            </label>
+            <span class="style_img"><%=image_tag 'module/default_widgets/style01.png'%></span>
+            <span class="style_description"><%= t("default_widget.caption.typeA") %></span>
+        </li>
+        <li>
+            <label class="radio style_radio">
+              <%= radio_button_tag :widget_style,"typeB_style2",:checked => style_checked_value(@part,"typeB_style2") %>
+              2
+            </label>
+            <span class="style_img"><%=image_tag 'module/default_widgets/style02.png'%></span>
+            <span class="style_description"><%= t("default_widget.caption.typeA") %></span>
+        </li>
+        <li>
+            <label class="radio style_radio">
+              <%= radio_button_tag :widget_style,"typeB_style3",:checked => style_checked_value(@part,"typeB_style3") %>
+              3
+            </label>
+            <span class="style_img"><%=image_tag 'module/default_widgets/style03.png'%></span>
+            <span class="style_description"><%= t("default_widget.caption.typeB_style3") %></span>
+        </li>
+        <li>
+            <label class="radio style_radio">
+              <%= radio_button_tag :widget_style,"typeB_style4",:checked => style_checked_value(@part,"typeB_style4") %>
+              4
+            </label>
+            <span class="style_img"><%=image_tag 'module/default_widgets/style04.png'%></span>
+            <span class="style_description"><%= t("default_widget.caption.typeB_style4") %></span>
+        </li>
+        <li>
+            <label class="radio style_radio">
+              <%= radio_button_tag :widget_style,"typeC",:checked => style_checked_value(@part,"typeC") %>
+              5
+            </label>
+            <span class="style_img"><%=image_tag 'module/default_widgets/style05.png'%></span>
+            <span class="style_description"><%= t("default_widget.caption.typeC") %></span>
+        </li>
+    </ul>
+</div>

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

@@ -1,10 +1,11 @@
+<%= stylesheet_link_tag "admin/default_widget_setting" %>
+
 <%= form_for @part, :url => admin_page_part_path(@part) do |f| %>
 	
 	<% LIST[:page_part_kinds].each do |kind| %>
 		<%= f.radio_button :kind, kind, :class => 'part_kind' %>
 		<%= t(kind, :scope => 'page_part_kinds') %>
 	<% end %>
-	
 	<% LIST[:page_part_kinds].each do |kind| %>
 		<div id='<%= "part_#{kind}" %>' class='part_kind_partial' style="display:<%= kind.eql?(@part.kind) ? 'block' : 'none' %>">
 			<%= render :partial => kind, :locals => {:f => f} %>
@@ -14,4 +15,4 @@
   <p>
     <%= f.submit t(:update_) %> <%= link_back %>
   </p>
-<% end %>
+<% end %>

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

@@ -1,52 +1,39 @@
-<div>
-	<%= f.fields_for :title_translations do |f| %>
-  <% @site_valid_locales.each do |locale| %>
-    <p>
-			<%= f.label :locale, "#{t(:title)} #{I18nVariable.from_locale(locale)}" %>
-			<%= f.text_field locale, :value => (@part.title_translations[locale] rescue nil) %>
-		</p>
-  <% end %>
-<% end %>
-</div>
+    <div>
+          <%= f.fields_for :title_translations do |f| %>
+            <% @site_valid_locales.each do |locale| %>
+        <p>
+                <%= f.label :locale, "#{t(:title)} #{I18nVariable.from_locale(locale)}" %>
+                <%= f.text_field locale, :value => (@part.title_translations[locale] rescue nil),:size=>30 %>
+        </p>
+              <% end %>
+            <% end %>
+    </div>
 
-<span id='module_app_list'>
-	<%= f.select :module_app, options_from_collection_for_select(@module_apps, :id, :title, :selected => @module_app.id), {}, {:rel => admin_page_parts_path} %>
-</span>
+    <p id="module_app_list">
+        <label for="age_part[module_app]"><%= t "default_widget.select_module_app" %></label>
+        <%= f.select :module_app, options_from_collection_for_select(@module_apps, :id, :title, :selected => @module_app.id), {}, {:rel => admin_page_parts_path} %>
+    </p>
+    
+    <p id="widget_list">
+        <label for="age_part[widget_path]"><%= t "default_widget.select_widget_path" %></label>
+        <%= f.select :widget_path, @module_app.widgets.collect{|k,v| [k.humanize, k]}, {}, { :selected => @part.widget_path, :rel => admin_page_parts_path } %>
+    </p>
 
-<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{|k,v| [k.humanize, k]}, {}, { :selected => @part.widget_path, :rel => admin_page_parts_path } %>
-</span>
+    <div id="widget_option">
+        <div id="widget_data_source_category" class="well">
+            <%= render :partial => 'widget_data_source_category' %>
+        </div>
+        <div id="widget_data_source_tag" class="well">
+            <%= render :partial => 'widget_data_source_tag' %>
+        </div>
 
-<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>
+        
+    </div>
 
-:
+    <div id="widget_setting">
+        <%= render :partial => 'widget_setting' ,:locals=>{:f=>f} %>
+    </div>
+<!--     <span id="widget_options">
 
-<span id="widget_category">
-	<%= render 'widget_categories' %>
-</span>
-<%= 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_data_source_category.html.erb

@@ -0,0 +1,12 @@
+  <label><%= t "default_widget.data_source.tag" %></label>
+  <% if @categories %>
+    <fieldset>
+        <%= nil_radio_button(@part,:category) %>
+        <%= content_tag_for(:label, @categories,:class=>"radio inline") do |category|%>
+          <%= radio_button("page_part", "category", category.id, :checked => category_checked_value(@part,category.id) )%>
+          <%= category.title%>
+        <% end %>
+    </fieldset>
+  <% else %>
+    <%= t("default_widget.no_support_setting")%>
+  <% end %>

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

@@ -0,0 +1,12 @@
+<label><%= t "default_widget.data_source.category" %></label>
+  <% if @categories %>
+    <fieldset>
+        <%= nil_radio_button(@part,:tag) %>
+        <%= content_tag_for(:label, @tags,:class=>"radio inline") do |tag|%>
+          <%= radio_button("page_part", "tag", tag.id, :checked => tag_checked_value(@part,tag.id) )%>
+          <%= tag[I18n.locale]%>
+        <% end %>
+    </fieldset>
+  <% else %>
+    <%= t("default_widget.no_support_setting")%>
+  <% end %>

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

@@ -0,0 +1,13 @@
+      <% @module_app.widget_options[@widget_path].each do |key,options| %>
+      <%= label_tag(t(@module_app.widget_options_fields_i18n[@widget_path][key]))%>
+        <% case  options%>
+          <% when  Hash%>
+            <%= select_tag "page_part[widget_options][#{key}]", options_from_collection_for_select(eval(options["query"]), options["value"], options["label"].to_s, :selected => (@part.widget_options[key] rescue nil)) %>
+           <% else%>
+            <%= select_tag "page_part[widget_options][#{key}]", options_for_select(options,(@part.widget_options[key] rescue nil)) %>
+            <!-- (@part[:widget_field][i][0] if (@part && !@part[:widget_field].blank? && !@part[:widget_field][i].blank?)) ) --> 
+        <% end %>
+        
+  
+      <% end %>
+

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

@@ -1,12 +0,0 @@
-	
-	<% 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/_widget_setting.html.erb

@@ -0,0 +1,10 @@
+<% if  show_default_widget_setting_panel %>
+    <div id="default_widget">
+        <%= render :partial => 'default_widget_style_panel',:locals=>{:f=>f} %>
+        <%= render :partial => 'default_widget_setting' %>
+    </div>  
+<% elsif show_custom_widget_setting_panel %> 
+    <div id="custom_widget">
+        <%= render :partial => 'custom_widget_setting' %>
+    </div>  
+<% end %>

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

@@ -1 +1,7 @@
-$('#widget_style_list select').html("<%= j options_for_select(@module_app.widgets[params[:id]]) %>")
+
+  <% if  show_default_widget_setting_panel %>
+    $('#widget_setting').html("<%= j render :partial => 'default_widget_style_panel' %>");
+    $('#widget_setting').append("<%= j render :partial => 'default_widget_setting' %>");
+  <% elsif show_custom_widget_setting_panel %>
+    $('#widget_setting').html("<%= j render :partial => 'custom_widget_setting' %>");
+  <% end %>

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

@@ -1,5 +1,13 @@
-$('#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' %>");
+$('#widget_list select').html("<%= j options_for_select(@module_app.widgets.collect{|k,v| k},@part.widget_path) %>");
+$("#widget_data_source_category").html("<%= j render :partial => 'widget_data_source_category' %>");
+$("#widget_data_source_tag").html("<%= j render :partial => 'widget_data_source_tag' %>");
+
+<% if  !@part.widget_path.blank? %>
+  <% if  show_default_widget_setting_panel %>
+    $('#widget_setting').html("<%= j render :partial => 'default_widget_style_panel' %>");
+    $('#widget_setting').append("<%= j render :partial => 'default_widget_setting' %>");
+  <% elsif show_custom_widget_setting_panel %>
+    $('#widget_setting').html("<%= j render :partial => 'custom_widget_setting' %>");
+  <% end %>
+<% end %>
+

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

@@ -3,8 +3,8 @@
 		<%= 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 />
+			<%= select_tag "page[frontend_field][]",widget_field_options(i,@item) , :include_blank => true %>
+			<%= select_tag "page[frontend_field_type][]", widget_fiield_type_options(i,@item), :include_blank => true %> <br />
 		<% end %>			
 	<% end %>	
 	

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

@@ -1,5 +1,5 @@
 <% 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-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 

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

@@ -1,112 +1,122 @@
 <% # encoding: utf-8 %>
 
 <% content_for :side_bar do %>
-	<%= 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'} %>
+  <%= 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">
-<%= form_for @site, :url => admin_site_path(@site), :html => {:class => "clear"} do |f| %>
-	<div id="post-body">
-		<div id="post-body-content" class="clear">
-			<ul class="nav nav-tabs">
-				<% @site_valid_locales.each do |locale|%>
-				<%#= raise @site_valid_locales.inspect %>
-					<%= content_tag :li, link_to(I18nVariable.from_locale(locale), ".#{locale}", :data => {:toggle => "tab"}), :class => (active_when_current_locale_eq locale)  %>
-				<% end %>
-			</ul>
-			<div class="tab-content form-horizontal">
-				<div class="control-group" style="margin-bottom: 0;">
-					<div class="controls">
-						<label class="checkbox">
-							<%= f.check_box :title_always_on %> <%= t :always_display_title %>
-		            	</label>
-					</div>
-				</div>
-				<% @site_valid_locales.each do |locale|%>
-					<%= content_tag :div, :class	=> "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
-						<div class="control-group">
-							<label class="control-label"><%= t 'site.title' %></label>
-							<div class="controls">
-								<%= f.fields_for :title_translations do |f| %>
-									<%= f.text_field locale, :class => "input-xxlarge", :value => (@site.title_translations[locale] rescue nil) %>
-								<% end %>
-								<p class="help-block"><%= (t 'site.title_help').html_safe %></p>
-							</div>
-						</div>
-					<% end %>
-				<% end %>
-				<div class="control-group">
-					<label class="control-label"><%= t 'site.search' %></label>
-						<div class="controls">
-							<%= text_field_tag 'site[search][domains]',(@site.search["domains"] rescue nil), {:class => "input-xxlarge" ,:placeholder => t("search.domains") }%>
-							<%= text_field_tag 'site[search][sitesearch]',(@site.search["sitesearch"]  rescue nil),{ :class => "input-xxlarge"  ,:placeholder => t("search.sitesearch") }%>
-							<p class="help-block"><%= (t 'site.search_help').html_safe %></p>
-					</div>
-				</div>
+  <%= form_for @site, :url => admin_site_path(@site), :html => {:class => "clear"} do |f| %>
+    <div id="post-body">
+      <div id="post-body-content" class="clear">
+        <ul class="nav nav-tabs">
+          <% @site_valid_locales.each do |locale|%>
+            <%#= raise @site_valid_locales.inspect %>
+            <%= content_tag :li, link_to(I18nVariable.from_locale(locale), ".#{locale}", :data => {:toggle => "tab"}), :class => (active_when_current_locale_eq locale)  %>
+          <% end %>
+        </ul>
+        <div class="tab-content form-horizontal">
+          <div class="control-group" style="margin-bottom: 0;">
+            <div class="controls">
+              <label class="checkbox">
+                <%= f.check_box :title_always_on %> <%= t :always_display_title %>
+              </label>
+            </div>
+          </div>
+          <% @site_valid_locales.each do |locale|%>
+            <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
+              <div class="control-group">
+                <label class="control-label"><%= t 'site.title' %></label>
+                <div class="controls">
+                  <%= f.fields_for :title_translations do |f| %>
+                    <%= f.text_field locale, :class => "input-xxlarge", :value => (@site.title_translations[locale] rescue nil) %>
+                  <% end %>
+                  <p class="help-block"><%= (t 'site.title_help').html_safe %></p>
+                </div>
+              </div>
+            <% end %>
+          <% end %>
+          <div class="control-group">
+            <label class="control-label"><%= t 'site.search' %></label>
+            <div class="controls">
+              <%= text_field_tag 'site[search][domains]',(@site.search["domains"] rescue nil), {:class => "input-xxlarge" ,:placeholder => t("search.domains") }%>
+              <%= text_field_tag 'site[search][sitesearch]',(@site.search["sitesearch"]  rescue nil),{ :class => "input-xxlarge"  ,:placeholder => t("search.sitesearch") }%>
+              <p class="help-block"><%= (t 'site.search_help').html_safe %></p>
+            </div>
+          </div>
 
-				<% @site_valid_locales.each do |locale|%>
-					<%= content_tag :div, :class	=> "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
-						<div class="control-group">
-							<label class="control-label"><%= t 'site.keywords' %></label>
-							<div class="controls">
-								<%= f.fields_for :keywords do |f| %>
-									<%= f.text_area locale, :class => "input-xxlarge textarea-height-s", :value => (@site.keywords(locale) rescue nil) %>
-								<% end %>
-								<p class="help-block"><%= (t 'site.keywords_help').html_safe %></p>
-							</div>
-						</div>
-						<div class="control-group">
-							<label class="control-label"><%= t 'site.description' %></label>
-							<div class="controls">
-								<%= f.fields_for :description do |f| %>
-									<%= f.text_area locale, :class => "input-xxlarge textarea-height-s", :value => (@site.description(locale) rescue nil) %>
-								<% end %>
-								<p class="help-block"><%= (t 'site.description_help').html_safe %></p>
-							</div>
-						</div>
-						<div class="control-group">
-							<label class="control-label"><%= t 'site.footer' %></label>
-							<div class="controls">
-								<%= f.fields_for :footer_translations do |f| %>
-									<%= f.text_area locale, :class => "tinymce_textarea input-xxlarge", :value => (@site.footer_translations[locale] rescue nil) %>
-								<% end %>
-								<p class="help-block"><%= (t 'site.footer_help').html_safe %></p>
-							</div>
-						</div>
-						<div class="control-group">
-							<label class="control-label"><%= t 'site.sub_menu' %></label>
-							<div class="controls">
-								<%= f.fields_for :sub_menu_translations do |f| %>
-									<%= f.text_area locale, :class => "tinymce_textarea input-xxlarge", :value => (@site.sub_menu_translations[locale] rescue nil) %>
-								<% 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>
-		</div>
-	</div>
-	<div class="form-actions">
-		<%= f.submit t("submit"), :class => "btn btn-primary" %>
-		<%= f.submit t("cancel"), :class => "btn ", :type => 'reset' %>
-	</div>
-<% end %>
+          <% @site_valid_locales.each do |locale|%>
+            <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
+              <div class="control-group">
+                <label class="control-label"><%= t 'site.keywords' %></label>
+                <div class="controls">
+                  <%= f.fields_for :keywords do |f| %>
+                    <%= f.text_area locale, :class => "input-xxlarge textarea-height-s", :value => (@site.keywords(locale) rescue nil) %>
+                  <% end %>
+                  <p class="help-block"><%= (t 'site.keywords_help').html_safe %></p>
+                </div>
+              </div>
+              <div class="control-group">
+                <label class="control-label"><%= t 'site.description' %></label>
+                <div class="controls">
+                  <%= f.fields_for :description do |f| %>
+                    <%= f.text_area locale, :class => "input-xxlarge textarea-height-s", :value => (@site.description(locale) rescue nil) %>
+                  <% end %>
+                  <p class="help-block"><%= (t 'site.description_help').html_safe %></p>
+                </div>
+              </div>
+              <div class="control-group">
+                <label class="control-label"><%= t 'site.header' %></label>
+                <div class="controls">
+                  <%= f.fields_for :sub_menu_translations do |f| %>
+                    <%= f.text_area locale, :class => "tinymce_textarea input-xxlarge", :value => (@site.sub_menu_translations[locale] rescue nil) %>
+                  <% end %>
+                </div>
+              </div>
+              <div class="control-group">
+                <label class="control-label"><%= t 'site.footer' %></label>
+                <div class="controls">
+                  <%= f.fields_for :footer_translations do |f| %>
+                    <%= f.text_area locale, :class => "tinymce_textarea input-xxlarge", :value => (@site.footer_translations[locale] rescue nil) %>
+                  <% end %>
+                  <p class="help-block"><%= (t 'site.footer_help').html_safe %></p>
+                </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 %>
+                    <label class="checkbox">
+                    <%= check_box_tag 'site[remove_default_image]' %>
+                    <%= t('delete') %>
+                    </label>
+                  <% end %>
+                </div>
+              </div>
+            <% end %>
+          <% end %>
+          <div class="control-group" style="margin-bottom: 0;">
+            <label class="control-label"><%= t 'site.mobile_version' %></label>
+            <div class="controls">
+              <label class="checkbox">
+                <%= f.check_box :mobile_on %>
+              </label>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="form-actions">
+      <%= f.submit t("submit"), :class => "btn btn-primary" %>
+      <%= f.submit t("cancel"), :class => "btn ", :type => 'reset' %>
+    </div>
+  <% end %>
 </div>

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

@@ -32,7 +32,7 @@
                         <a href="#" class="btn">Distinguished</a>
                     </div>
                     <div class="filter-clear">
-                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t(:clear)%></a>
+                        <a href="#" class="btn"><i class="icons-cycle"></i><%= t(:clear)%></a>
                     </div>
                 </div>
                 <div class="accordion-body collapse" id="collapse-category">
@@ -42,7 +42,7 @@
                         <% end -%>
                     </div>
                     <div class="filter-clear">
-                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t(:clear)%></a>
+                        <a href="#" class="btn"><i class="icons-cycle"></i><%= t(:clear)%></a>
                     </div>
                 </div>
                 <div class="accordion-body collapse" id="collapse-tags">
@@ -52,7 +52,7 @@
                         <% end -%>
                     </div>
                     <div class="filter-clear">
-                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t(:clear)%></a>
+                        <a href="#" class="btn"><i class="icons-cycle"></i><%= t(:clear)%></a>
                     </div>
                 </div>
                 <% if params[:at].blank?  #header for index%>

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

@@ -1,5 +1,5 @@
                 <div class="item element">
-                    <h3><i class="icons-booklet"></i>Module Name</h3>
+                    <h3><i class="icons-book-2"></i>Module Name</h3>
                     <div class="detail w-a h-a">
                         <table class="table table-striped">
                             <thead>

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

@@ -1,5 +1,5 @@
 <%= content_tag :li, :class => active_for_controllers('users_new_interface')  do -%>
-  <%= link_to content_tag(:i, nil, :class => 'icons-member')+ content_tag(:span, t(:member)), admin_users_new_interface_index_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-user')+ content_tag(:span, t(:member)), 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(:all_member) + 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(:add_member) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_admin_users_new_interface_path), :class => active_for_action('users_new_interface', 'new') if (is_admin? rescue nil) %>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <% content_for :page_specific_css do -%>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <%= render :partial => "js_and_css"%>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <%= render :partial => "js_and_css"%>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <%= render :partial => "js_and_css"%>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <% content_for :page_specific_css do -%>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
             <div class="member-plugin">

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <%= render :partial => "js_and_css"%>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <% content_for :page_specific_css do -%>

app/views/default_widget/typeA.html.erb

@@ -0,0 +1,19 @@
+<%= content_tag :div,:class=>@tag_class do%>
+  <div class="default_widget_type_A">
+    <table class="default_widget_tb" border="0" cellpadding="0" cellspacing="0" >
+    <thead>
+      <tr>
+        <% @fields.each do |field|%>
+          <th><%= content_tag(:span,get_field_header(field[0]),:class=>field[1])%></th>
+        <% end %>
+      </tr>
+    </thead>
+      <% @data.each do |row_data| %>
+        <tr>
+          <% @fields.each do |field|%>
+              <td><%= content_tag(:span,link_to_field(row_data,field[0]),:class=>field[1])%></td>
+          <% end %>
+        </tr>
+      <% end %>
+    </table>
+  <% end %>

app/views/default_widget/typeB.html.erb

@@ -0,0 +1,17 @@
+<%= content_tag :div,:class=>@tag_class do%>
+  <ul class="default_widget_list">
+    <% @data.each do |row_data| %>
+      <%= content_tag(:li) do %>
+        <div class="img app-pic">
+          <%= image_tag row_data.send(@widget_image_field)%>
+        </div>
+        <div class="wrap">
+          <% @fields.each do |field|%>
+              <%= content_tag(:span,link_to_field(row_data,field[0]),:class=>field[1])%>
+          <% end %>
+        </div>
+      <% end %>
+    <% end %>
+  </ul>
+  <div class="more">more</div>
+<% end %>

app/views/default_widget/typeC.html.erb

@@ -0,0 +1,15 @@
+<%= content_tag :div,:class=>@tag_class do%>
+  <div class="img app-pic">
+    <%= image_tag @data.first.send(@widget_image_field)%>
+  </div>
+  <ul class="default_widget_list">
+    <% @data.each do |row_data| %>
+      <%= content_tag(:li) do %>
+        <% @fields.each do |field|%>
+            <%= content_tag(:span,link_to_field(row_data,field[0]),:class=>field[1])%>
+        <% end %>
+      <% end %>
+    <% end %>
+  </ul>
+  <div class="more">more</div>
+<% end %>

app/views/desktop/books.html.erb

@@ -13,8 +13,8 @@
 			<div id="panel_l" class="ph">
 				<div class="s_menu sm_v" content-type="menu">
 					<ul id='setting_left_nav'>
-						<li><a href="<%= desktop_publications_books_list_path %>" callback-method="harry"class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
-						<li><a href="<%= desktop_publications_books_add_path %>" callback-method="addbook"class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
+						<li><a href="<%= desktop_publications_books_list_path %>" callback-method="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
+						<li><a href="<%= desktop_publications_books_add_path %>" callback-method="addbook" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
 						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Books</a></li>
 						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
 						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags &amp; Keywords</a></li>

app/views/desktop/co_author_relations/_form.html.erb

@@ -1,5 +0,0 @@
-<%= f.text_field :relation, class: "ini_input" %>
-<%= f.submit "Save", class: "ini_input hp hh2 thmtxt thmc2", style: "margin-left: 10px;" %>
-<% if not @co_author_relation.new_record? %>
-  <%= submit_tag "Cancel", :type => "button", class: "bt-cancel-type ini_input hp hh2 thmtxt" %>
-<% end %>

app/views/desktop/co_author_relations/_new.html.erb

@@ -1,3 +0,0 @@
-<%= form_for(@co_author_relation, url: desktop_co_author_relations_path, html:{"form-type"=>"ajax_form", "callback-method"=>"coauthorRelationForm"} ) do |f| %>
-  <%= render partial: 'desktop/co_author_relations/form' , locals: {:f => f}%>
-<% end %>

app/views/desktop/co_author_relations/_show_form.html.erb

@@ -1,17 +0,0 @@
-  <% @co_author_relations.each_with_index do |co_author_relation,i| %>
-  <% if ( i % 6 ) == 0 %>
-  <div class="s_grid_con s_form">
-          <ul>
-            <% end %>
-            <li class="s_grid_row">
-    			<div class="form_space"><%= co_author_relation.relation %></div>
-			    <div class="list_item_function">
-			    	<%= link_to 'Edit', edit_desktop_co_author_relation_path(co_author_relation), :class => "bt-edit-type admbg2 admtxt" %>
-			    	<%= link_to 'Destroy', desktop_co_author_relation_path(co_author_relation), confirm: 'Are you sure?', method: :delete, :class=>"bt-delete admbg2 admtxt" %>
-			    </div>
-			    </li>
-            <% if ( i % 6 ) == 5 %>
-          </ul>
-          </div>
-        <% end %>
-  <% end %>

app/views/desktop/co_author_relations/edit.html.erb

@@ -1,3 +0,0 @@
-<%= form_for(@co_author_relation, url: desktop_co_author_relation_path(@co_author_relation), html:{"form-type"=>"ajax_form", "callback-method"=>"coauthorRelationEditForm"} ) do |f| %>
-  <%= render partial: 'desktop/co_author_relations/form' , locals: {:f => f}%>
-<% end %>

app/views/desktop/co_author_relations/index.html.erb

@@ -1,22 +0,0 @@
-<div class="toolbar hh2">
-  <div class="fn_g hp">
-    <div class="hh2 sdm">
-      <div class="sdm_t hp hh2 thmc2 thmtxt">Create</div>
-      <div class="admbg sdm_o">
-        <ul>
-          <li class="vp hp s_form" style="width:282px;"><%= render 'new' %></li>
-        </ul>
-      </div>
-    </div>
-    <%= submit_tag "Back", :type => "button", class: "bt-cancel fn_btn ini_input hp hh2 thmtxt" %>
-  </div>
-</div>
-
-<div id="co_author_relation_table" class="tinycanvas vp">
-  <div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
-  <div class="viewport">
-    <div class="overview">
-      <%= render :partial => 'show_form'%>
-    </div>
-  </div>
-</div>

app/views/desktop/co_authors/_form.html.erb

@@ -1,28 +0,0 @@
-<div class="toolbar hh2">
-  <div class="fn_g hp">
-    <%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn ini_input hp hh2 thmc2 thmtxt" %>
-    <%= submit_tag "Cancel", :type => "button", class: "bt-cancel fn_btn ini_input hp hh2 thmtxt" %>
-  </div>
-</div>
-<div id="new_co_author" class="s_grid_con s_form vp">
-  <ul>
-  <li class="s_grid_row">
-    <%= f.label :co_author, class: "s_grid s_grid_2" %>
-    <%= f.text_field :co_author, class: "s_grid s_grid_4" %>
-  </li>
-  <li class="s_grid_row">
-    <%= f.label :email, class: "s_grid s_grid_2"%>
-    <%= f.text_field :email, class: "s_grid s_grid_4" %>
-  </li>
-  <li class="s_grid_row">
-    <%= f.label :type, class: "s_grid s_grid_2"%>
-    <select name="co_author[co_author_relations_id]" id="" class="s_grid s_grid_4">
-      <%= options_for_select(
-        @co_author_relations.map do |relation|
-          [relation.relation, relation.id]
-        end
-      )%>
-    </select>
-  </li>
-</ul>
-</div>

app/views/desktop/co_authors/edit.html.erb

@@ -1,3 +0,0 @@
-<%= form_for @co_author, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"coAuthorformCallback"} , url: desktop_co_author_path(@co_author) do |f| %>
-  <%= render partial: 'desktop/co_authors/form', locals: {:f => f} %>
-<% end %>

app/views/desktop/co_authors/index.html.erb

@@ -1,34 +0,0 @@
-<div class="toolbar hh2">
-  <div class="fn_g hp">
-  <%= link_to "New Co-Author", new_desktop_co_author_path, :class=>"bt-co-author fn_btn hp hh2 thmc2 thmtxt" %>
-  <%= link_to "New Type",  desktop_co_author_relations_path, :class=>"bt-new-type fn_btn hp hh2 thmc2 thmtxt" %>
-  </div>
-</div>
-<div id="co_author" class="tinycanvas vp">
-  <div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
-  <div class="viewport">
-    <div class="overview">
-      <% @co_authors.each_with_index do |co_author,i| %>
-        <% if ( i % 4 ) == 0 %>
-          <div class="g_col">
-          <ul>
-            <% end %>
-            <li class="list_t_item">
-              <ul class="info">
-                <li><div class="name"><%= co_author.co_author %></div></li>
-                <li><div class="email"><i class="icon-envelope"></i> <%= co_author.email %></div></li>
-                <li><div class="relations"><i class="icon-user"></i> <%= @co_author_relations.find(co_author.co_author_relations_id).relation unless co_author.co_author_relations_id.nil?%></div></li>
-              </ul>
-              <div class="list_item_function">
-                <%= link_to 'Edit', edit_desktop_co_author_path(co_author), :class => "bt-edit admbg2 admtxt" %>
-                <%= link_to 'Destroy', desktop_co_author_path(co_author), method: :delete, confirm: 'Are you sure?', :class=>"bt-delete admbg2 admtxt"  %>
-              </div>
-            </li>
-            <% if ( i % 4 ) == 3 %>
-          </ul>
-          </div>
-        <% end %>
-      <% end %>
-    </div>
-  </div>
-</div>

app/views/desktop/co_authors/new.html.erb

@@ -1,3 +0,0 @@
-<%= form_for @co_author, html: { multipart: true ,"form-type"=>"ajax_form", "callback-method"=>"coAuthorformCallback"} , url: desktop_co_authors_path do |f| %>
-  <%= render partial: 'desktop/co_authors/form', locals: {:f => f} %>
-<% end %>

app/views/desktop/index.html.erb

@@ -1,105 +1,105 @@
 <div id="side">
-	<div id="rwidget" class="wh3 thmc4">
-		<ul class="docklist">
-			<li class="d_cate"><a callback-method='initializeDesktop' href="desktop/" class="widget_fn wh3 hh3" id='d_desktop' onclick="return false;"><span class="widget_icon"><img src="" alt="Home" id="home_icon" width="30" height="30"/></span></a>
-				<ul class="dock_child hh3 thmc4" style="width: 180px;">
-					<li class="dock_item"><a callback-method='initializeAppSearch' href="<%= desktop_app_manager_path %>" class="widget_fn wh3 hh3" id="d_app_manager" onclick="return false;"><span class="widget_icon"><img src="" alt="App Manager" id="app_manager_icon" width="30" height="30"/></span></a></li>
-					<li class="dock_item"><a callback-method='initializeSectionsManager' href="<%= desktop_allsections_path %>" class="widget_fn wh3 hh3" id="d_sections" onclick="return false;"><span class="widget_icon"><img src="" alt="All Sections" id="sections_icon" width="30" height="30"/></span></a></li>
-					<li class="dock_item"><a callback-method='initializeSettings' href="<%= desktop_settings_path %>" custom-load="settings" class="widget_fn wh3 hh3" id="d_settings" onclick="return false;"><span class="widget_icon"><img src="" alt="Settings" id="settings_icon" width="30" height="30"/></span></a></li>
-				</ul>
-			</li>
-			<li class="d_cate"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_publication' onclick="return false;"><span class="widget_icon"><img src="" alt="Publication" id="publication_icon" width="30" height="30"/></span></a>
-				<ul class="dock_child hh3 thmc4" style="width: 180px;">
-					
-					<li class="dock_item"><a callback-method='initializeJournalPapers' href="<%= desktop_publications_journal_p_path %>" class="widget_fn wh3 hh3" id='d_journal_p' custom-load="journal" onclick="return false;"><span class="widget_icon"><img src="" alt="Journal Papers" id="journal_p_icon" width="30" height="30"/></span></a></li>
+  <div id="rwidget" class="wh3 thmc4">
+    <ul class="docklist">
+      <li class="d_cate"><a callback-method='initializeDesktop' href="desktop/" class="widget_fn wh3 hh3" id='d_desktop' onclick="return false;"><span class="widget_icon"><img src="" alt="Home" id="home_icon" width="30" height="30"/></span></a>
+      <ul class="dock_child hh3 thmc4" style="width: 180px;">
+        <li class="dock_item"><a callback-method='initializeAppSearch' href="<%= desktop_app_manager_path %>" class="widget_fn wh3 hh3" id="d_app_manager" onclick="return false;"><span class="widget_icon"><img src="" alt="App Manager" id="app_manager_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='initializeSectionsManager' href="<%= desktop_allsections_path %>" class="widget_fn wh3 hh3" id="d_sections" onclick="return false;"><span class="widget_icon"><img src="" alt="All Sections" id="sections_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='initializeSettings' href="<%= desktop_settings_path %>" custom-load="settings" class="widget_fn wh3 hh3" id="d_settings" onclick="return false;"><span class="widget_icon"><img src="" alt="Settings" id="settings_icon" width="30" height="30"/></span></a></li>
+      </ul>
+      </li>
+      <li class="d_cate"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_publication' onclick="return false;"><span class="widget_icon"><img src="" alt="Publication" id="publication_icon" width="30" height="30"/></span></a>
+      <ul class="dock_child hh3 thmc4" style="width: 180px;">
 
-					<li class="dock_item"><a callback-method='initializeSeminar' href="<%= desktop_publications_seminar_p_path %>" class="widget_fn wh3 hh3" id='d_seminar_p' onclick="return false;"><span class="widget_icon"><img src="" alt="Seminar Papers" id="seminar_p_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='initializeJournalPapers' href="<%= panel_personal_journal_desktop_journal_p_path %>" class="widget_fn wh3 hh3" id='d_journal_p' custom-load="journal" onclick="return false;"><span class="widget_icon"><img src="" alt="Journal Papers" id="journal_p_icon" width="30" height="30"/></span></a></li>
 
-					<li class="dock_item"><a callback-method='initializeContact' href="<%= desktop_publications_books_path %>" class="widget_fn wh3 hh3" id='d_books' onclick="return false;"><span class="widget_icon"><img src="" alt="Books" id="books_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='initializeSeminar' href="<%= desktop_publications_seminar_p_path %>" class="widget_fn wh3 hh3" id='d_seminar_p' custom-load="seminar" onclick="return false;"><span class="widget_icon"><img src="" alt="Seminar Papers" id="seminar_p_icon" width="30" height="30"/></span></a></li>
 
-					<li class="dock_item"><a callback-method='initializeContact' href="<%= desktop_publications_books_path %>" class="widget_fn wh3 hh3" id='d_contacts' onclick="return false;"><span class="widget_icon"><img src="" alt="Books" id="books_icon" width="30" height="30"/></span></a></li>
-				</ul>
-			</li>
-			<li class="d_cate"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_research' onclick="return false;"><span class="widget_icon"><img src="" alt="Research" id="research_icon" width="30" height="30"/></span></a>
-				<ul class="dock_child hh3 thmc4" style="width: 240px;">
-					<li class="dock_item"><a callback-method='initializeResearchDomain' href="<%= desktop_research_research_d_path %>" class="widget_fn wh3 hh3" id='d_research_d' onclick="return false;"><span class="widget_icon"><img src="" alt="Research Domain" id="research_d_icon" width="30" height="30"/></span></a></li>
-					<li class="dock_item"><a callback-method='initializeResearchProject' href="<%= desktop_research_research_p_path %>" class="widget_fn wh3 hh3" id='d_research_p' onclick="return false;"><span class="widget_icon"><img src="" alt="Research Project" id="research_p_icon" width="30" height="30"/></span></a></li>
-					<li class="dock_item"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_patents' onclick="return false;"><span class="widget_icon"><img src="" alt="Patents" id="patents_icon" width="30" height="30"/></span></a></li>
-					<li class="dock_item"><a callback-method='' href="labs" class="widget_fn wh3 hh3" id='d_labs' onclick="return false;"><span class="widget_icon"><img src="" alt="Labs" id="labs_icon" width="30" height="30"/></span></a></li>
-				</ul>
-			</li>
-			<li class="d_cate"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_experience' onclick="return false;"><span class="widget_icon"><img src="" alt="Experience" id="experience_icon" width="30" height="30"/></span></a>
-				<ul class="dock_child hh3 thmc4" style="width: 300px;">
-					<li class="dock_item"><a callback-method='' href="working" class="widget_fn wh3 hh3" id='d_working' onclick="return false;"><span class="widget_icon"><img src="" alt="Working" id="working_icon" width="30" height="30"/></span></a></li>
-					<li class="dock_item"><a callback-method='' href="education" class="widget_fn wh3 hh3" id='d_education' onclick="return false;"><span class="widget_icon"><img src="" alt="Education" id="education_icon" width="30" height="30"/></span></a></li>
-					<li class="dock_item"><a callback-method='' href="honors" class="widget_fn wh3 hh3" id='d_honors' onclick="return false;"><span class="widget_icon"><img src="" alt="Honors" id="honors_icon" width="30" height="30"/></span></a></li>
-					<li class="dock_item"><a callback-method='' href="activities" class="widget_fn wh3 hh3" id='d_activities' onclick="return false;"><span class="widget_icon"><img src="" alt="Activities" id="activities_icon" width="30" height="30"/></span></a></li>
-					<li class="dock_item"><a callback-method='' href="clubs" class="widget_fn wh3 hh3" id='d_clubs' onclick="return false;"><span class="widget_icon"><img src="" alt="Clubs" id="clubs_icon" width="30" height="30"/></span></a></li>
-				</ul>
-			</li>
-			<li class="d_cate"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_landt' onclick="return false;"><span class="widget_icon"><img src="" alt="Learning & Teaching" id="landt_icon" width="30" height="30"/></span></a>
-				<ul class="dock_child hh3 thmc4" style="width: 180px;">
-					<li class="dock_item"><a callback-method='' href="courses" class="widget_fn wh3 hh3" id='d_courses' onclick="return false;"><span class="widget_icon"><img src="" alt="Courses" id="courses_icon" width="30" height="30"/></span></a></li>
-					<li class="dock_item"><a callback-method='' href="homework" class="widget_fn wh3 hh3" id='d_homework' onclick="return false;"><span class="widget_icon"><img src="" alt="Homework" id="homework_icon" width="30" height="30"/></span></a></li>
-					<li class="dock_item"><a callback-method='' href="certification" class="widget_fn wh3 hh3" id='d_certification' onclick="return false;"><span class="widget_icon"><img src="" alt="Certification" id="certification_icon" width="30" height="30"/></span></a></li>
-				</ul>
-			</li>
-			<li class="d_cate"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_personal' onclick="return false;"><span class="widget_icon"><img src="" alt="Personal" id="personal_icon" width="30" height="30"/></span></a>
-				<ul class="dock_child hh3 thmc4" style="width: 300px;">
-					<li class="dock_item"><a callback-method='' href="mypage" class="widget_fn wh3 hh3" id='d_mypage' onclick="return false;"><span class="widget_icon"><img src="" alt="myPage" id="mypage_icon" width="30" height="30"/></span></a></li>
-					<li class="dock_item"><a callback-method='' href="blog" class="widget_fn wh3 hh3" id='d_blog' onclick="return false;"><span class="widget_icon"><img src="" alt="Blog" id="blog_icon" width="30" height="30"/></span></a></li>
-					<li class="dock_item"><a callback-method='' href="album" class="widget_fn wh3 hh3" id='d_album' onclick="return false;"><span class="widget_icon"><img src="" alt="Album" id="album_icon" width="30" height="30"/></span></a></li>
-					<li class="dock_item"><a callback-method='' href="calendar" class="widget_fn wh3 hh3" id='d_calendar' onclick="return false;"><span class="widget_icon"><img src="" alt="Calendar" id="calendar_icon" width="30" height="30"/></span></a></li>
-					<li class="dock_item"><a callback-method='' href="files" class="widget_fn wh3 hh3" id='d_files' onclick="return false;"><span class="widget_icon"><img src="" alt="Files" id="files_icon" width="30" height="30"/></span></a></li>
-				</ul>
-			</li>
-			<li class="d_cate"><a callback-method='initializeOrbitTimeline' href="<%= desktop_orbit_orbit_path %>" class="widget_fn wh3 hh3" id='d_orbit' onclick="return false;"><span class="widget_icon"><img src="" alt="Orbit" id="orbit_icon" width="30" height="30"/></span></a>
-				<ul class="dock_child hh3 thmc4" style="width: 60px;">
-					<li class="dock_item"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_connection' onclick="return false;"><span class="widget_icon"><img src="" alt="Academia Connection" id="connection_icon" width="30" height="30"/></span></a></li>
-				</ul>
-			</li>
-			<li class="d_cate"><a callback-method='initializeAppstore' href="<%= desktop_appstore_appstore_path %>" class="widget_fn wh3 hh3" id='d_appstore' onclick="return false;"><span class="widget_icon"><img src="" alt="AppStore" id="appstore_icon" width="30" height="30"/></span></a></li>
-		</ul>
-		<div class="fn_des hh3 admbg admtxt"></div>
-	</div>
+        <li class="dock_item"><a callback-method='initializeBooks' href="<%= desktop_publications_books_path %>" class="widget_fn wh3 hh3" id='d_books' onclick="return false;"><span class="widget_icon"><img src="" alt="Books" id="books_icon" width="30" height="30"/></span></a></li>
+
+      </ul>
+      </li>
+      <li class="d_cate"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_research' onclick="return false;"><span class="widget_icon"><img src="" alt="Research" id="research_icon" width="30" height="30"/></span></a>
+      <ul class="dock_child hh3 thmc4" style="width: 240px;">
+        <li class="dock_item"><a callback-method='initializeResearchDomain' href="<%= desktop_research_research_d_path %>" class="widget_fn wh3 hh3" id='d_research_d' onclick="return false;"><span class="widget_icon"><img src="" alt="Research Domain" id="research_d_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='initializeResearchProject' href="<%= desktop_research_research_p_path %>" class="widget_fn wh3 hh3" id='d_research_p' onclick="return false;"><span class="widget_icon"><img src="" alt="Research Project" id="research_p_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_patents' onclick="return false;"><span class="widget_icon"><img src="" alt="Patents" id="patents_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='' href="labs" class="widget_fn wh3 hh3" id='d_labs' onclick="return false;"><span class="widget_icon"><img src="" alt="Labs" id="labs_icon" width="30" height="30"/></span></a></li>
+      </ul>
+      </li>
+      <li class="d_cate"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_experience' onclick="return false;"><span class="widget_icon"><img src="" alt="Experience" id="experience_icon" width="30" height="30"/></span></a>
+      <ul class="dock_child hh3 thmc4" style="width: 300px;">
+        <li class="dock_item"><a callback-method='' href="working" class="widget_fn wh3 hh3" id='d_working' onclick="return false;"><span class="widget_icon"><img src="" alt="Working" id="working_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='' href="education" class="widget_fn wh3 hh3" id='d_education' onclick="return false;"><span class="widget_icon"><img src="" alt="Education" id="education_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='' href="honors" class="widget_fn wh3 hh3" id='d_honors' onclick="return false;"><span class="widget_icon"><img src="" alt="Honors" id="honors_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='' href="activities" class="widget_fn wh3 hh3" id='d_activities' onclick="return false;"><span class="widget_icon"><img src="" alt="Activities" id="activities_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='' href="clubs" class="widget_fn wh3 hh3" id='d_clubs' onclick="return false;"><span class="widget_icon"><img src="" alt="Clubs" id="clubs_icon" width="30" height="30"/></span></a></li>
+      </ul>
+      </li>
+      <li class="d_cate"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_landt' onclick="return false;"><span class="widget_icon"><img src="" alt="Learning & Teaching" id="landt_icon" width="30" height="30"/></span></a>
+      <ul class="dock_child hh3 thmc4" style="width: 180px;">
+        <li class="dock_item"><a callback-method='' href="courses" class="widget_fn wh3 hh3" id='d_courses' onclick="return false;"><span class="widget_icon"><img src="" alt="Courses" id="courses_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='' href="homework" class="widget_fn wh3 hh3" id='d_homework' onclick="return false;"><span class="widget_icon"><img src="" alt="Homework" id="homework_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='' href="certification" class="widget_fn wh3 hh3" id='d_certification' onclick="return false;"><span class="widget_icon"><img src="" alt="Certification" id="certification_icon" width="30" height="30"/></span></a></li>
+      </ul>
+      </li>
+      <li class="d_cate"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_personal' onclick="return false;"><span class="widget_icon"><img src="" alt="Personal" id="personal_icon" width="30" height="30"/></span></a>
+      <ul class="dock_child hh3 thmc4" style="width: 300px;">
+        <li class="dock_item"><a callback-method='' href="mypage" class="widget_fn wh3 hh3" id='d_mypage' onclick="return false;"><span class="widget_icon"><img src="" alt="myPage" id="mypage_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='' href="blog" class="widget_fn wh3 hh3" id='d_blog' onclick="return false;"><span class="widget_icon"><img src="" alt="Blog" id="blog_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='' href="album" class="widget_fn wh3 hh3" id='d_album' onclick="return false;"><span class="widget_icon"><img src="" alt="Album" id="album_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='' href="calendar" class="widget_fn wh3 hh3" id='d_calendar' onclick="return false;"><span class="widget_icon"><img src="" alt="Calendar" id="calendar_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='' href="files" class="widget_fn wh3 hh3" id='d_files' onclick="return false;"><span class="widget_icon"><img src="" alt="Files" id="files_icon" width="30" height="30"/></span></a></li>
+      </ul>
+      </li>
+      <li class="d_cate"><a callback-method='initializeOrbitTimeline' href="<%= desktop_orbit_orbit_path %>" class="widget_fn wh3 hh3" id='d_orbit' onclick="return false;"><span class="widget_icon"><img src="" alt="Orbit" id="orbit_icon" width="30" height="30"/></span></a>
+      <ul class="dock_child hh3 thmc4" style="width: 60px;">
+        <li class="dock_item"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_connection' onclick="return false;"><span class="widget_icon"><img src="" alt="Academia Connection" id="connection_icon" width="30" height="30"/></span></a></li>
+      </ul>
+      </li>
+      <li class="d_cate"><a callback-method='initializeAppstore' href="<%= desktop_appstore_appstore_path %>" class="widget_fn wh3 hh3" id='d_appstore' onclick="return false;"><span class="widget_icon"><img src="" alt="AppStore" id="appstore_icon" width="30" height="30"/></span></a></li>
+    </ul>
+    <div class="fn_des hh3 admbg admtxt"></div>
+  </div>
 </div>
 <div id="container">
-	
-<div id='ajax_container'>
- 
-	
-</div>
+
+  <div id='ajax_container'>
+
+
+  </div>
 </div>
 <!--<div id="orbitbar"></div>-->
 
 <img src="" id="thmbackground" />
 <div id="bgover" ></div>
 <div id="orbitnote" style="display:none;">
-	<div class="note_holder">
-		<div class="note_type"><img id='note_img' alt=""/></div>
-		<div class="note_message">Check the Notifications section for more information.</div>
-	</div>
+  <div class="note_holder">
+    <div class="note_type"><img id='note_img' alt=""/></div>
+    <div class="note_message">Check the Notifications section for more information.</div>
+  </div>
 </div>
 <div id="orbitdiag" style="display: none;">
-	<div class="tile op07"></div>
-	<div class="diag_holder">
-		<div class="diag_holder_inner">
-			<div class="diag_message"></div>
-			<div class="diag_action">
-				<a href="" id="diag_confirm" class="diag_btn admbg admtxt w1 hh2 hp" onclick="return false;"></a>
-				<a href="" id="diag_cancel" class="diag_btn admbg admtxt w1 hh2 hp" onclick="return false;"></a>
-			</div>
-		</div>
-	</div>
+  <div class="tile op07"></div>
+  <div class="diag_holder">
+    <div class="diag_holder_inner">
+      <div class="diag_message"></div>
+      <div class="diag_action">
+        <a href="" id="diag_confirm" class="diag_btn admbg admtxt w1 hh2 hp" onclick="return false;"></a>
+        <a href="" id="diag_cancel" class="diag_btn admbg admtxt w1 hh2 hp" onclick="return false;"></a>
+      </div>
+    </div>
+  </div>
 </div>
 <script>
-	orbitDesktop.prototype.themefolder = "desktop_themes";
-	orbitDesktop.prototype.notifyImgPath = "/assets/";
-	orbitDesktop.prototype.desktopId = "<%= @desktop.id %>";
-	orbitDesktop.prototype.sectionId = "<%= @section.id %>";
-	orbitDesktop.prototype.currentLanguage = "<%= I18n.locale %>";
-	orbitDesktop.prototype.currentUsername = "<%= @currentusername %>";
-	//uselessfunction();
-	var od = new orbitDesktop("#ajax_container");
-	 o.notify("Welcome "+o.currentUsername+"!!","alert",3);
+  orbitDesktop.prototype.themefolder = "desktop_themes";
+  orbitDesktop.prototype.notifyImgPath = "/assets/";
+  orbitDesktop.prototype.desktopId = "<%= @desktop.id %>";
+  orbitDesktop.prototype.sectionId = "<%= @section.id %>";
+  orbitDesktop.prototype.currentLanguage = "<%= I18n.locale %>";
+  orbitDesktop.prototype.currentUsername = "<%= @currentusername %>";
+  //uselessfunction();
+  var od = new orbitDesktop("#ajax_container");
+  o.notify("Welcome "+o.currentUsername+"!!","alert",3);
 </script>
+<%= javascript_include_tag "personal_journal" %>

app/views/desktop/journal_lists/index.html.erb

@@ -1,40 +0,0 @@
-<div class="toolbar hh2">
-  <div class="hh2 hp sdm">
-    <div class="sdm_t hh2">Share</div>
-    <div class="admbg sdm_o">
-      <ul>
-        <li><a class="hp hh2 admtxt" href="">Friends</a></li>
-        <li><a class="hp hh2 admtxt" href="">Private</a></li>
-        <li><a class="hp hh2 admtxt" href="">Group</a></li>
-      </ul>
-    </div>
-  </div>
-  <div class="hh2 hp sdm">
-    <div class="sdm_t hh2"><span class="icon-question-sign"></span></div>
-  </div>
-</div>
-<div id="journal_list" class="tinycanvas vp">
-  <div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
-  <div class="viewport">
-    <div class="overview">
-        <% @journal_lists.each_with_index do |journal_list,i| %>
-          <% if ( i % 5 ) == 0 %>
-            <div class="g_col">
-            <ul>
-              <% end %>
-              <li class="list_t_item">
-                <div class="list_item_action">
-                  <i class="icon-file"></i>
-                </div>
-                <% title, level = journal_list %>
-                <div class="list_t_title"><%= title %></div>
-                <div class="list_t_desc"><%= level.join(",") %></div>
-              </li>
-              <% if ( i % 5 ) == 4 %>
-            </ul>
-            </div>
-          <% end %>
-        <% end %>
-    </div>
-  </div>
-</div>

app/views/desktop/journal_p.html.erb

@@ -1,33 +0,0 @@
-<div id="journal_p">
-  <div id="content">
-    <div id="header" class="hh3">
-      <div class="dtitle w2 hh3 hp">
-        <span class="thmtxth">Journal Papers</span>
-      </div>
-      <div id="search_app" class="hfn w2 hh2 hp thmc3">
-        <input type="text" class="ini_input form" value="Search" id="searchbox" />
-        <input type="submit" class="ini_input submit thmc1" value="Submit"/>
-      </div>
-    </div>
-    <div id="holder">
-      <div id="panel_l" class="ph">
-        <div class="s_menu sm_v" content-type="menu">
-          <ul id='setting_left_nav'>
-            <li><a href="<%= desktop_journal_pages_path %>" callback-method="list" load="true" class="hh2 w2 hp thmc1 thmtxt xx" onclick='return false;'>List</a></li>
-            <li><a href="<%= new_desktop_journal_page_path %>" callback-method="addpaper" custom-load="addpaper" class="admtxt hh2 w2 hp xx" onclick='return false;'>Add/Edit</a></li>
-            <li><a href="<%= desktop_journal_lists_path %>" callback-method="journal" class="admtxt hh2 w2 hp" onclick='return false;'>Journals</a></li>
-            <li><a href="<%= desktop_co_authors_path %>" class="admtxt hh2 w2 hp"  callback-method="coauthor" custom-load="coauthor" onclick='return false;'>Co-Authors</a></li>
-            <li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags &amp; Keywords</a></li>
-            <li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Analysis</a></li>
-            <li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Import</a></li>
-            <li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Export</a></li>
-          </ul>
-        </div>
-      </div>
-      <div id="panel_r" container="true" class="ph pw admbg hp">
-      </div>
-      <div class="clear"></div>
-    </div>
-  </div>
-</div>
-</div>

app/views/desktop/journal_pages/_form.html.erb

@@ -1,237 +0,0 @@
-<div class="toolbar hh2">
-  <div class="fn_g hp">
-    <%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn ini_input hp hh2 thmc2 thmtxt" %>
-    <!-- class: bt-cancle can't be remove -->
-    <% if not @writing_journal.new_record? %>
-      <%= submit_tag "Cancel", :type => "button", class: "bt-cancel ini_input hp hh2 thmadm thmtxt" %>
-    <% end %>
-  </div>
-  <!--<div class="hh2 hp sdm">
-    <div class="sdm_t hh2">Entry Year</div>
-    <div class="admbg sdm_o">
-      <ul>
-        <li><a class="hp hh2 admtxt" href="">2012</a></li>
-      </ul>
-    </div>
-  </div>
-  <div class="hh2 hp sdm">
-    <div class="sdm_t hh2">Language</div>
-    <div class="admbg sdm_o">
-      <ul>
-        <li><a class="hp hh2 admtxt" href="">English</a></li>
-        <li><a class="hp hh2 admtxt" href="">Chinese</a></li>
-      </ul>
-    </div>
-  </div>-->
-  <div class="hh2 hp sdm">
-    <div class="sdm_t hh2">Share</div>
-    <div class="admbg sdm_o">
-      <ul>
-        <li><a class="hp hh2 admtxt" href="">Full</a></li>
-        <li><a class="hp hh2 admtxt" href="">Abstract</a></li>
-        <li><a class="hp hh2 admtxt" href="">Friends</a></li>
-        <li><a class="hp hh2 admtxt" href="">Private</a></li>
-        <li><a class="hp hh2 admtxt" href="">Group</a></li>
-      </ul>
-    </div>
-  </div>
-  <div class="hh2 hp sdm">
-    <div class="sdm_t hh2"><span class="icon-question-sign"></span></div>
-  </div>
-</div>
-<div id="paper_add" class="tinycanvas vp">
-  <div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
-  <div class="viewport">
-    <div class="overview">
-      <div class="s_grid_con s_form">
-        <ul>
-          <li class="s_grid_row">
-            <%= f.text_area :paper_title, size: "20x2", placeholder: "Paper Title", class: "s_grid_6 s_grid"%>
-          </li>
-          <li class="s_grid_row">
-            <%= f.text_field :journal_title, size: "20", placeholder: "Journal Title", class: "s_grid_6 s_grid", "autocomplete-list" => "journal_title_autocomplete_list" %>
-            <span class="icon-plus input_append"></span>
-          </li>
-          <li class="s_grid_row">
-          <div class="check_box_g">
-            <%= label_tag("", "Journal Level") %>
-            <ul>
-              <% @level_types.each_with_index do |level_type, i| %>
-                 <li>
-                   <%= check_box_tag "writing_journal[journal_level_type_ids][]",
-                                     level_type.id,
-                                     @writing_journal.journal_level_type_ids.include?(level_type.id),
-                                     id: "field-#{i}"
-                   %><%= label_tag("field-#{i}", level_type.title) %>
-                 </li>
-              <% end %>
-            </ul>
-            <!--<label for="">Journal Level</label>
-            <ul>
-              <li><input type="checkbox"><label for="">SCI</label></li>
-            </ul>-->
-          </div>
-          </li>
-
-          <li class="s_grid_row">
-            <%= label_tag("", "ISSN(ISBN)", class: "s_grid_2 s_grid") %><%= f.text_field :isbn, size: "20", placeholder: "829872987", class: "s_grid_4 s_grid"%>
-          </li>
-
-          <li class="s_grid_row">
-            <%= label_tag("", "Volume No.", class: "s_grid_2 s_grid") %><%= f.text_field :vol_no, size: "20", placeholder: "829872987", class: "s_grid_4 s_grid"%>
-          </li>
-
-          <li class="s_grid_row">
-            <%= label_tag("", "Issue No.", class: "s_grid_2 s_grid") %><%= f.text_field :issue_no, size: "20", placeholder:"829872987", class: "s_grid_4 s_grid"%>
-          </li>
-
-          <li class="s_grid_row">
-            <%= label_tag("", "Total Pages", class: "s_grid_2 s_grid") %><%= f.text_field :total_pages, size: "20", placeholder:"20", class: "s_grid_4 s_grid"%>
-          </li>
-
-          <li class="s_grid_row">
-            <%= label_tag("", "Pages", class: "s_grid_2 s_grid") %><%= label_tag("", "from", class: "s_grid_1 s_grid") %><%= f.text_field :form_to_start, size: "10", placeholder: "1", class: "s_grid_1 s_grid"%><%= label_tag("", "to", class: "s_grid_1 s_grid") %><%= f.text_field :form_to_end, size: "10", placeholder: "20", class: "s_grid_1 s_grid"%>
-          </li>
-        </ul>
-      </div>
-      <div class="s_grid_con s_form">
-        <ul>
-          <li class="s_grid_row">
-            <%= f.text_area :authors, size: "20x2", placeholder: "Authors", class: "s_grid_6 s_grid", "autocomplete-list" => "coauthor_autocomplete_list"%>
-            <span class="icon-plus input_append"></span>
-          </li>
-          <li class="s_grid_row">
-
-          <select name="writing_journal[journal_author_type_ids][]" id="" class="s_grid s_grid_4">
-            <%= options_for_select(
-              @author_types.map do |author_type|
-                [author_type.title, author_type.id]
-              end
-            )
-          %>
-          </select>
-
-          <select name="writing_journal[journal_paper_type_ids][]" id="" class="s_grid s_grid_2">
-            <%= options_for_select(
-                  @paper_types.map do |paper_type|
-                    [paper_type.title, paper_type.id]
-                  end
-                )
-            %>
-          </select>
-          </li>
-          <li class="s_grid_row">
-            <%= label_tag("", "Date of Publication", class: "s_grid_3 s_grid") %>
-            <%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_1 s_grid'} %>
-          </li>
-          <li class="s_grid_row">
-             <%= f.text_field :keywords, size: "20", value: @writing_journal.keywords ||= "Keywords", class: "s_grid_6 s_grid"%>
-          </li>
-
-          <li class="s_grid_row">
-            <%= f.label :year ,:class => "s_grid_2 s_grid" %>
-            <%= select_year((@writing_journal.year ? @writing_journal.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_journal[year]', :class => "s_grid_4 s_grid"} ) %>
-          </li>
-
-          <li class="s_grid_row">
-            <%= f.label :language ,:class => "s_grid_2 s_grid" %>
-            <select name="writing_journal[language][]" id="" class="s_grid s_grid_4">
-              <%= options_for_select(
-                [["Chinese", "Chinese"],
-                 ["English", "English"]]
-              )
-            %>
-           </select>
-          </li>
-
-          <li class="s_grid_row">
-             <%= f.text_field :tag, size: "20", value: "Tag", class: "s_grid_6 s_grid"%>
-            <span class="icon-plus input_append"></span>
-          </li>
-          <li class="s_grid_row">
-            <select name="" id="" class="s_grid s_grid_3">
-              <option value="">Status</option>
-              <option value="">Published</option>
-              <option value="">Pending</option>
-              <option value="">Writing</option>
-            </select>
-          </li>
-          <li class="s_grid_row">
-            <%= label_tag("", "Reference URL", class: "s_grid_2 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_4 s_grid"%>
-          </li>
-        </ul>
-      </div>
-      <div class="s_grid_con s_form">
-        <ul>
-          <li class="s_grid_row">
-          <table class="s_table">
-            <thead>
-              <tr>
-                <th class="s_grid_2">File</th>
-                <th class="s_grid_3">File Name</th>
-                <th class="s_grid_1">Action</th>
-              </tr>
-            </thead>
-            <tfoot>
-              <tr>
-                <td colspan="3">
-                  <div id='add_plugin_file' class="info_input plugin_files_block s_action">
-                    <%= hidden_field_tag 'plugin_file_field_count', @writing_journal.writing_journal_files.count %>
-                    <a class="add setting_btn thmc1 thmtxt w1 hh2 hp" href=""><i class="icon-plus icon-white"></i> add</a>
-                  </div>
-                </td>
-              </tr>
-            </tfoot>
-            <tbody>
-              <% @writing_journal.writing_journal_files.each_with_index do |writing_journal_file, i| %>
-                <%= f.fields_for :writing_journal_files, writing_journal_file do |f| %>
-                  <%= render :partial => 'form_file', :object => writing_journal_file, :locals => {:f => f, :i => i} %>
-                <% end %>
-              <% end %>
-            </tbody>
-          </table>
-          </li>
-      </div>
-      <div class="s_grid_con s_form">
-        <ul>
-          <li class="s_grid_row">
-            <%= f.text_area :note, size: "20x22", placeholder: "Note", class: "s_grid_6 s_grid full_height"%>
-          </li>
-        </ul>
-      </div>
-      <div class="s_grid_con s_form">
-        <ul>
-          <li class="s_grid_row">
-            <%= f.text_area :abstract, size: "20x22", placeholder: "Abstract", class: "s_grid_6 s_grid full_height"%>
-          </li>
-        </ul>
-      </div>
-    </div>
-  </div>
-</div>
-<script type="text/javascript">
-  orbitDesktop.prototype.initializeJournalPapers.journal_title_autocomplete_list = <%= @journal_candidate.to_json.html_safe   %>; 
-  orbitDesktop.prototype.initializeJournalPapers.coauthor_autocomplete_list = <%= @co_author_candidate.to_json.html_safe  %>;
-</script>
-
-
-<%= javascript_include_tag "archive_plugin_form" %>
-<script>
-  $('#add_plugin_file a.add').click(function(){
-    var new_id = $(this).prev().attr('value');
-    var old_id = new RegExp("new_writing_journal_files", "g");
-    $(this).prev().attr('value', parseInt(new_id) + 1);
-    var newfield = $(("<%= escape_javascript(add_attribute 'form_file', f, :writing_journal_files) %>").replace(old_id, new_id));
-    $(this).parents('table').append(newfield);
-    newfield.find('.action a.delete').click(function(){
-     newfield.remove();
-   });
-    return false;
-  });
-
-  $('.action a.remove_existing_record').click(function(){
-    $(this).next('.should_destroy').attr('value', 1);
-    $("tr#add_plugin_file_" + $(this).prev().attr('value')).hide();
-  });
-
-</script>

app/views/desktop/journal_pages/_form_file.html.erb

@@ -1,23 +0,0 @@
-<tr id="<%= "plugin_file_#{form_file.id}" if !form_file.new_record? %>" class="list_item">
-  <td>
-    <div>
-      <%= f.file_field :file, class: "s_grid_2 s_grid" %>
-    </div>
-  </td>
-  <td>
-    <%= f.text_field :title, :class=>'s_grid_3 s_grid' %>
-  </td>
-
-  <td>
-    <span class="action">
-      <% if form_file.new_record? %>
-        <a class="delete"><i class="icon-remove"></i></a>
-      <% else %>
-        <%= f.hidden_field :id %>
-        <a class="remove_existing_record"><i class="icon-remove"></i></a>
-        <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
-      <% end %>
-      <%= form_file.file.file ? ( link_to '', form_file.file.url, {:class => 'icon-eye-open', :target => '_blank', :title => t(:view)} ) : '' %>
-    </span>
-  </td>
-</tr>

app/views/desktop/journal_pages/edit.html.erb

@@ -1,3 +0,0 @@
-<%= form_for @writing_journal, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: desktop_journal_page_path(@writing_journal) do |f| %>
-  <%= render partial: 'desktop/journal_pages/form', locals: {:f => f} %>
-<%end%>

app/views/desktop/journal_pages/index.html.erb

@@ -1,88 +0,0 @@
-<div class="toolbar hh2">
-  <div class="hh2 hp sdm">
-    <div class="sdm_t hh2"><span class="icon-check"></span></div>
-    <div class="admbg sdm_o">
-      <ul id="journal_selection_options">
-        <li><a class="hp hh2 admtxt" href="all">All</a></li>
-        <li><a class="hp hh2 admtxt" href="none">None</a></li>
-      </ul>
-    </div>
-  </div>
-  <div class="hh2 hp sdm">
-    <div class="sdm_t hh2">More</div>
-    <div class="admbg sdm_o">
-      <ul>
-        <li><a class="hp hh2 admtxt" href="">Delete</a></li>
-        <li><a class="hp hh2 admtxt" href="">Tag</a></li>
-      </ul>
-    </div>
-  </div>
-  <div class="hh2 hp sdm">
-    <div class="sdm_t hh2">Tag</div>
-    <div class="admbg sdm_o">
-      <ul>
-        <li><a class="hp hh2 admtxt" href="">All</a></li>
-        <li><a class="hp hh2 admtxt" href="">Starred</a></li>
-        <li><a class="hp hh2 admtxt" href="">MIT</a></li>
-      </ul>
-    </div>
-  </div>
-  <div class="hh2 hp sdm">
-    <div class="sdm_t hh2">Status</div>
-    <div class="admbg sdm_o">
-      <ul>
-        <li><a class="hp hh2 admtxt" href="">All</a></li>
-        <li><a class="hp hh2 admtxt" href="">Published</a></li>
-        <li><a class="hp hh2 admtxt" href="">Pending</a></li>
-      </ul>
-    </div>
-  </div>
-  <div class="hh2 hp sdm">
-    <div class="sdm_t hh2">View</div>
-    <div class="admbg sdm_o">
-      <ul id="journal_view_selection">
-        <li><a class="hp hh2 admtxt" href="journal">Journal</a></li>
-        <li><a class="hp hh2 admtxt" href="title">Title</a></li>
-        <li><a class="hp hh2 admtxt" href="file">File</a></li>
-        <li><a class="hp hh2 admtxt" href="keywords">Keywords</a></li>
-        <li><a class="hp hh2 admtxt" href="abstract">Abstract</a></li>
-      </ul>
-    </div>
-  </div>
-  <div class="hh2 hp sdm">
-    <div class="sdm_t hh2">Share</div>
-    <div class="admbg sdm_o">
-      <ul>
-        <li><a class="hp hh2 admtxt" href="">Full</a></li>
-        <li><a class="hp hh2 admtxt" href="">Abstract</a></li>
-        <li><a class="hp hh2 admtxt" href="">Friends</a></li>
-        <li><a class="hp hh2 admtxt" href="">Private</a></li>
-        <li><a class="hp hh2 admtxt" href="">Group</a></li>
-      </ul>
-    </div>
-  </div>
-  <div class="hh2 hp sdm">
-    <div class="sdm_t hh2" id='ns'>New Share</div>
-    <div class="admbg sdm_o">
-      <ul>
-        <li><a class="hp hh2 admtxt remote_url" href="<%= panel_personal_journal_plugin_writing_journals_path %>">Full</a></li>
-        <li><a class="hp hh2 admtxt" href="">Abstract</a></li>
-        <li><a class="hp hh2 admtxt" href="">Friends</a></li>
-        <li><a class="hp hh2 admtxt" href="">Private</a></li>
-        <li><a class="hp hh2 admtxt" href="">Group</a></li>
-      </ul>
-    </div>
-  </div>
-  <div class="hh2 hp sdm">
-    <div class="sdm_t hh2"><span class="icon-question-sign"></span></div>
-  </div>
-</div>
-<div id="paper_list" class="tinycanvas vp">
-  <div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
-  <div class="viewport">
-    <div class="overview">
-
-    </div>
-  </div>
-</div>
-

app/views/desktop/journal_pages/new.html.erb

@@ -1,3 +0,0 @@
-<%= form_for @writing_journal, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"},  url: desktop_journal_pages_path  do |f| %>
-  <%= render partial: 'desktop/journal_pages/form', locals: {:f => f} %>
-<%end%>

app/views/desktop/journal_pages/show.html.erb

@@ -1,2 +0,0 @@
-<h1>Desktop::JournalPages#show</h1>
-<p>Find me in app/views/desktop/journal_pages/show.html.erb</p>

app/views/desktop/seminar_p.html.erb

@@ -14,9 +14,9 @@
 				<div class="s_menu sm_v" content-type="menu">
 					<ul id='setting_left_nav'>
 						<li><a href="<%= desktop_publications_seminar_p_list_path %>" callback-method="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
-						<li><a href="<%= desktop_publications_seminar_p_add_path %>" callback-method="addseminar" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
-						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Seminar</a></li>
-						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
+						<li><a href="<%= desktop_publications_seminar_p_add_path %>" callback-method="addseminar" custom-load="add" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
+						<li><a href="<%= desktop_publications_seminar_p_add_path %>" callback-method="seminar" class="admtxt hh2 w2 hp" onclick='return false;'>Seminar</a></li>
+						<li><a href="<%= desktop_publications_seminar_p_list_path %>" callback-method="rues" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
 						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags &amp; Keywords</a></li>
 						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Analysis</a></li>
 						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Import</a></li>

app/views/front/show_banner.html.erb

@@ -19,7 +19,7 @@
   <div id='slideshow-<%= @ad_banner.title.dehumanize %>' class='slideshow'>
     <% (images = @ad_banner.ad_images).shuffle.each do |ad_image| %>
       <% if ad_image.display? %>
-        <img src='<%= ad_image.file %>' alt='<%= ad_image.title || ' ' %>' time_to_next='<%= @ad_banner.transition_msec %>' link_open='<%= ad_image.link_open %>' link_url='<%= (ad_image.direct_to_after_click? ? ad_image.out_link : ad_image.context) || ' ' %>' link_url='<%= (ad_image.out_link) %>' style=' <%= 'cursor:pointer;' if !ad_image.out_link.blank? %>'/>  
+        <img src='<%= ad_image.file %>' alt='<%= ad_image.title || ' ' %>' title='<%= ad_image.title || ' ' %>' time_to_next='<%= @ad_banner.transition_msec %>' link_open='<%= ad_image.link_open %>' link_url='<%= ad_image_link(ad_image) %>' style=' <%= 'cursor:pointer;' if !ad_image_link(ad_image).blank? %>'/>  
       <% end %>
     <% end %>
   </div>

app/views/front/show_inner_ad_image.html.erb

@@ -0,0 +1,21 @@
+<%if @ad_image && @ad_image.display? %>
+  <h1 class="h1"><%= @ad_image.title %></h1>
+  <div class="info">
+    <div class="info1">
+      <span class="date"><%= display_date_time(@ad_image.post_date) %></span>
+    </div>
+  </div>
+  <div class="news_image">
+    <%#= image_tag(@ad_image.image.url, :size => "320x240") if @ad_image.image.file %>
+    <%= link_to image_tag(@ad_image.file.url, :size => "320x240"), @ad_image.file.url, {:target => '_blank', :title => @ad_image.title} if @ad_image.file.file %>
+  </div>
+  <div class="news_paragraph">
+    <%= @ad_image.context.html_safe rescue '' %>
+  </div>
+  
+  <%#= share_links(@ad_image, 'ad_image') %>
+
+
+<% else %>
+ 
+<% end %>

app/views/front/show_page_sub_menu.html.erb

@@ -1,7 +1,7 @@
 <% if @menu_page && @menu_page.visible_children.size > 0 %>
   <div class='category_list'>
     <h3 class='h3'><%= @menu_page.title %></h3>
-    <ul class='list'>"
+    <ul class='list'>
       <% @menu_page.visible_children.each do |child| %>
         <li class="<%= @page_id.eql?(child.id) ? 'active' : nil %>">
           <a href="<%= (child.class.to_s.eql?('Page') ? '/' + child.path : child.url) %>"><%= child.title %></a>

app/views/kaminari/_first_page.mobile.erb

@@ -0,0 +1,11 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="first">
+  <%= link_to_unless current_page.first?, "«", url, :remote => remote %>
+</li>

app/views/kaminari/_gap.mobile.erb

@@ -0,0 +1,8 @@
+<%# Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<!-- <li class="page gap"><%= raw(t 'views.pagination.truncate') %></li> -->

app/views/kaminari/_last_page.mobile.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="last">
+  <%= link_to_unless current_page.last?, "»", url, {:remote => remote} %>
+</li>

app/views/kaminari/_next_page.mobile.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="next">
+  <%= link_to_unless current_page.last?, '›', url, :rel => 'next', :remote => remote %>
+</li>

app/views/kaminari/_page.mobile.erb

@@ -0,0 +1,16 @@
+<%# Link showing page number
+  - available local variables
+    page:          a page object for "this" page
+    url:           url to this page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page<%= ' active' if page.current? %>">
+  <% if page.current? %>
+  	<a><%= page %></a>
+  <% else %>
+    <%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? '›' : page.prev? ? '‹' : nil} %>
+  <% end %>
+</li>

app/views/kaminari/_paginator.mobile.erb

@@ -0,0 +1,25 @@
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+    paginator:     the paginator that renders the pagination tags inside
+-%>
+<%= paginator.render do -%>
+<div class="pagination">
+  <ul>
+    <%= first_page_tag unless current_page.first? %>
+    <%= prev_page_tag unless current_page.first? %>
+    <% each_page do |page| -%>
+      <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+        <%= page_tag page %>
+      <% elsif !page.was_truncated? -%>
+        <%= gap_tag %>
+      <% end -%>
+    <% end -%>
+    <%= next_page_tag unless current_page.last? %>
+    <%= last_page_tag unless current_page.last? %>
+  </ul>
+</div>
+<% end -%>

app/views/kaminari/_prev_page.mobile.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="prev">
+  <%= link_to_unless current_page.first?, '‹', url, :rel => 'prev', :remote => remote %>
+</li>

app/views/layouts/_guest_orbit_menu.erb

@@ -1,5 +1,5 @@
           <a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
           <ul class="dropdown-menu">
               <li><%= link_to content_tag(:i, nil, :class => 'icons-gauge') + t(:dashboard_), admin_dashboards_path %></li>
-              <li><%= link_to content_tag(:i, nil, :class => 'icons-group') + t(:member), admin_users_new_interface_index_path %></li>
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-users') + t(:member), admin_users_new_interface_index_path %></li>
           </ul>

app/views/layouts/_member_orbit_menu.erb

@@ -1,7 +1,7 @@
           <a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
           <ul class="dropdown-menu">
               <li><%= link_to content_tag(:i, nil, :class => 'icons-gauge') + t(:dashboard_), admin_dashboards_path %></li>
-              <li><%= link_to content_tag(:i, nil, :class => 'icons-group') + t(:member), admin_users_new_interface_index_path %></li>
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-users') + t(:member), admin_users_new_interface_index_path %></li>
 
               <li><%#= link_to content_tag(:i, nil, :class => 'icons-content') + t(:content) %></li>
               <li><%#= link_to content_tag(:i, nil, :class => 'icons-member') + t(:member), admin_users_path %></li>

app/views/layouts/_orbit_bar.html.erb

@@ -1,83 +1,91 @@
 <header id="orbit-bar" class="navbar">
-	<div class="navbar-inner">
-		<div class="container clear">
-			<div class="dropdown orbit-logo pull-left">
-			    <% if !current_user.nil?  %>
-			    		<%= render :partial=>"layouts/member_orbit_menu"%>
-			    <% else %>
-			    		<%= render :partial=>"layouts/guest_orbit_menu"%>
-			    <% end -%>
-			</div>
-			<ul class="nav">
-				<li><%= link_to '', root_path, {'data-icon' => 'house'} %></li>
-				<!-- <li><%= link_to '', desktop_path, {'data-icon' => 'desktop'} %></li> -->
-			</ul>
-			<ul class="nav pull-right">
-        <li class="dropdown language">
-          <a class="dropdown-toggle" href="#" data-toggle="dropdown" data-icon="earth"></a>
-          <ul class="dropdown-menu language-menu">
-            <% @site_in_use_locales.each do |locale| %>
-	            <%= content_tag :li, (link_to t(:_locale, :locale => locale), add_locale(remove_locale((referer rescue request.fullpath)), locale)), :class => (I18n.locale.eql?(locale.to_sym) ? 'active' : nil) %>
-	          <% end %>
+<div class="navbar-inner">
+  <div class="container clear">
+    <div class="dropdown orbit-logo pull-left">
+      <% if !current_user.nil?  %>
+        <%= render :partial=>"layouts/member_orbit_menu"%>
+      <% else %>
+        <%= render :partial=>"layouts/guest_orbit_menu"%>
+      <% end -%>
+    </div>
+    <ul class="nav">
+      <li><a href="<%= root_path %>" data-icons="&#xe022;"></a></li>
+      <!-- <li><a href="<%= desktop_path %>" data-icons="&#xe060;"></a></li> -->
+    </ul>
+    <ul class="nav pull-right">
+      <li class="dropdown">
+          <a class="dropdown-toggle" data-icons="&#xe02d;" href="#" data-toggle="dropdown"></a>
+          <ul class="dropdown-menu">
+            <% t('ntu.site_names').each do |site| %>
+              <li><%= link_to site[1], get_link(site[0]) %></li>
+            <% end %>
           </ul>
+      </li>
+      <li class="dropdown language">
+        <a class="dropdown-toggle" href="#" data-toggle="dropdown" data-icons="&#xe054;"></a>
+        <ul class="dropdown-menu language-menu">
+          <% @site_in_use_locales.each do |locale| %>
+            <%= content_tag :li, (link_to t(:_locale, :locale => locale), add_locale(remove_locale((referer rescue request.fullpath)), locale)), :class => (I18n.locale.eql?(locale.to_sym) ? 'active' : nil) %>
+          <% end %>
+        </ul>
+      </li>
+      <li class="search clear" title="<%= t :search_google %>">
+      <a class="orbit-bar-search" href="#" data-icons="&#xe024;"></a>
+      <form class="navbar-search" method="get" action="http://www.google.com/custom">
+        <input type="hidden" name="client" value="pub-&amp" /> 
+        <input type="hidden" name="ie" id="ie" value="utf-8" />
+        <input type="hidden" name="oe" id="oe" value="utf-8" />
+        <input type="hidden" name="cof" id="cof" value="AH:center;AWFID:03de271f1940eea3;" />
+        <input type='hidden' name='domains' value='<%= @site.search["domains"]  rescue ''%>'>
+        <input type='hidden' name='sitesearch' value='<%= @site.search["sitesearch"] rescue '' %>'>
+        <%= text_field_tag 'q','',{:class => "search-query span3",:placeholder=> t(:search_google) ,:disabled=> ((@site.search["sitesearch"] || @site.search["domains"] ).blank? rescue true)}%>
+      </form>
+      </li>
+      <% if user_signed_in? %>
+        <li class="dropdown active">
+        <a class="orbit-bar-account" href="#" data-toggle="dropdown">
+          <img class="member-img" src="/assets/person.png" />
+          <%#= image_tag current_user.avatar.thumb.url, :class => 'member-img' %>
+          <span class="member-name"><%= current_user.name %></span>
+        </a>
+        <ul class="dropdown-menu account-menu">
+          <!-- <li><%= link_to content_tag(:i, nil, :class => 'icons-tools') + ' ' +  t(:account_setting), desktop_path+"#settings-account" %></li> -->
+          <!-- <li><%= link_to content_tag(:i, nil, :class => 'icons-screen') + ' ' +  t(:desktop), desktop_path %></li> -->
+          <li><%= link_to content_tag(:i, nil, :class => 'icons-logout') + ' ' +  t(:logout), destroy_user_session_path %></li>
+          <li class="divider"></li>
+          <li>
+          <a href="#">
+            <i class="icons-help"></i>
+            <%= t(:help) %>
+          </a>
+          </li>
+        </ul>
         </li>
-        <li class="search clear" title="<%= t :search_google %>">
-          <a class="orbit-bar-search" href="#" data-icon="search"></a>
-					<form class="navbar-search" method="get" action="http://www.google.com/custom">
-  					<input type="hidden" name="client" value="pub-&amp" /> 
-  					<input type="hidden" name="ie" id="ie" value="utf-8" />
-  					<input type="hidden" name="oe" id="oe" value="utf-8" />
-  					<input type="hidden" name="cof" id="cof" value="AH:center;AWFID:03de271f1940eea3;" />
-  					<input type='hidden' name='domains' value='<%= @site.search["domains"]  rescue ''%>'>
-            <input type='hidden' name='sitesearch' value='<%= @site.search["sitesearch"] rescue '' %>'>
-            <%= text_field_tag 'q','',{:class => "search-query span3",:placeholder=> t(:search_nccu) ,:disabled=> ((@site.search["sitesearch"] || @site.search["domains"] ).blank? rescue true)}%>
-  	      </form>
-        </li>
-				<% if user_signed_in? %>
-					<li class="dropdown active">
-						<a class="orbit-bar-account" href="#" data-toggle="dropdown">
-							<img class="member-img" src="/assets/person.png" />
-							<%#= image_tag current_user.avatar.thumb.url, :class => 'member-img' %>
-							<span class="member-name"><%= current_user.name %></span>
-						</a>
-						<ul class="dropdown-menu account-menu">
-              <!-- <li><%= link_to content_tag(:i, nil, :class => 'icons-tools') + ' ' +  t(:account_setting), desktop_path+"#settings-account" %></li> -->
-							<!-- <li><%= link_to content_tag(:i, nil, :class => 'icons-desktop') + ' ' +  t(:desktop), desktop_path %></li> -->
-							<li><%= link_to content_tag(:i, nil, :class => 'icons-outlog') + ' ' +  t(:logout), destroy_user_session_path %></li>
-							<li class="divider"></li>
-							<li>
-								<a href="#">
-									<i class="icons-help"></i>
-									<%= t(:help) %>
-								</a>
-							</li>
-						</ul>
-					</li>
-				<% else %>
-					<li class="dropdown bar-login">
-						<a class="dropdown-toggle orbit-bar-member" href="#" data-icon="inlog"></a>
-						<div class="dropdown-menu">
-							<ul class="log">
-								<li class="title hide"></li>
-								
-								<%= form_for :user, :url => user_session_path do |f| %>
-									<li>
-										<div class="input-prepend">
-											<span class="add-on"><i class="icon-user"></i></span>
-											<%= f.text_field :email, :class => 'span2', :placeholder => t(:email), :size => 16 %>
-										</div>
-									</li>
-									<li>
-										<div class="input-prepend">
-											<span class="add-on"><i class="icon-lock"></i></span>
-										  <%= f.password_field :password, :class => 'span2', :placeholder => t(:password), :size => 16 %>
-										</div>
-									</li>
-									<li class="clear hide">
-										<%= link_to t(:forgot_password), new_user_password_path, :class => 'forgot' %>
-									</li>
-									<li>
-										<%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary' %>
+      <% else %>
+        <li class="dropdown bar-login">
+        <a class="dropdown-toggle orbit-bar-member" href="#" data-icons="&#xe076;"></a>
+        <div class="dropdown-menu">
+          <ul class="log">
+            <li class="title hide"></li>
+
+            <%= form_for :user, :url => user_session_path do |f| %>
+              <li>
+              <div class="input-prepend">
+                <span class="add-on"><i class="icon-user"></i></span>
+                <%= f.text_field :email, :class => 'span2', :placeholder => t(:email), :size => 16 %>
+              </div>
+              </li>
+              <li>
+              <div class="input-prepend">
+                <span class="add-on"><i class="icon-lock"></i></span>
+                <%= f.password_field :password, :class => 'span2', :placeholder => t(:password), :size => 16 %>
+              </div>
+              </li>
+              <li class="clear hide">
+              <%= link_to t(:forgot_password), new_user_password_path, :class => 'forgot' %>
+              </li>
+              <li>
+              <%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary' %>
 
               </li>
               <li class="divider hide"><span><%= t(:or_lower) %></span></li>

app/views/layouts/_side_bar_content.html.erb

@@ -17,7 +17,7 @@
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('page_contexts') || active_for_app_auth('page_content') || active_for_ob_auths_object("PageContext")  do -%>
-  <%= link_to content_tag(:i, nil, :class => 'icons-page') + content_tag(:span, t(:page)), panel_page_content_back_end_page_contexts_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-newspaper') + content_tag(:span, t(:page)), panel_page_content_back_end_page_contexts_path %>
     <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('page_contexts')) do -%>
       <%= content_tag :li, link_to((t(:module_authorization) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "page_content"}))), :class => active_for_app_auth('page_content')  if (is_admin? rescue nil) %>
     <% end -%>
@@ -69,8 +69,8 @@
   <%= content_tag :li, link_to(t(:tags), panel_calendar_back_end_tags_path), :class => active_for_action('/panel/calendar/back_end/tags', 'index')if (is_manager? rescue nil) %>
   <% end -%>
 <% end %>
-<%= content_tag :li, :class => active_for_controllers('locations') || active_for_app_auth("gprs") do -%>
-  <%= link_to content_tag(:i, nil, :class => 'icons-location') + content_tag(:span, t(:location)), panel_gprs_back_end_locations_path %>
+<%= content_tag :li, :class => active_for_controllers('locations') do -%>
+  <%= link_to content_tag(:i, nil, :class => 'icons-location') + content_tag(:span, t(:location)), panel_location_back_end_locations_path %>
   <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('locations') ) do -%>
   <% end -%>
 <% end %>
@@ -79,4 +79,4 @@
   <% flash.each do |key, msg| %>
     <%= content_tag :span, msg, :class => [key, "notice label label-warning"] %>
     <% end %>
-</div>
+</div>

app/views/layouts/mobile.mobile.erb

@@ -0,0 +1,71 @@
+<!DOCTYPE html> 
+<html> 
+<head>
+  <base href=<%= "#{request.protocol}#{request.host_with_port}/mobile/"%>>
+  <title><%= @site.title %><%= (' - ' + @page_title) if @page_title %></title>
+  <%= stylesheet_link_tag "mobile" %>
+  <%= javascript_include_tag "mobile" %>
+  <%= javascript_include_tag "http://maps.google.com/maps/api/js?sensor=false&libraries=places" %>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <!-- <meta name="apple-itunes-app" content="app-id=342792525, app-argument=imdb:///?src=mdot"> -->
+  <meta name="description" content="">
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black">
+  <meta name="viewport" content="user-scalable=no, initial-scale=1.0, maximum-scale=1.0">
+  <!-- iPhone -->
+  <link href="<%= asset_path 'mobile/apple-startup-iPhone.png' %>" media="(device-width: 320px) and (device-height: 480px) and (-webkit-device-pixel-ratio: 1)" rel="apple-touch-startup-image">
+
+  <!-- iPhone (Retina) -->
+  <link href="<%= asset_path 'mobile/apple-startup-iPhone-RETINA.png' %>" media="(device-width: 320px) and (device-height: 480px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image">
+
+  <!-- iPhone 5 -->
+  <link href="<%= asset_path 'mobile/apple-startup-iPhone-Tall-RETINA.png' %>"  media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image">
+
+  <!-- iPad Portrait -->
+  <link href="<%= asset_path 'mobile/apple-startup-iPad-Portrait.png' %>" media="(device-width: 768px) and (device-height: 1024px) and (orientation: portrait) and (-webkit-device-pixel-ratio: 1)" rel="apple-touch-startup-image">
+
+  <!-- iPad Landscape -->
+  <link href="<%= asset_path 'mobile/apple-startup-iPad-Landscape.png' %>" media="(device-width: 768px) and (device-height: 1024px) and (orientation: landscape) and (-webkit-device-pixel-ratio: 1)" rel="apple-touch-startup-image">
+
+  <!-- iPad Portrait (Retina) -->
+  <link href="<%= asset_path 'mobile/apple-startup-iPad-RETINA-Portrait.png' %>" media="(device-width: 768px) and (device-height: 1024px) and (orientation: portrait) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image">
+
+  <!-- iPad Landscape (Retina) -->
+  <link href="<%= asset_path 'mobile/apple-startup-iPad-RETINA-Landscape.png' %>" media="(device-width: 768px) and (device-height: 1024px) and (orientation: landscape) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image">
+
+  <!-- iPhone icon -->
+  <link rel="apple-touch-icon-precomposed" href="<%= asset_path 'mobile/apple-touch-icon.png' %>">
+
+  <!-- iPhone icon (Retina) -->
+  <link rel="apple-touch-icon-precomposed" sizes="114x114" href="<%= asset_path 'mobile/apple-touch-icon@2x.png' %>">
+
+  <!-- iPad icon -->
+  <link rel="apple-touch-icon-precomposed" sizes="72x72" href="<%= asset_path 'mobile/apple-touch-icon-ipad.png' %>">
+
+  <!-- iPad icon (Retina) -->
+  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="<%= asset_path 'mobile/apple-touch-icon-ipad@2x.png' %>">
+  <% if @no_footer %>
+    <style type="text/css">
+      .global {
+        padding-bottom: 0px;
+      }
+    </style>
+  <% end %>
+</head> 
+<body> 
+<div data-role="page" data-url="<%= request.fullpath %>" id="<%= params[:action] %>" data-add-back-btn="<%= params[:action].eql?('index')? nil : 'true' %>">
+  <section class="global">
+    <% if !(yield :header).blank? %>
+      <%= yield :header %>
+    <% else %>
+      <%= render 'header' %>
+    <% end unless @no_header %>
+    <%= render 'menu' unless @no_menu %>
+    <section class="content">
+      <%= yield %>
+    </section>
+    <%= render 'footer' unless @no_footer %>
+  </section>
+</div>
+</body>
+</html>

app/views/layouts/page_layout.html.erb

@@ -10,6 +10,7 @@
 	<![endif]-->
 	<%= page_stylesheets(@item).html_safe %>
 	<%= page_javascripts(@item).html_safe %>
+  <%= csrf_meta_tag %>
 </head>
 <body>
   <%= yield %>

app/views/mobile/_footer.mobile.erb

@@ -0,0 +1,21 @@
+<footer class="footer" data-role="footer" data-position="fixed">
+  <div data-role="navbar">
+    <ul>
+      <li>
+        <%= link_to root_path(mobile: 0), :rel => "external" do %>
+          <i class="icon-desktop"></i>
+        <% end %>
+      </li>
+      <li>
+        <%= link_to mobile_map_path, {"data-transition" => "flip"} do %>
+          <i class="icons-location"></i>
+        <% end %>
+      </li>
+      <li>
+        <%= link_to mobile_dialog_contact_path, {"data-rel" => "dialog"} do %>
+          <i class="icons-phone"></i>
+        <% end %>
+      </li>
+    </ul>
+  </div>
+</footer>

app/views/mobile/_header.mobile.erb

@@ -0,0 +1,9 @@
+<header class="header" data-role="header">
+  <h1 class="openmenu">
+    <%= image_tag asset_path('mobile/logo.png') %>
+  </h1>
+  <i class="openmenu icons-arrow-down-5"></i>
+  <%= link_to mobile_dialog_language_path, {:class => "ui-btn-right language", "data-iconpos" => "notext", "data-icon" => "search", "data-rel" => "dialog"} do %>
+    <i class="icons-earth"></i>
+  <% end %>
+</header>

app/views/mobile/_header_dialog_contact.mobile.erb

@@ -0,0 +1,3 @@
+<header data-role="header" data-theme="d">
+  <h1><%= t('mobile.contact') %></h1>
+</header>

app/views/mobile/_header_dialog_copyright.mobile.erb

@@ -0,0 +1,3 @@
+<header data-role="header" data-theme="d">
+  <h1><%= t('mobile.copyright') %></h1>
+</header>

app/views/mobile/_header_dialog_language.mobile.erb

@@ -0,0 +1,3 @@
+<div data-role="header" data-theme="c">
+  <h3><%= t('mobile.language') %></h3>
+</div>

app/views/mobile/_header_map.mobile.erb

@@ -0,0 +1,3 @@
+<div data-role="header">
+  <h1><%= t('mobile.location') %></h1>
+</div>

app/views/mobile/_language_select.mobile.erb

@@ -0,0 +1,9 @@
+<div data-role="dialog" id="language_select">
+<div data-role="content" data-theme="c">
+    <h3><%= t('mobile.language') %></h3>
+    <% @site_in_use_locales.each do |locale| %>
+      <%= link_to t(:_locale, :locale => locale), add_locale(remove_locale((referer rescue request.fullpath)), locale), {"data-role" => "button", "data-theme" => "b", "data-shadow" => "true"} %>
+    <% end %>
+    <a href="#" data-role="button" data-mini="true" data-rel="back" data-theme="a"><%= t('mobile.cancel') %></a>    
+  </div>
+</div>

app/views/mobile/_menu.mobile.erb

@@ -0,0 +1,7 @@
+<section class="main-menu">
+  <ul class="clear">
+    <li><%= link_to content_tag(:i, nil, :class => "icons-house") + content_tag(:span, t('mobile.home')), mobile_path %></li>
+    <li><%= link_to content_tag(:i, nil, :class => "icons-megaphone") + content_tag(:span, t('mobile.bulletin')), mobile_announcement_path %></li>
+    <li><%= link_to content_tag(:i, nil, :class => "icons-newspaper") + content_tag(:span, t('mobile.page')), mobile_page_path %></li>
+  </ul>
+</section>

app/views/mobile/announcement.mobile.erb

@@ -0,0 +1,13 @@
+<ul data-role="listview" class="list">
+  <% @bulletins.each do |bulletin| %>
+    <li data-corners="false" data-shadow="false" data-iconshadow="true" data-wrapperels="div" data-icon="arrow-r" data-iconpos="right"  data-theme="c">
+      <%= link_to mobile_announcement_content_path(bulletin), :class => "ui-link-inherit" do %>
+        <%= image_tag bulletin.image.url, :class => "ui-li-thumb" %>
+        <h3><%= bulletin.title %></h3>
+        <p class="ui-li-aside ui-li-desc"><%= display_date(bulletin.postdate) %></p>
+        <div class="ui-li-desc"><%= bulletin.subtitle %></div>
+      <% end %>
+    </li>
+  <% end %>
+</ul>
+<%= paginate @bulletins, :param_name => :page_main, :window => 2 %>

app/views/mobile/announcement_content.mobile.erb

@@ -0,0 +1,6 @@
+<div class="newpic">
+    <%= image_tag @bulletin.image.url %>
+</div>
+<h3 class="newstitle"><%= @bulletin.title %></h3>
+<p class="newsDate"><%= display_date_time(@bulletin.postdate) %></p>
+<div class="newsummary"><%= @bulletin.text.html_safe rescue '' %></div>

app/views/mobile/dialog_contact.mobile.erb

@@ -0,0 +1,11 @@
+<%= content_for :header do %>
+  <%= render 'header_dialog_contact' %>
+<% end %>
+
+<ul>
+  <li>總機電話：<a href="tel:+886229393091">02-29393091</a></li>
+  <li>傳真：02-29379611</li>
+  <li>緊急重大事件通聯窗口：校內分機 66119、66110</li>
+  <li>總值日室：<a href="tel:+88229387132">02-29387132</a></li>
+  <li>駐警衛室：<a href="tel:+88229387129">02-29387129</a></li>
+</ul>

app/views/mobile/dialog_copyright.mobile.erb

@@ -0,0 +1,6 @@
+<%= content_for :header do %>
+  <%= render 'header_dialog_copyright' %>
+<% end %>
+
+<p>本網站著作權屬於國立政治大學。</p>
+<p>RulingDigital 銳綸數位建置</p>

app/views/mobile/dialog_language.mobile.erb

@@ -0,0 +1,7 @@
+<%= content_for :header do %>
+  <%= render 'header_dialog_language' %>
+<% end %>
+
+<% @site_in_use_locales.each do |locale| %>
+  <%= link_to t(:_locale, :locale => locale), add_locale(remove_locale((request.referer rescue request.fullpath)), locale), {"data-role" => "button", "data-theme" => "b", "data-shadow" => "true"} %>
+<% end %>

app/views/mobile/index.mobile.erb

@@ -0,0 +1,26 @@
+<div class="slideshow">
+  <% @ad_banner.ad_images.shuffle.each do |image| %>
+    <% if image.display? %>
+      <div class="slidebanner"><%= image_tag image.file.url, :class => 'slideImg' %></div>
+    <% end %>
+  <% end %>
+</div>
+<div class="newlist clear">
+  <% @bulletins.each do |bulletin| %>
+    <div class="newitem">
+      <div class="newpic">
+        <%= image_tag bulletin.image.url %>
+      </div>
+      <h3 class="newstitle">
+        <%= link_to bulletin.title, mobile_announcement_content_path(bulletin) %>
+      </h3>
+      <p class="newsDate"><%= display_date(bulletin.postdate) %></p>
+      <div class="newsummary"><%= bulletin.subtitle %></div>
+    </div>
+  <% end %>
+</div>
+
+<script type='text/javascript'>
+  var $effect = "<%= @ad_banner.ad_fx.nil? ? 'fade': @ad_banner.ad_fx %>"
+  var $timeout = "<%= @ad_banner.transition_msec %>"
+</script>

app/views/mobile/map.mobile.erb

@@ -0,0 +1,5 @@
+<%= content_for :header do %>
+  <%= render 'header_map' %>
+<% end %>
+
+<div id='map_canvas'></div>

app/views/mobile/page.mobile.erb

@@ -0,0 +1,10 @@
+<ul data-role="listview" class="list">
+  <% @page_contexts.each do |page_context| %>
+    <li>
+      <%= link_to mobile_page_content_path(page_context) do %>
+        <h3><%= page_context.page.title %></h3>
+      <% end %>
+    </li>
+  <% end %>
+</ul>
+<%= paginate @page_contexts, :param_name => :page_main, :window => 2 %>

app/views/mobile/page_content.mobile.erb

@@ -0,0 +1,2 @@
+<h3 class="newstitle"><%= @page_context.page.title %></h3>
+<div class="newsummary"><%= @page_context.context.html_safe rescue '' %></div>