Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config

Conflicts: app/models/user/attribute_value.rb app/views/layouts/_side_bar_content.html.erb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-11-26 17:55:53 +08:00
commit 3d573680b2
@@ -14,15 +14,17 @@
                                    <% end %>
                                </div>
                            </div>
-                            <%= render :partial=>"placeholder_block",:locals=>{:value=>@attribute.title_translations,:class_ext=>"pull-left",:label_ext=>t("admin.infos.item_name"),:field_name=>"info[title_translations]"}%>
-                           
+                            <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>@attribute.title_translations,:class_ext=>"pull-left",:label_ext=>t("admin.infos.item_name"),:field_name=>"info[title_translations]"}%>
                        </div>
                    </div>
                </div>
-                        <div class="map-block back attributes">
-                            <h4><span><%= t("admin.attributes")%></span></h4>
-                            <%= render :partial=>"attribute_field",:collection=>@attribute.attribute_fields%>
-                        </div>
+
+                        <% @attribute_fields_upper_object.each do |attribute|%>
+                            <div class="map-block back attributes">
+                                <h4><span><%=  attribute.title+ t("admin.attributes")%></span></h4>
+                                <%= render :partial=>"shared/attribute_field/attribute_field",:collection=>attribute.attribute_fields%>
+                            </div>
+                        <% end %>
                    </div>
            <div class="form-actions form-fixed pagination-right">
                <%= link_to content_tag(:i,t("admin.infos.add_attribute_field"),:class=>"icon-plus icon-white"),admin_info_add_attribute_field_path(@attribute),:class=>"btn btn-primary",:remote => true%>
@@ -1,5 +1,5 @@
 <% content_for :secondary do %>
-	<%= render 'admin/users/side_bar' %>
+	<%= render 'admin/users_new_interface/side_bar' %>
 <% end %>

 <div class="main_list">
@@ -1,5 +1,5 @@
 <% content_for :secondary do %>
-	<%= render 'admin/users/side_bar' %>
+	<%= render 'admin/users_new_interface/side_bar' %>
 <% end %>

 <div id="profile">
@@ -34,10 +34,10 @@
  <div class="tab-pane" id="css_default"><%= render :partial => 'tab_form', :locals => {:type => :css_default, :object => @design.css_default} %></div>
  <div class="tab-pane" id="css_reset"><%= render :partial => 'tab_form', :locals => {:type => :css_reset, :object => @design.css_reset} %></div>
  <% @design.themes.each do |theme| %>
-    <div class="tab-pane" id="<%= dom_id theme %>"><%= render :partial => 'tab_form', :locals => {:type => :css_reset, :object => theme} %></div>
+    <div class="tab-pane" id="<%= dom_id theme %>"><%= render :partial => 'tab_form', :locals => {:type => :themes, :object => theme} %></div>
  <% end %>
  <% @design.javascripts.each do |js| %>
-    <div class="tab-pane" id="<%= dom_id js %>"><%= render :partial => 'tab_form', :locals => {:type => :css_reset, :object => js} %></div>
+    <div class="tab-pane" id="<%= dom_id js %>"><%= render :partial => 'tab_form', :locals => {:type => :javascripts, :object => js} %></div>
  <% end %>
  <div class="tab-pane" id="images"><%= render :partial => 'images' %></div>
 </div>
@@ -1,6 +0,0 @@
-$(".attributes").append('<%= escape_javascript(render :partial=>"attribute_field",:locals=>{:attribute_field=>@attribute_field,:attribute_field_counter=>@attribute_field_counter} )%>');
-            $(".dataType").change(function () {
-                        $(this).parents("legend").next("div").find("div[class^='type']").addClass("hide");
-                        $(this).parents("legend").next("div").find("."+$(this).find("option:selected").attr("ref")).removeClass("hide");
-
-                })
@@ -0,0 +1,40 @@
+<% # encoding: utf-8 %>
+
+<%= form_for('member_select_search', :remote => true, :html => { :id => 'member_select_search', :class => 'member_select_search'} , :url => @member_select_search_url ) do |f| %>
+
+
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            <h3 id="myModalLabel">Modal header</h3>
+        </div>
+        <div class="modal-body clear">
+		
+			<% @member_select_results.each do |results| %>
+
+				<div class="checkblock">
+					<div class='checkbox clear'>
+						<div class="check-icon"></div>
+						<div class="member-avatar">
+						
+						<% if results.avatar? %>
+							<%= image_tag(results.avatar.thumb.url,:class => "member-img") %>
+						<% else %>
+							<%= image_tag "person.png",:class => "member-img" %>
+						<% end %>	
+						
+						</div>
+						<%= label_tag "lab-user-#{results.id}", (results.name rescue ''),:class=>"member-name",:id=>nil -%>
+						<%= check_box_tag "[users][#{results.id}]", 'true', true, :class => "check"   -%>
+					</div>
+				</div>
+
+			<% end %>
+        </div>
+		
+        <div class="modal-footer">
+            <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+            <button class="btn btn-primary"><i class="icon-plus"></i> Add</button>
+        </div>
+
+<% end %>
+		
@@ -0,0 +1,29 @@
+<% # encoding: utf-8 %>
+
+
+<%= form_for('member_select_search', :remote => true, :html => { :id => 'member_select_search', :class => 'member_select_search'} , :url => @member_select_search_url ) do |f| %>
+
+
+		<% @users.each do |users| %>
+
+			<div class="checkblock">
+				<div class='checkbox clear'>
+					<div class="check-icon"></div>
+					<div class="member-avatar">
+					
+					<% if users.avatar? %>
+						<%= image_tag(users.avatar.thumb.url,:class => "member-img") %>
+					<% else %>
+						<%= image_tag "person.png",:class => "member-img" %>
+					<% end %>	
+					
+					</div>
+					<%= label_tag "lab-user-#{users.id}", (users.name rescue ''),:class=>"member-name",:id=>nil -%>
+					<%= check_box_tag "[users][#{users.id}]", 'true', true,:class => "check"   -%>
+				</div>
+			</div>
+
+		<% end %>
+		
+<% end %>
+		
@@ -0,0 +1,153 @@
+<% # encoding: utf-8 %>
+
+	
+        <div class="subnav">
+					
+			<%= form_for('member_select_search', :remote => true, :html => { :id => 'member_select_search', :class => 'member_select_search'}, :url => admin_member_select_member_select_search_path('member_select_search')  ) do |f| %>
+					
+            <div id="accordion">
+                <ul class="nav nav-pills filter">
+				
+					<% @member_selects.each do |member_select| %>
+						 
+						<li class="accordion-group">
+							<div class="accordion-heading">
+								<a href="#<%= member_select.key -%>" data-toggle="collapse" data-parent="#accordion" class="accordion-toggle"><%= member_select.title -%> <b class="web-symbol"></b></a>
+							</div>
+						</li>   
+						
+					<% end -%>	
+					
+                </ul>
+                <div class="accordion-group filters">
+					
+					<% @member_selects.each do |member_select| %>
+					
+                    <div class="accordion-body collapse form-horizontal" id="<%= member_select.key -%>">
+                        <div class="accordion-inner">
+                            <div class="control-group">
+                                <label class="control-label" for="">類別</label>
+                                <div class="controls">
+									
+									<% member_select.sub_roles.each do |sub_role| %>
+									
+                                    <label class="checkbox inline">
+                                        <input type="checkbox" name="member_selects[sub_role][]" value="<%= sub_role.id -%>"> <%= sub_role.title -%>
+                                    </label>
+									<% end %>
+									
+                                    <label class="checkbox inline">
+                                            <a class="select-all" href="#"><i class="icon-ok"></i></a>　<a class="cancel-all" href="#"><i class="icon-remove"></i></a>
+                                    </label>
+                                </div>
+                            </div>
+                            <div class="control-group">
+                                <label class="control-label" for="">狀態</label>
+                                <div class="controls">
+									
+									<% member_select.statuses.each do |status| %>
+									
+                                    <label class="checkbox inline">
+                                        <input type="checkbox" name="member_selects[status][]" value="<%= status.id -%>"> <%= status.title -%>
+                                    </label>
+									
+									<% end %>
+									
+                                    <label class="checkbox inline">
+                                            <a class="select-all" href="#"><i class="icon-ok"></i></a>　<a class="cancel-all" href="#"><i class="icon-remove"></i></a>
+                                    </label>
+                                </div>
+                            </div>
+                            <div class="control-group">
+                                <label class="control-label">關鍵字搜尋</label>
+                                <div class="controls">
+                                    <input type="text" data-provide="typeahead" data-items="4" name="member_selects[keyword][<%= member_select.id -%>][]">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="filter-clear">
+                            <a href="#" class="btn btn-success btn-small"><i class="icon-plus"></i> Add</a>
+                            <a data-toggle="modal" href="#search-results" class="btn btn-primary btn-small" data-remote="true" onclick="$('#member_select_search').submit();"><i class="icon-search"></i> Search</a>
+                        </div>
+                    </div>
+					
+					<% end %>
+					
+                </div>
+            </div>
+			
+			<% end %>
+			
+        </div>
+		
+		
+		<% #results %>
+	
+		<div id="member_select_result_add">
+			
+		
+			<div class="clear" id="users_checkbox_ary">
+				
+		<div class="checkblock">
+			<div class="checkbox clear checked">
+				<div class="check-icon"></div>
+				<div class="member-avatar">
+					<img alt="Person" class="member-img" src="images/menber-pic.png">
+				</div>
+				<label class="member-name" for="lab-user-4f45f3b9e9d02c5db900006d">儒淵 傅</label>
+				<input checked="checked" class="check" type="checkbox" value="true">
+			</div>
+		</div>
+			</div>
+			
+			<div class="form-actions form-fixed pagination-right">
+				<input class="btn btn-primary" name="commit" type="submit" value="Update">
+			</div>
+			
+			
+		</div>
+		
+		<% #results %>
+		
+    </div>
+	
+	
+	
+	<% #search %>
+	
+	<div id="member_select_result">
+		<div id="search-results" class="search-results modal hide fade" tabindex="1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+			<%#= render :partial => "member_select_search" %>
+		</div>
+	</div>
+	
+	
+<% content_for :page_specific_javascript do %>
+	 
+	<%= stylesheet_link_tag "inc/permission-checkbox" %>
+	<%= javascript_include_tag "inc/permission-checkbox" %>
+	
+	<script type="text/javascript">
+	
+		$("#more").click(function() {
+			$("#member_select_search").submit();
+		}
+
+		$(document).ready(function(){
+			$('.select-all').click(function() {
+				$(this).each(function() {
+					$(this).parents('label').prevAll('label').find('input').attr({checked:'checked'})
+				})
+			});
+			$('.cancel-all').click(function() {
+				$(this).each(function() {
+					$(this).parents('label').prevAll('label').find('input').removeAttr('checked')
+				})
+			});
+		});
+		
+	</script>
+
+<% end %>	
+	
+	
@@ -0,0 +1,5 @@
+$("#users_checkbox_ary").html("<%= j render "member_select_result_add" %>");
+$("#search-results").modal('hide');
+$(document).ready(function() {
+permissionCheckbox();
+}); 
@@ -0,0 +1,40 @@
+<% # encoding: utf-8 %>
+<% debugger %>
+
+<%= form_for('member_select_search', :remote => true, :html => { :id => 'member_select_search', :class => 'member_select_search'} , :url => @member_select_search_url ) do |f| %>
+
+
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            <h3 id="myModalLabel">Modal header</h3>
+        </div>
+        <div class="modal-body clear">
+            <div class="checkblock">
+                <div class='checkbox clear'>
+                    <div class="check-icon"></div>
+                    <div class="member-avatar">
+                        <img src="images/menber-pic.png" class="member-img" />
+                    </div>
+                    <label class="member-name">Ray Chang</label>
+                    <input class="check" type="checkbox" name="[users][4f45f3b9e9d02c5db9000067]" value="true" />
+                </div>
+            </div>
+            <div class="checkblock">
+                <div class="checkbox clear checked">
+                    <div class="check-icon"></div>
+                    <div class="member-avatar">
+                        <img alt="Person" class="member-img" src="images/menber-pic.png">
+                    </div>
+                    <label class="member-name" for="lab-user-4f45f3b9e9d02c5db900006d">儒淵 傅</label>
+                    <input checked="checked" class="check" type="checkbox" value="true">
+                </div>
+            </div>
+        </div>
+		
+        <div class="modal-footer">
+            <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+            <button class="btn btn-primary"><i class="icon-plus"></i> Add</button>
+        </div>
+
+<% end %>
+		
@@ -0,0 +1,4 @@
+$("#search-results").html("<%= j render "member_select_result" %>");
+$(document).ready(function() {
+permissionCheckbox();
+}); 
@@ -1,5 +1,5 @@
 $('#app_page_url').html("<%= escape_javascript(select 'page', 'app_frontend_url', @module_app.app_pages) %>");
 $('#app_page_frontend_style').html("<%= escape_javascript(select 'page', 'frontend_style', @module_app.widgets[@frontend_path]) if !@frontend_path.blank? %>");
-$('#app_page_category').html("<%= j (select 'page', 'category', @categories.collect{|category| [category.i18n_variable[I18n.locale], category.id]}, {:include_blank => true}) if @categories %>");
+$('#app_page_category').html("<%= j (select 'page', 'category', @categories.collect{|category| [category.title, category.id]}, {:include_blank => true}) if @categories %>");
 $('#app_page_tag').html("<%= j (select 'page', 'tag', @tags.collect{|tag| [tag[I18n.locale], tag.id]}, {:include_blank => true}) if @tags %>");
 $('#app_page_frontend_field').html("<%= j render '../admin/pages/frontend_fields' %>")
@@ -1,4 +1,4 @@
-<%= flash_messages %>
+<%#= flash_messages %>
 <div id="poststuff">
 	<h1><%= t('editing.page') %></h1>
 	<%= form_for @item, :url => admin_page_path(@item), :html => { :class => 'form-horizontal edit_page' }  do |f| %>
@@ -1,4 +1,4 @@
-<%= flash_messages %>
+<%#= flash_messages %>
 <div id="poststuff">
 	<h1><%= t('new.page') %></h1>
 	<%= form_for @item, :url => admin_pages_path, :html => { :class => 'form-horizontal edit_page' }  do |f| %>
@@ -1,4 +1,4 @@
-<%= flash_messages %>
+<%#= flash_messages %>


 <%= page_stylesheets(@item, true).html_safe %> 
@@ -1,3 +1,3 @@
-$('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
 $('#back_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
+$('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
 history.pushState(null, document.title, "<%= escape_javascript(admin_page_url(@item)) %>");
@@ -1,2 +1,3 @@
 $('#back_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
+$('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
 history.pushState(null, document.title, "<%= escape_javascript(admin_page_url(@item)) %>");
@@ -61,8 +61,10 @@
                            <thead>
                                <tr>
                                    <th class="span1">
-                                        <input type="checkbox">
-                                        <a href class="list-remove"><i class="icon-minus-sign"></i></a>
+                                        <% if is_admin? %>
+                                            <input type="checkbox">
+                                            <a href class="list-remove"><i class="icon-minus-sign"></i></a>
+                                        <%end%>
                                    </th>
                                <th id="sort-roles" class="sort span3"><%= t("admin.new_admin.attributes.roles")%><b class="web-symbol"></b></th>
                                <th id="sort-name" class="sort span1-2 select active"><%= t("admin.new_admin.attributes.name")%><b class="web-symbol"></b></th>
@@ -1,7 +1,9 @@
       <div class="form-actions form-fixed pagination-right">
+          <% if is_admin? %>
            <%= link_to(new_admin_users_new_interface_path,:class=> "btn btn-primary pull-right") do%>
                <i class="icon-plus icon-white"></i><%= t("admin.new_admin.action.add")%>
            <% end -%>
+          <%end -%>
            <div class="paginationFixed" id="user_pagination">
               <%= paginate @users, :params => {:inner => false}%>
            </div>
@@ -6,10 +6,10 @@

  <% role.sub_roles.each do |sub_role| %>  
      <% sub_role_disable = @user.sub_roles.include?(sub_role) ?   false : true    %>
-      <%= hidden_field_tag("user[disable_sub_role][id][#{sub_role.id}]",sub_role_disable,:for=>@form_index,:class=>"subrole_disable_field",:value=>sub_role_disable)%>
      <%#= hidden_field_tag("[user][new_attribute_values][sub_role][disable][#{sub_role.id}]",sub_role_disable)%>
      <legend>
        <button  for=<%=@form_index%> class="onoff pull-right  <%= sub_role_disable ? 'disabled' : '' %> ">ON</button><%= sub_role.title %>
+        <%= hidden_field_tag("user[disable_sub_role][id][#{sub_role.id}]",sub_role_disable,:for=>@form_index,:class=>"subrole_disable_field",:value=>sub_role_disable)%>
      </legend>
    <div class="controls-block <%= sub_role_disable ? 'hide' : '' %>" >
    <% sub_role.attribute_fields.each  do |af|%>
@@ -3,8 +3,8 @@
    <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('users_new_interface')) do -%>
      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.all_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_users_new_interface_index_path), :class => active_for_action('users_new_interface', 'index') %>
      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.add_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_admin_users_new_interface_path), :class => active_for_action('users_new_interface', 'new') %>
-      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_roles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, ), :class => active_for_action('users_new_interfacexx', 'index') %>
-      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_info') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, ), :class => active_for_action('users_new_interfacexx', 'index') %>
+      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_roles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_infos_path ), :class => active_for_action('users_new_interfacexx', 'index') %>
+      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_info') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_roles_path), :class => active_for_action('users_new_interfacexx', 'index') %>
    <% end -%>
 <% end -%>

@@ -1,5 +1,5 @@
                <tr class="with_action">
-                    <td class="span1"><input type="checkbox"></td>
+                    <td class="span1"><% if is_admin? %><input type="checkbox"><% end%></td>
                    <td class="span3">
                        <div class="label-group">
                            <div class="label-td"><!-- 
@@ -38,7 +38,7 @@
                <p class="user-mail">
                    <%= @user.email %>
                </p>
-                <%= link_to "<i class='icon-pencil'></i>#{t('admin.edit')}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-small"%>
+                <%= link_to("<i class='icon-pencil'></i>#{t('admin.edit')}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-small" ) if is_admin?%>
            </div>
            <div class="user-roles my_scroll">
                <div class="scrollbar">
@@ -8,16 +8,16 @@
 	<div id="holder">
 		
 				<div id="panel_l" class="ph">
-					<div class="s_menu sm_v">
+					<div class="s_menu sm_v" content-type="menu">
 						<ul id='setting_left_nav'>
-							<li><a href="onlinestore" class="admtxt hh2 w2 hp" onclick='return false;'>Online Store</a></li>
-							<li><a href="widgets" class="admtxt hh2 w2 hp" onclick='return false;'>Widgets</a></li>
+							<li><a href="<%= desktop_appstore_onlinestore_path %>" callback-method="onlinestore" class="admtxt hh2 w2 hp" onclick='return false;'>Online Store</a></li>
+							<li><a href="<%= desktop_appstore_widgets_path %>" callback-method="widgets" class="admtxt hh2 w2 hp" onclick='return false;'>Widgets</a></li>
 							<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Apps</a></li>
 							<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Registeration</a></li>
 						</ul>
 					</div>
 				</div>
-				<div id="panel_r" class="ph pw admbg hp">
+				<div id="panel_r" container="true" class="ph pw admbg hp">
 					
 				</div>
 			<div class="clear"></div>
@@ -11,10 +11,10 @@
 		</div>
 		<div id="holder">
 			<div id="panel_l" class="ph">
-				<div class="s_menu sm_v">
+				<div class="s_menu sm_v" content-type="menu">
 					<ul id='setting_left_nav'>
-						<li><a href="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
-						<li><a href="addbook" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
+						<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="" 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>
@@ -24,7 +24,7 @@
 					</ul>
 				</div>
 			</div>
-			<div id="panel_r" class="ph pw admbg hp">
+			<div id="panel_r" container="true" class="ph pw admbg hp">
 			</div>
 			<div class="clear"></div>
 		</div>
@@ -0,0 +1,33 @@
+<div class="fn_g hp">
+  <%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %>
+<!--    <%= submit_tag "Cancel", :class=>"fn_btn hh2 bt-cancel thmc2 thmtxt" %>-->
+</div>
+
+<div></div>
+<ul>
+  <li class="s_grid_row">
+  <%= f.label :co_author %><br />
+  <%= f.text_field :co_author %>
+  </li>
+
+  <li class="s_grid_row">
+  <%= f.label :email %><br />
+  <%= f.text_field :email %>
+  </li>
+
+  <li class="s_grid_row">
+  <%= f.label :type%><br />
+  <select name="co_author[type]" id="" class="s_grid s_grid_4">
+    <%= options_for_select(
+      [["朋友","朋友"],
+       ["學生","摯友"],
+       ["老師","老師"],
+       ["摯友","摯友"],
+       ["親戚","親戚"],
+       ["同事","同事"],
+       ["共同作者","共同作者"]
+    ])
+  %>
+  </select>
+  </li>
+</ul>
@@ -0,0 +1,3 @@
+<%= 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 %>
@@ -0,0 +1,20 @@
+<table>
+  <tr>
+    <th>Name</th>
+    <th>EMail</th>
+    <th>Type</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @co_authors.each do |co_author| %>
+  <tr>
+    <td><%= co_author.co_author %></td>
+    <td><%= co_author.email %></td>
+    <td><%= co_author.type%></td>
+    <td><%= link_to 'Destroy', desktop_co_author_path(co_author), method: :delete, confirm: 'Are you sure?'  %></td>
+  </tr>
+<% end %>
+</table>
+<br />
@@ -0,0 +1,3 @@
+<%= 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 %>
@@ -1,59 +1,64 @@
 <div id="side">
 	<div id="rwidget" class="wh3 thmc4">
 		<ul class="docklist">
-			<li class="d_cate"><a 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>
+			<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 href="app_manager" 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 href="sections" 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 href="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>
+					<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_sections_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 %>" 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 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>
+			<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 href="journal_p" class="widget_fn wh3 hh3" id='d_journal_p' 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 href="seminar_p" 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 href="books" 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='initializeJournalPapers' href="<%= desktop_publications_journal_p_path %>" class="widget_fn wh3 hh3" id='d_journal_p' 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='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='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='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 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>
+			<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 href="research_d" 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 href="research_p" 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 href="patents" 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 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>
+					<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 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>
+			<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 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 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 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 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 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>
+					<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 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>
+			<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 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 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 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>
+					<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 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>
+			<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 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 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 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 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 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>
+					<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 href="orbit" 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>
+			<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 href="connection" 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>
+					<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 href="appstore" 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>
+			<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>
@@ -1,33 +1,33 @@
 <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">
-					<ul id='setting_left_nav'>
-						<li><a href="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
-						<li><a href="addpaper" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
-						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Journals</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>
-						<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" class="ph pw admbg hp">
-			</div>
-			<div class="clear"></div>
-		</div>
-	</div>
-	</div>
-</div>
+  <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" class="admtxt hh2 w2 hp xx" onclick='return false;'>Add/Edit</a></li>
+            <li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Journals</a></li>
+            <li><a href="<%= new_desktop_co_author_path %>" class="admtxt hh2 w2 hp"  callback-method="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>
@@ -0,0 +1,209 @@
+<div class="toolbar hh2">
+  <div class="fn_g hp">
+    <%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %>
+    <!-- class: bt-cancle can't be remove
+    <%= submit_tag "Cancel", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %> -->
+  </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>
+        <li><a class="hp hh2 admtxt" href="">2011</a></li>
+        <li><a class="hp hh2 admtxt" href="">2010</a></li>
+        <li><a class="hp hh2 admtxt" href="">2009</a></li>
+        <li><a class="hp hh2 admtxt" href="">2008</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"%>
+            <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>
+              <li><input type="checkbox"><label for="">SCIE</label></li>
+              <li><input type="checkbox"><label for="">SSCI</label></li>
+              <li><input type="checkbox"><label for="">AH & HCI</label></li>
+              <li><input type="checkbox"><label for="">EI</label></li>
+              <li><input type="checkbox"><label for="">CSCI</label></li>
+              <li><input type="checkbox"><label for="">CSSCI</label></li>
+              <li><input type="checkbox"><label for="">TSCI</label></li>
+              <li><input type="checkbox"><label for="">TSSCI</label></li>
+              <li><input type="checkbox"><label for="">THCI</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>
+
+          <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">
+            <%= f.text_area :authors, size: "20x2", placeholder: "Authors", class: "s_grid_6 s_grid"%>
+            <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>
+
+          <ul>
+            <li class="s_grid_row">
+             <%= label_tag("", "Date of Publication", class: "s_grid_4 s_grid") %>
+            </li>
+            <li class="s_grid_row">
+            <%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_2 s_grid'} %>
+            </li>
+          </ul>
+
+
+          <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">
+            <div><%= f.label :year ,:class => "s_grid_2 s_grid" %></div>
+            <div><%= 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"} ) %></div>
+          </li>
+
+          <li class="s_grid_row">
+            <div><%= f.label :language ,:class => "s_grid_2 s_grid" %></div>
+            <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_2">
+            <option value="">Status</option>
+            <option value="">Published</option>
+            <option value="">Pending</option>
+            <option value="">Writing</option>
+          </select>
+          </li>
+        </ul>
+      </div>
+      <div class="s_grid_con s_form">
+            <span class="icon-plus input_append"></span>
+        <ul>
+          <li class="s_grid_row">
+          <div> <%= label_tag("", "Full Text", class: "s_grid_2 s_grid") %></div>
+          <!--  
+          <%= f.fields_for :writing_journal_files, @writing_journal do |wjf| %>
+            <%= wjf.file_field :file %>
+          <% end %>
+          -->
+          </li>
+          <li class="s_grid_row">
+            <%= f.text_area :note, size: "20x2", plcaeholder: "Note", class: "s_grid_6 s_grid"%>
+          </li>
+        </ul>
+      </div>
+      <div class="s_grid_con s_form">
+        <ul>
+          <li class="s_grid_row">
+            <%= f.text_area :abstract, size: "20x26", placeholder: "Abstract", class: "s_grid_6 s_grid"%>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+</div>
@@ -1,109 +0,0 @@
-<div class="toolbar hh2">
-	<div class="fn_g hp">
-		<button class="fn_btn hh2 thmc2 thmtxt">Save</button>
-		<button class="fn_btn hh2 admbg2">Cancel</button>
-	</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>
-				<li><a class="hp hh2 admtxt" href="">2011</a></li>
-				<li><a class="hp hh2 admtxt" href="">2010</a></li>
-				<li><a class="hp hh2 admtxt" href="">2009</a></li>
-				<li><a class="hp hh2 admtxt" href="">2008</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"><textarea class="s_grid_6 s_grid" name="" id="">Paper Title</textarea></li>
-					<li class="s_grid_row"><input class="s_grid_6 s_grid" type="text" value="Journal Title"><span class="icon-plus input_append"></span></li>
-					<li class="s_grid_row">
-						<div class="check_box_g">
-							<label for="">Journal Level</label>
-							<ul>
-								<li><input type="checkbox"><label for="">SCI</label></li>
-								<li><input type="checkbox"><label for="">SCIE</label></li>
-								<li><input type="checkbox"><label for="">SSCI</label></li>
-								<li><input type="checkbox"><label for="">AH & HCI</label></li>
-								<li><input type="checkbox"><label for="">EI</label></li>
-								<li><input type="checkbox"><label for="">CSCI</label></li>
-								<li><input type="checkbox"><label for="">CSSCI</label></li>
-								<li><input type="checkbox"><label for="">TSCI</label></li>
-								<li><input type="checkbox"><label for="">TSSCI</label></li>
-								<li><input type="checkbox"><label for="">THCI</label></li>
-							</ul>
-						</div>
-					</li>
-					<li class="s_grid_row"><label class="s_grid_2 s_grid" for="">ISSN(ISBN)</label><input type="text" class="s_grid_4 s_grid" value="829872987"></li>
-					<li class="s_grid_row"><label class="s_grid_2 s_grid" for="">ISI No.</label><input type="text" class="s_grid_4 s_grid" value="829872987"></li>
-					<li class="s_grid_row"><label class="s_grid_2 s_grid" for="">Volume No.</label><input type="text" class="s_grid_4 s_grid" value="829872987"></li>
-					<li class="s_grid_row"><label class="s_grid_2 s_grid" for="">Issue No.</label><input type="text" class="s_grid_4 s_grid" value="829872987"></li>
-					<li class="s_grid_row"><label class="s_grid_2 s_grid" for="">Pages</label></li>
-					<li class="s_grid_row"><label class="s_grid_2 s_grid" for="">Reference URL</label><input class="s_grid_4 s_grid" type="text" value="www.sample.com"></li>
-				</ul>
-			</div>
-			<div class="s_grid_con s_form">
-				<ul>
-					<li class="s_grid_row"><textarea class="s_grid s_grid_6" name="" id="">Author</textarea><span class="icon-plus input_append"></span></li>
-					<li class="s_grid_row">
-						<select name="" id="" class="s_grid s_grid_4">
-							<option value="">Author Type</option>
-							<option value="">First Author</option>
-							<option value="">Corresponding Author</option>
-							<option value="">Second Author</option>
-							<option value="">Third Author</option>
-							<option value="">Fourth Author</option>
-						</select>
-						<select name="" id="" class="s_grid s_grid_2">
-							<option value="">Status</option>
-							<option value="">Published</option>
-							<option value="">Pending</option>
-							<option value="">Writing</option>
-						</select>
-					</li>
-					<li class="s_grid_row"><label class="s_grid s_grid_2" for="">Date of Publication</label><input class="s_grid s_grid_4" type="text" value="2012 / 05 / 01"></li>
-					<li class="s_grid_row"><textarea name="" id="" rows="10" class="s_grid s_grid_6"></textarea></li>
-					<li class="s_grid_row"><input class="s_grid s_grid_6" type="text" value="Associated Project"><span class="icon-plus input_append"></span></li>
-					<li class="s_grid_row"><label class="s_grid s_grid_2" for="">Abstract</label><input type="file"></li>
-					<li class="s_grid_row"><label class="s_grid s_grid_2" for="">Full Text</label><input type="file"></li>
-				</ul>
-			</div>
-			<div class="s_grid_con s_form">
-				<ul>
-					<li class="s_grid_row"><textarea name="" id="" rows="26" class="s_grid s_grid_6">Abstract</textarea></li>
-				</ul>
-			</div>
-		</div>
-	</div>
-</div>
@@ -0,0 +1,3 @@
+<%= 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%>
@@ -0,0 +1,88 @@
+<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>
+
@@ -1,102 +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>
-Panel::PersonalJournal::Plugin::WritingJournals
-<script type="text/javascript">
-orbitDesktop.prototype.bindItems = function(){
-	var bindHandlers = function(){
-
-	}
-	$(".remote_url").click(function(){
-		$(".overview").load($(this).attr("href"),function(){
-			bindHandlers();
-		})
-		return false;
-	})
-}
-o.bindItems();
-</script>
@@ -0,0 +1,3 @@
+<%= 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%>
@@ -0,0 +1,2 @@
+<h1>Desktop::JournalPages#show</h1>
+<p>Find me in app/views/desktop/journal_pages/show.html.erb</p>
@@ -11,10 +11,10 @@
 		</div>
 		<div id="holder">
 			<div id="panel_l" class="ph">
-				<div class="s_menu sm_v">
+				<div class="s_menu sm_v" content-type="menu">
 					<ul id='setting_left_nav'>
-						<li><a href="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
-						<li><a href="add" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
+						<li><a href="<%= desktop_research_research_d_list_path %>" callback-method="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
+						<li><a href="<%= desktop_research_research_d_add_path %>" callback-method="add_this" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
 						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Domains</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>
@@ -24,7 +24,7 @@
 					</ul>
 				</div>
 			</div>
-			<div id="panel_r" class="ph pw admbg hp">
+			<div id="panel_r" container="true" class="ph pw admbg hp">
 			</div>
 			<div class="clear"></div>
 		</div>
@@ -11,10 +11,10 @@
 		</div>
 		<div id="holder">
 			<div id="panel_l" class="ph">
-				<div class="s_menu sm_v">
+				<div class="s_menu sm_v" content-type="menu">
 					<ul id='setting_left_nav'>
-						<li><a href="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
-						<li><a href="add" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
+						<li><a href="<%= desktop_publications_research_p_list_path %>" callback-method="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
+						<li><a href="<%= desktop_publications_research_p_add_path %>" callback-method="add_this" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
 						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Projects</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>
@@ -24,7 +24,7 @@
 					</ul>
 				</div>
 			</div>
-			<div id="panel_r" class="ph pw admbg hp">
+			<div id="panel_r" container="true" class="ph pw admbg hp">
 			</div>
 			<div class="clear"></div>
 		</div>
@@ -11,10 +11,10 @@
 		</div>
 		<div id="holder">
 			<div id="panel_l" class="ph">
-				<div class="s_menu sm_v">
+				<div class="s_menu sm_v" content-type="menu">
 					<ul id='setting_left_nav'>
-						<li><a href="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
-						<li><a href="addseminar" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
+						<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="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags &amp; Keywords</a></li>
@@ -24,7 +24,7 @@
 					</ul>
 				</div>
 			</div>
-			<div id="panel_r" class="ph pw admbg hp">
+			<div id="panel_r" container="true" class="ph pw admbg hp">
 			</div>
 			<div class="clear"></div>
 		</div>
@@ -6,22 +6,21 @@
 		</div>
 	</div>
 	<div id="holder">
-		
-				<div id="panel_l" class="ph">
-					<div class="s_menu sm_v">
-						<ul id='setting_left_nav'>
-							<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Overview</a></li>
-							<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Account</a></li>
-							<li><a href="sections" class="admtxt hh2 w2 hp" onclick='return false;'>Sections</a></li>
-							<li><a href="themes" class="admtxt hh2 w2 hp" onclick='return false;'>Theme</a></li>
-							<li><a href="connection" class="admtxt hh2 w2 hp" onclick='return false;'>Connection</a></li>
-						</ul>
-					</div>
-				</div>
-				<div id="panel_r" class="ph pw admbg hp">
-					
-				</div>
-				<div class="clear"></div>
+		<div id="panel_l" class="ph">
+			<div class="s_menu sm_v" content-type="menu">
+				<ul id='setting_left_nav'>
+					<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Overview</a></li>
+					<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Account</a></li>
+					<li><a href="<%= desktop_sections_path %>" callback-method="sections" class="admtxt hh2 w2 hp" onclick='return false;'>Sections</a></li>
+					<li><a href="<%= desktop_themes_path %>" callback-method="themes" class="admtxt hh2 w2 hp" onclick='return false;'>Theme</a></li>
+					<li><a href="<%= desktop_connections_path %>" callback-method="connection" class="admtxt hh2 w2 hp" onclick='return false;'>Connection</a></li>
+				</ul>
+			</div>
+		</div>
+		<div id="panel_r" container="true" class="ph pw admbg hp">
+			
+		</div>
+		<div class="clear"></div>
 	</div>
 </div>
 </div>
@@ -4,7 +4,7 @@
 		<div id="connection_setting" class="overview vp">
 			<ul class="s_form w2 hp" id="facebook_connection">
 				<li><span class="c_status">No Connection</span></li>
-				<li><img src="assets/connection/facebook.png" alt="" class="c_icon"><h1 class="c_name">Facebook</h1></li>
+				<li><img src="/assets/connection/facebook.png" alt="" class="c_icon"><h1 class="c_name">Facebook</h1></li>
 				<li><label for="">Account</label><input type="text"></li>
 				<li><label for="">Password</label><input type="password"></li>
 				<li>
@@ -16,7 +16,7 @@
 			</ul>
 			<ul class="s_form w2 hp" id="twitter_connection">
 				<li><span class="c_status">No Connection</span></li>
-				<li><img src="assets/connection/twitter.png" alt="" class="c_icon"><h1 class="c_name">Twitter</h1></li>
+				<li><img src="/assets/connection/twitter.png" alt="" class="c_icon"><h1 class="c_name">Twitter</h1></li>
 				<li><label for="">Account</label><input type="text"></li>
 				<li><label for="">Password</label><input type="password"></li>
 				<li>
@@ -28,7 +28,7 @@
 			</ul>
 			<ul class="s_form w2 hp" id="gmail_connection">
 				<li><span class="c_status">No Connection</span></li>
-				<li><img src="assets/connection/gmail.png" alt="" class="c_icon"><h1 class="c_name">Gmail</h1></li>
+				<li><img src="/assets/connection/gmail.png" alt="" class="c_icon"><h1 class="c_name">Gmail</h1></li>
 				<li><label for="">Account</label><input type="text"></li>
 				<li><label for="">Password</label><input type="password"></li>
 				<li>
@@ -12,7 +12,7 @@
 			<div id="st1" class="st_c">
 				<div class="theme_list ssl">
 					<% @themes.each do |theme| %>
-						<div id="<%= theme.id %>" class="ssl_item"><div class="theme_thumb"><img src="assets/sample_theme.jpg" alt="" width="120" height="96"></div><span class="theme_name ssl_des"><%= theme.name %></span></div>
+						<div id="<%= theme.id %>" class="ssl_item"><div class="theme_thumb"><img src="/assets/sample_theme.jpg" alt="" width="120" height="96"></div><span class="theme_name ssl_des"><%= theme.name %></span></div>
 						<% end %>
 				</div>
 			</div>
@@ -63,18 +63,18 @@
 			</div>
 			<div id="st3" class="st_c">
 				<div class="stock_wallpaper ssl">
-					<div class="sb1 ssl_item"><img src="assets/stockBackground/thumb/1.jpg" alt="1.jpg"></div>
-					<div class="sb2 ssl_item"><img src="assets/stockBackground/thumb/2.jpg" alt="2.jpg"></div>
-					<div class="sb3 ssl_item"><img src="assets/stockBackground/thumb/3.jpg" alt="3.jpg"></div>
-					<div class="sb4 ssl_item"><img src="assets/stockBackground/thumb/4.jpg" alt="4.jpg"></div>
-					<div class="sb5 ssl_item"><img src="assets/stockBackground/thumb/5.jpg" alt="5.jpg"></div>
-					<div class="sb6 ssl_item"><img src="assets/stockBackground/thumb/6.jpg" alt="6.jpg"></div>
-					<div class="sb7 ssl_item"><img src="assets/stockBackground/thumb/7.jpg" alt="7.jpg"></div>
-					<div class="sb8 ssl_item"><img src="assets/stockBackground/thumb/8.jpg" alt="8.jpg"></div>
-					<div class="sb9 ssl_item"><img src="assets/stockBackground/thumb/9.jpg" alt="9.jpg"></div>
-					<div class="sb10 ssl_item"><img src="assets/stockBackground/thumb/10.jpg" alt="10.jpg"></div>
-					<div class="sb11 ssl_item"><img src="assets/stockBackground/thumb/11.jpg" alt="11.jpg"></div>
-					<div class="sb12 ssl_item"><img src="assets/stockBackground/thumb/12.jpg" alt="12.jpg"></div>
+					<div class="sb1 ssl_item"><img src="/assets/stockBackground/thumb/1.jpg" alt="1.jpg"></div>
+					<div class="sb2 ssl_item"><img src="/assets/stockBackground/thumb/2.jpg" alt="2.jpg"></div>
+					<div class="sb3 ssl_item"><img src="/assets/stockBackground/thumb/3.jpg" alt="3.jpg"></div>
+					<div class="sb4 ssl_item"><img src="/assets/stockBackground/thumb/4.jpg" alt="4.jpg"></div>
+					<div class="sb5 ssl_item"><img src="/assets/stockBackground/thumb/5.jpg" alt="5.jpg"></div>
+					<div class="sb6 ssl_item"><img src="/assets/stockBackground/thumb/6.jpg" alt="6.jpg"></div>
+					<div class="sb7 ssl_item"><img src="/assets/stockBackground/thumb/7.jpg" alt="7.jpg"></div>
+					<div class="sb8 ssl_item"><img src="/assets/stockBackground/thumb/8.jpg" alt="8.jpg"></div>
+					<div class="sb9 ssl_item"><img src="/assets/stockBackground/thumb/9.jpg" alt="9.jpg"></div>
+					<div class="sb10 ssl_item"><img src="/assets/stockBackground/thumb/10.jpg" alt="10.jpg"></div>
+					<div class="sb11 ssl_item"><img src="/assets/stockBackground/thumb/11.jpg" alt="11.jpg"></div>
+					<div class="sb12 ssl_item"><img src="/assets/stockBackground/thumb/12.jpg" alt="12.jpg"></div>
 				</div>
 				<!-- <div class="s_action">
 					<div href="" class="setting_btn thmc1 thmtxt w1 hh2 hp" onclick="o.tempFunc();return false;">Confirm</a> 
@@ -0,0 +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-dashboard') + t(:dashboard_), admin_dashboards_path %></li>
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.new_admin.user'), admin_users_new_interface_index_path %></li>
+          </ul>
@@ -0,0 +1,15 @@
+          <a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
+          <ul class="dropdown-menu">
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-dashboard') + t(:dashboard_), admin_dashboards_path %></li>
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.new_admin.user'), 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>
+              <li><%#= link_to content_tag(:i, nil, :class => 'icons-asset') + t(:asset), admin_assets_path %></li>
+              <%if (is_admin? rescue false)%>
+              <li class="divider"></li>
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-structure') + t(:structure), admin_items_path %></li>
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('site.settings'), admin_site_site_info_path(@site) %></li>
+              <% end -%>
+              <li><%#= link_to content_tag(:i, nil, :class => 'icons-plus-cube') + t(:add_item) %></li>
+          </ul>
@@ -3,23 +3,9 @@
 		<div class="container clear">
 			<div class="dropdown orbit-logo pull-left">
 			    <% if !current_user.nil?  %>
-			    <a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
-			    <ul class="dropdown-menu">
-							<li><%= link_to content_tag(:i, nil, :class => 'icons-dashboard') + t(:dashboard_), admin_dashboards_path %></li>
-							<li><%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.new_admin.user'), 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>
-							<li><%#= link_to content_tag(:i, nil, :class => 'icons-asset') + t(:asset), admin_assets_path %></li>
-							<%if (is_admin? rescue false)%>
-			        <li class="divider"></li>
-							<li><%= link_to content_tag(:i, nil, :class => 'icons-structure') + t(:structure), admin_items_path %></li>
-							<li><%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('site.settings'), admin_site_site_info_path(@site) %></li>
-							<% end -%>
-			        <li><%#= link_to content_tag(:i, nil, :class => 'icons-plus-cube') + t(:add_item) %></li>
-			    </ul>
+			    		<%= render :partial=>"layouts/member_orbit_menu"%>
 			    <% else %>
-			    	<a class="brand dropdown-toggle" data-toggle="dropdown" href="/">Orbit</a>
+			    		<%= render :partial=>"layouts/guest_orbit_menu"%>
 			    <% end -%>
 			</div>
 			<ul class="nav">
@@ -13,7 +13,7 @@
                      </div>
                  </div>
              </div>
-              <%= render :partial=>"placeholder_block",:locals=>{:values=>attribute_field.title_translations,:class_ext=>"pull-left",:label_ext=>t("admin.infos.name"),:field_name=>"info[attribute_fields][#{attribute_field_counter}][title_translations]"}%>
+              <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field.title_translations,:class_ext=>"pull-left",:label_ext=>t("admin.infos.name"),:field_name=>"info[attribute_fields][#{attribute_field_counter}][title_translations]"}%>
              <div class="control-group pull-left">
                  <label class="control-label" for=""><%= t("admin.infos.type")%></label>
                  <div class="controls">
@@ -42,16 +42,16 @@
                      </label>
                  </div>
              </div>
-              <%= render :partial=> "placeholder_block",:locals=>{:values=>attribute_field["typeA"]["placeholder"],:field_name=>"info[attribute_fields][#{attribute_field_counter}][typeA][placeholder]"}%>
+              <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field["typeA"]["placeholder"],:field_name=>"info[attribute_fields][#{attribute_field_counter}][typeA][placeholder]"}%>
          <% end %>

          <%= content_tag :div,:class=>show_type_panel(attribute_field,"typeB") do %>
-              <%= render :partial=> "placeholder_block",:locals=>{:label_ext=>t("admin.infos.initial"),:values=>attribute_field["typeB"]["initial"],:field_name=>"info[attribute_fields][#{attribute_field_counter}][typeB][initial]"}%>
+              <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:label_ext=>t("admin.infos.initial"),:values=>attribute_field["typeB"]["initial"],:field_name=>"info[attribute_fields][#{attribute_field_counter}][typeB][initial]"}%>

              <% if attribute_field.self_defined_markup_options?%>
-                <%= render :partial=>"list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "info[attribute_fields][#{attribute_field_counter}][attribute][role][statuses]"} %>
+                <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "info[attribute_fields][#{attribute_field_counter}][attribute][role][statuses]"} %>
              <%else #normal list%>
-                  <%= render :partial=>"list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "info[attribute_fields][#{attribute_field_counter}][typeB][option_list]"} %>
+                  <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "info[attribute_fields][#{attribute_field_counter}][typeB][option_list]"} %>
              <% end #of self_defined_markup_options?%>
              
          <% end %>
@@ -66,10 +66,10 @@
                  <label class="control-label"><%= t("admin.infos.date.range")%></label>
                  <div class="controls">
                      <label class="radio inline">
-                          <%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "is_range", "false",:checked => (attribute_field["typeC"]["is_range"]== "false" ? true : false)) %><%= t("admin.infos.not_range")%>
+                          <%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "is_range", "false",:checked => (!attribute_field.date_is_range? ? true : false)) %><%= t("admin.infos.not_range")%>
                      </label>
                      <label class="radio inline">
-                        <%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "is_range", "true",:checked => (attribute_field["typeC"]["is_range"]== "true" ? true : false)) %><%= t("admin.infos.is_range")%>
+                        <%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "is_range", "true",:checked => (attribute_field.date_is_range? ? true : false)) %><%= t("admin.infos.is_range")%>
                      </label>
                  </div>
              </div>
@@ -95,10 +95,10 @@
                      </label>
                  </div>
              </div>
-              <%= render :partial=> "placeholder_block",:locals=>{:field_name=>"info[attribute_fields][#{attribute_field_counter}][typeD][placeholder]",:values=>attribute_field["typeD"]["placeholder"]} %>
+              <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:field_name=>"info[attribute_fields][#{attribute_field_counter}][typeD][placeholder]",:values=>attribute_field["typeD"]["placeholder"]} %>
          <% end %>
          <%= content_tag :div,:class=>show_type_panel(attribute_field,"typeE") do%>
-              <%= render :partial=>"list_block",:locals=>{:field_name=>"info[attribute_fields][#{attribute_field_counter}][typeE][option_list]",:values=>attribute_field["option_list"]}%>
+              <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:field_name=>"info[attribute_fields][#{attribute_field_counter}][typeE][option_list]",:values=>attribute_field["option_list"]}%>
          <% end %>
      </div>
      <%= hidden_field "info[attribute_fields][#{attribute_field_counter}]","id",:value=>attribute_field.id%>
@@ -7,8 +7,8 @@
                            <% @site_valid_locales.each do |locale| %>
                              <% active = (locale == @site_valid_locales.first ? "active in" : "'") %>
                              <%= content_tag :div,:class=>"tab-pane fade #{active}",:id=>"#{name_to_id(field_name)}_#{locale}" do%>
-                              <% value = values[locale.to_s] rescue nil%>
-                              <%= text_field(field_name, locale,:value=>value,:placeholder=>t("langs.#{locale}")) %>
+                              <% locale_value = values[locale.to_s] rescue nil%>
+                              <%= text_field(field_name, locale,:value=>locale_value,:placeholder=>t("langs.#{locale}")) %>
                            <% end %>
                            <% end %>
                          </div>