diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb
index 7446117b6..57f205a65 100644
--- a/app/views/desktop/index.html.erb
+++ b/app/views/desktop/index.html.erb
@@ -13,7 +13,7 @@
-
+
diff --git a/public/desktop_themes/4f8d3f3c3b67fcd05f086358/images/d_seminar_p.png b/public/desktop_themes/4f8d3f3c3b67fcd05f086358/images/d_conference_p.png
similarity index 100%
rename from public/desktop_themes/4f8d3f3c3b67fcd05f086358/images/d_seminar_p.png
rename to public/desktop_themes/4f8d3f3c3b67fcd05f086358/images/d_conference_p.png
diff --git a/public/desktop_themes/4f8d3f3c3b67fcd05f086358/settings/4f8d3f3c3b67fcd05f086358.json b/public/desktop_themes/4f8d3f3c3b67fcd05f086358/settings/4f8d3f3c3b67fcd05f086358.json
index 64701e64d..2be2bcb87 100755
--- a/public/desktop_themes/4f8d3f3c3b67fcd05f086358/settings/4f8d3f3c3b67fcd05f086358.json
+++ b/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"
}
- }
\ No newline at end of file
+ }
diff --git a/public/desktop_themes/4f8d3f493b67fcd05f086359/images/d_seminar_p.png b/public/desktop_themes/4f8d3f493b67fcd05f086359/images/d_conference_p.png
similarity index 100%
rename from public/desktop_themes/4f8d3f493b67fcd05f086359/images/d_seminar_p.png
rename to public/desktop_themes/4f8d3f493b67fcd05f086359/images/d_conference_p.png
diff --git a/public/desktop_themes/4f8d3f493b67fcd05f086359/settings/4f8d3f493b67fcd05f086359.json b/public/desktop_themes/4f8d3f493b67fcd05f086359/settings/4f8d3f493b67fcd05f086359.json
index 64701e64d..2be2bcb87 100755
--- a/public/desktop_themes/4f8d3f493b67fcd05f086359/settings/4f8d3f493b67fcd05f086359.json
+++ b/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"
}
- }
\ No newline at end of file
+ }
diff --git a/public/desktop_themes/4f8d3f533b67fcd05f08635a/images/d_seminar_p.png b/public/desktop_themes/4f8d3f533b67fcd05f08635a/images/d_conference_p.png
similarity index 100%
rename from public/desktop_themes/4f8d3f533b67fcd05f08635a/images/d_seminar_p.png
rename to public/desktop_themes/4f8d3f533b67fcd05f08635a/images/d_conference_p.png
diff --git a/public/desktop_themes/4f8d3f533b67fcd05f08635a/settings/4f8d3f533b67fcd05f08635a.json b/public/desktop_themes/4f8d3f533b67fcd05f08635a/settings/4f8d3f533b67fcd05f08635a.json
index 21c4eee1e..b4e70f7a1 100755
--- a/public/desktop_themes/4f8d3f533b67fcd05f08635a/settings/4f8d3f533b67fcd05f08635a.json
+++ b/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"
}
- }
\ No newline at end of file
+ }
diff --git a/public/desktop_themes/4f8d3f5d3b67fcd05f08635b/images/d_seminar_p.png b/public/desktop_themes/4f8d3f5d3b67fcd05f08635b/images/d_conference_p.png
similarity index 100%
rename from public/desktop_themes/4f8d3f5d3b67fcd05f08635b/images/d_seminar_p.png
rename to public/desktop_themes/4f8d3f5d3b67fcd05f08635b/images/d_conference_p.png
diff --git a/public/desktop_themes/4f8d3f5d3b67fcd05f08635b/settings/4f8d3f5d3b67fcd05f08635b.json b/public/desktop_themes/4f8d3f5d3b67fcd05f08635b/settings/4f8d3f5d3b67fcd05f08635b.json
index 64701e64d..2be2bcb87 100755
--- a/public/desktop_themes/4f8d3f5d3b67fcd05f08635b/settings/4f8d3f5d3b67fcd05f08635b.json
+++ b/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"
}
- }
\ No newline at end of file
+ }
diff --git a/public/desktop_themes/4f8d3f673b67fcd05f08635c/images/d_seminar_p.png b/public/desktop_themes/4f8d3f673b67fcd05f08635c/images/d_conference_p.png
similarity index 100%
rename from public/desktop_themes/4f8d3f673b67fcd05f08635c/images/d_seminar_p.png
rename to public/desktop_themes/4f8d3f673b67fcd05f08635c/images/d_conference_p.png
diff --git a/public/desktop_themes/4f8d3f673b67fcd05f08635c/settings/4f8d3f673b67fcd05f08635c.json b/public/desktop_themes/4f8d3f673b67fcd05f08635c/settings/4f8d3f673b67fcd05f08635c.json
index 64701e64d..2be2bcb87 100755
--- a/public/desktop_themes/4f8d3f673b67fcd05f08635c/settings/4f8d3f673b67fcd05f08635c.json
+++ b/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"
}
- }
\ No newline at end of file
+ }
diff --git a/public/desktop_themes/4f8d3f783b67fcd05f08635d/images/d_seminar_p.png b/public/desktop_themes/4f8d3f783b67fcd05f08635d/images/d_conference_p.png
similarity index 100%
rename from public/desktop_themes/4f8d3f783b67fcd05f08635d/images/d_seminar_p.png
rename to public/desktop_themes/4f8d3f783b67fcd05f08635d/images/d_conference_p.png
diff --git a/public/desktop_themes/4f8d3f783b67fcd05f08635d/settings/4f8d3f783b67fcd05f08635d.json b/public/desktop_themes/4f8d3f783b67fcd05f08635d/settings/4f8d3f783b67fcd05f08635d.json
index 64701e64d..2be2bcb87 100755
--- a/public/desktop_themes/4f8d3f783b67fcd05f08635d/settings/4f8d3f783b67fcd05f08635d.json
+++ b/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"
}
- }
\ No newline at end of file
+ }
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_p_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_p_controller.rb
deleted file mode 100644
index c10256a99..000000000
--- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_p_controller.rb
+++ /dev/null
@@ -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
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_windows_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_windows_controller.rb
new file mode 100644
index 000000000..216448c8d
--- /dev/null
+++ b/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
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_p.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
similarity index 100%
rename from vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_p.html.erb
rename to vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
diff --git a/vendor/built_in_modules/personal_conference/config/routes.rb b/vendor/built_in_modules/personal_conference/config/routes.rb
index cd11c6c5d..250458776 100644
--- a/vendor/built_in_modules/personal_conference/config/routes.rb
+++ b/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'
- resources :conference_pages, :only => [:index, :new]
+ match 'conference_window' => 'conference_windows#conference_window'
+ resources :conference_pages
end
namespace :back_end do
match 'writing_conference_setting' => "writing_conferences#writing_conference_setting" ,:as => :writing_conference_setting