fixed conference icon and rename _p to _window of conference view

app/views/desktop/index.html.erb

@@ -13,7 +13,7 @@
 
         <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='initializeConference' href="<%= panel_personal_conference_desktop_conference_p_path %>" class="widget_fn wh3 hh3" id='d_conference_p' custom-load="conference" 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 callback-method='initializeConference' href="<%= panel_personal_conference_desktop_conference_window_path %>" class="widget_fn wh3 hh3" id='d_conference_p' custom-load="conference" 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 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>
 

public/desktop_themes/4f8d3f3c3b67fcd05f086358/settings/4f8d3f3c3b67fcd05f086358.json

@@ -9,7 +9,7 @@
 		"settings":"d_settings.png",
 		"publication":"d_publication.png",
 		"journal_p":"d_journal_p.png",
-		"seminar_p":"d_seminar_p.png",
+		"conference_p":"d_conference_p.png",
 		"books":"d_books.png",
 		"research":"d_research.png",
 		"research_d":"d_research_d.png",
@@ -36,4 +36,4 @@
 		"connection":"d_connection.png",
 		"appstore":"d_appstore.png"
 		}
-	}
+	}

public/desktop_themes/4f8d3f493b67fcd05f086359/settings/4f8d3f493b67fcd05f086359.json

@@ -9,7 +9,7 @@
 		"settings":"d_settings.png",
 		"publication":"d_publication.png",
 		"journal_p":"d_journal_p.png",
-		"seminar_p":"d_seminar_p.png",
+		"conference_p":"d_conference_p.png",
 		"books":"d_books.png",
 		"research":"d_research.png",
 		"research_d":"d_research_d.png",
@@ -36,4 +36,4 @@
 		"connection":"d_connection.png",
 		"appstore":"d_appstore.png"
 		}
-	}
+	}

public/desktop_themes/4f8d3f533b67fcd05f08635a/settings/4f8d3f533b67fcd05f08635a.json

@@ -9,7 +9,7 @@
 		"settings":"d_settings.png",
 		"publication":"d_publication.png",
 		"journal_p":"d_journal_p.png",
-		"seminar_p":"d_seminar_p.png",
+		"conference_p":"d_conference_p.png",
 		"books":"d_books.png",
 		"research":"d_research.png",
 		"research_d":"d_research_d.png",
@@ -36,4 +36,4 @@
 		"connection":"d_connection.png",
 		"appstore":"d_appstore.png"
 		}
-	}
+	}

public/desktop_themes/4f8d3f5d3b67fcd05f08635b/settings/4f8d3f5d3b67fcd05f08635b.json

@@ -9,7 +9,7 @@
 		"settings":"d_settings.png",
 		"publication":"d_publication.png",
 		"journal_p":"d_journal_p.png",
-		"seminar_p":"d_seminar_p.png",
+		"conference_p":"d_conference_p.png",
 		"books":"d_books.png",
 		"research":"d_research.png",
 		"research_d":"d_research_d.png",
@@ -36,4 +36,4 @@
 		"connection":"d_connection.png",
 		"appstore":"d_appstore.png"
 		}
-	}
+	}

public/desktop_themes/4f8d3f673b67fcd05f08635c/settings/4f8d3f673b67fcd05f08635c.json

@@ -9,7 +9,7 @@
 		"settings":"d_settings.png",
 		"publication":"d_publication.png",
 		"journal_p":"d_journal_p.png",
-		"seminar_p":"d_seminar_p.png",
+		"conference_p":"d_conference_p.png",
 		"books":"d_books.png",
 		"research":"d_research.png",
 		"research_d":"d_research_d.png",
@@ -36,4 +36,4 @@
 		"connection":"d_connection.png",
 		"appstore":"d_appstore.png"
 		}
-	}
+	}

public/desktop_themes/4f8d3f783b67fcd05f08635d/settings/4f8d3f783b67fcd05f08635d.json

@@ -9,7 +9,7 @@
 		"settings":"d_settings.png",
 		"publication":"d_publication.png",
 		"journal_p":"d_journal_p.png",
-		"seminar_p":"d_seminar_p.png",
+		"conference_p":"d_conference_p.png",
 		"books":"d_books.png",
 		"research":"d_research.png",
 		"research_d":"d_research_d.png",
@@ -36,4 +36,4 @@
 		"connection":"d_connection.png",
 		"appstore":"d_appstore.png"
 		}
-	}
+	}

vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_p_controller.rb

@@ -1,5 +0,0 @@
-class Panel::PersonalConference::Desktop::ConferencePController < ApplicationController
-  def conference_p
-    render panel_personal_conference_desktop_conference_p_path, :layout => false
-  end
-end

vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_windows_controller.rb

@@ -0,0 +1,5 @@
+class Panel::PersonalConference::Desktop::ConferenceWindowsController < ApplicationController
+  def conference_window
+    render panel_personal_conference_desktop_conference_window_path, :layout => false
+  end
+end

vendor/built_in_modules/personal_conference/config/routes.rb

@@ -3,8 +3,8 @@ Rails.application.routes.draw do
   namespace :panel do
     namespace :personal_conference do
       namespace :desktop do
-        match 'conference_p' => 'conference_p#conference_p'
+        match 'conference_window' => 'conference_windows#conference_window'
-        resources :conference_pages, :only => [:index, :new]
+        resources :conference_pages
       end
       namespace :back_end do
         match 'writing_conference_setting' => "writing_conferences#writing_conference_setting" ,:as => :writing_conference_setting