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

lib/desktopapp/views/index.html.erb

@@ -11,7 +11,7 @@
 			<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>
 				<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="conference_p" class="widget_fn wh3 hh3" id='d_conference_p' onclick="return false;"><span class="widget_icon"><img src="" alt="Conference Papers" id="conference_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>
 				</ul>
 			</li>

lib/parsers/parser_front_end.rb

@@ -102,7 +102,7 @@ module ParserFrontEnd
         if page.app_frontend_url == 'default_widget'
           url = "/panel/orbit_app/widget/#{page.frontend_style}?inner=true"
         else
-           "/panel/#{page.module_app.key}/front_end/#{page.app_frontend_url}\#{(\"/\" + params[:id]) if params[:id] && !params[:id].eql?(page.id.to_s)}\#{(\"/\" + params[:controller_action]) if params[:controller_action] && params[:id]}?inner=true"
+           url = "/panel/#{page.module_app.key}/front_end/#{page.app_frontend_url}\#{(\"/\" + params[:id]) if params[:id] && !params[:id].eql?(page.id.to_s)}\#{(\"/\" + params[:controller_action]) if params[:controller_action] && params[:id]}?inner=true"
         end
 
         

lib/tasks/migrate.rake

@@ -351,7 +351,8 @@ namespace :migrate do
   end
 
 
-  task :make_default_widget_work_config => :environment do
+
+  task :make_default_widget_work_config_for_announcement => :environment do
     a = ModuleApp.where(:key=>'announcement').first
     a.widgets[:default_widget] = ['typeA','typeC','typeB_style2','typeB_style3','typeB_style4']
     a.widgets = {"index"=>["1", "2"],  "default_widget"=>["typeA", "typeC", "typeB_style2", "typeB_style3", "typeB_style4"]} 
@@ -371,6 +372,24 @@ namespace :migrate do
     a.save
   end
 
+  task :make_default_widget_work_config_for_web_link => :environment do
+    a = ModuleApp.where(:key=>'web_resource').first
+    a.widgets = { "default_widget"=>["typeA", "typeC", "typeB_style2", "typeB_style3", "typeB_style4"]} 
+    a.widget_fields = [
+      ["title","web_link.default_widget.title"],
+      ["web_link_with_title","web_link.default_widget.bulletin_category_with_title"]
+      ]
+    a.get_default_widget = {:query=>'WebLink.all'}
+    a.widget_fields_link_method = {
+        "title"=>{:method => 'panel_web_resource_front_end_web_link_path',
+                      :args=>:self},
+        "web_link_with_title"=>{
+                    :method => 'panel_web_resource_front_end_web_link_path',
+                    :args=>{:category_id => [:web_link_category,:id]}}
+      }
+    a.save
+  end
+
 
   task :reorder_items => :environment do
     reorder_children(Item.root)
@@ -412,4 +431,13 @@ namespace :migrate do
     
   end
 
+  task :clean_module_app_objects => :environment do
+    ModuleApp.all.each do |ma|
+      %w{intro widget_fields_link_method widgets  get_default_widget app_pages author enable_frontend get_widget_style get_widget_style organization update_info using_default_widget version widget_fields version create_date}.each  do |field| 
+        ma.unset field
+      end
+      ma.save
+    end
+  end
+
 end