relpace seminar to conference

app/assets/javascripts/desktop.js

@@ -15,4 +15,4 @@
 //= require orbitTimeline
 //= require orbitdesktop
 //= require desktop/books_pages
-//= require desktop/seminar_pages
+//= require desktop/conference_pages

app/assets/javascripts/desktop/conference_pages.js

@@ -1,6 +1,6 @@
-orbitDesktop.prototype.initializeSeminar = function(target,url,cache){
+orbitDesktop.prototype.initializeConference = function(target,url,cache){
 
-    this.initializeSeminar.list = function(){
+    this.initializeConference.list = function(){
       var bindHandlers = function(){
         o.tinyscrollbar_ext({
           main : ".tinycanvas",
@@ -13,7 +13,7 @@ orbitDesktop.prototype.initializeSeminar = function(target,url,cache){
 
     }
 
-    this.initializeSeminar.addseminar = function(){
+    this.initializeConference.addconference = function(){
       var bindHandlers = function(){
         o.simple_drop_down();
 
@@ -26,7 +26,7 @@ orbitDesktop.prototype.initializeSeminar = function(target,url,cache){
       bindHandlers();
 
     }
-    this.initializeSeminar.seminar = function(){
+    this.initializeConference.conference = function(){
       var bindHandlers = function(){
         o.simple_drop_down();
 
@@ -39,7 +39,7 @@ orbitDesktop.prototype.initializeSeminar = function(target,url,cache){
       bindHandlers();
 
     }
-    this.initializeSeminar.rues = function(){
+    this.initializeConference.rues = function(){
       var bindHandlers = function(){
         o.simple_drop_down();
 
@@ -53,6 +53,6 @@ orbitDesktop.prototype.initializeSeminar = function(target,url,cache){
 
     }
    
-    this.initializeSeminar.list();
+    this.initializeConference.list();
 
-  }
+  }

app/controllers/desktop_publications_controller.000.rb

@@ -1,75 +0,0 @@
-class DesktopPublicationsController< ApplicationController
-	  def journal_p
-      	render "desktop/journal_p", :layout => false
-   	end
-  
-  	def journal_p_list
-    	render "desktop/journal_pages/list", :layout => false
-  	end
-  
-  	def journal_p_add
-      debugger
-    	render "desktop/journal_pages/add", :layout => false
-  	end
-
-    def books
-      render "desktop/books", :layout => false
-    end
-
-    def books_list
-        render "desktop/books/list", :layout => false
-    end
-
-    def books_add
-        render "desktop/books/add", :layout => false
-    end
-
-    def seminar_p
-      render "desktop/seminar_p", :layout => false
-    end
-
-    def seminar_p_list
-        render "desktop/seminar_pages/list", :layout => false
-    end
-
-    def seminar_p_add
-        render "desktop/seminar_pages/add", :layout => false
-    end
-
-  	def create_journal
-  		Journal.create(user_id: current_user.id, title: "Ice Cream Sandwich")
-  		b = Array.new
-    	b << {"success"=>"true"}
-    	render :json=>b.to_json
-  	end
-
-  	def getjournals
-  		@journals = current_user.journals
-  		data = Array.new
-  		@journals.each do |journal|
-  			@papers = journal.papers.all
-  			data << {"title" => journal.title, "papers" => @papers}
-  		end
-  		render :json=>data.to_json
-  	end
-
-    def delete_journal
-      @journals = Journal.find("")
-      @journals.delete
-      b = Array.new
-      b << {"success"=>"true"}
-      render :json=>b.to_json
-    end
-
-    def update_journal
-      @journal = Journal.find("4ff2d6ebbd98eb02b9000017")
-      @papers = @journal.papers
-      @papers.each do |paper|
-        paper.update_attributes(:user_id => current_user.id)
-      end
-       b = Array.new
-
-      b << {"success"=>"true"}
-      render :json=>b.to_json
-    end
-end

app/controllers/desktop_publications_controller.rb

@@ -17,16 +17,16 @@ class DesktopPublicationsController< ApplicationController
     render "desktop/books/add", :layout => false
   end
 
-  def seminar_p
-    render "desktop/seminar_p", :layout => false
+  def conference_p
+    render "desktop/conference_p", :layout => false
   end
 
-  def seminar_p_list
-    render "desktop/seminar_pages/list", :layout => false
+  def conference_p_list
+    render "desktop/conference_pages/list", :layout => false
   end
 
-  def seminar_p_add
-    render "desktop/seminar_pages/add", :layout => false
+  def conference_p_add
+    render "desktop/conference_pages/add", :layout => false
   end
 
 #  def create_journal

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='initializeSeminar' href="<%= desktop_publications_seminar_p_path %>" class="widget_fn wh3 hh3" id='d_seminar_p' custom-load="seminar" onclick="return false;"><span class="widget_icon"><img src="" alt="Seminar Papers" id="seminar_p_icon" width="30" height="30"/></span></a></li>
+        <li class="dock_item"><a callback-method='initializeConference' href="<%= desktop_publications_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='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>
 

app/views/desktop/patents/add.html.erb

@@ -41,10 +41,10 @@
 		<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="">Seminar Title</textarea></li>
+					<li class="s_grid_row"><textarea class="s_grid_6 s_grid" name="" id="">Conference Title</textarea></li>
 					<li class="s_grid_row">
 					<label>Paper type</label><input type="radio" name="" value="Books" />Oral<input type="radio" name="" value="Chapter" />Poster</li>
-					<li class="s_grid_row"><label>Seminar time</label></li>
+					<li class="s_grid_row"><label>Conference time</label></li>
 					
 					<li class="s_grid_row"><select name="" id="" class="s_grid s_grid_1">
 							<option value=""></option>
@@ -104,4 +104,4 @@
 			</div>
 		</div>
 	</div>
-</div>
+</div>

app/views/desktop/research_domain/add.html.erb

@@ -41,10 +41,10 @@
 		<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="">Seminar Title</textarea></li>
+					<li class="s_grid_row"><textarea class="s_grid_6 s_grid" name="" id="">Conference Title</textarea></li>
 					<li class="s_grid_row">
 					<label>Paper type</label><input type="radio" name="" value="Books" />Oral<input type="radio" name="" value="Chapter" />Poster</li>
-					<li class="s_grid_row"><label>Seminar time</label></li>
+					<li class="s_grid_row"><label>Conference time</label></li>
 					
 					<li class="s_grid_row"><select name="" id="" class="s_grid s_grid_1">
 							<option value=""></option>
@@ -104,4 +104,4 @@
 			</div>
 		</div>
 	</div>
-</div>
+</div>

app/views/desktop/research_project/add.html.erb

@@ -41,10 +41,10 @@
 		<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="">Seminar Title</textarea></li>
+					<li class="s_grid_row"><textarea class="s_grid_6 s_grid" name="" id="">Conference Title</textarea></li>
 					<li class="s_grid_row">
 					<label>Paper type</label><input type="radio" name="" value="Books" />Oral<input type="radio" name="" value="Chapter" />Poster</li>
-					<li class="s_grid_row"><label>Seminar time</label></li>
+					<li class="s_grid_row"><label>Conference time</label></li>
 					
 					<li class="s_grid_row"><select name="" id="" class="s_grid s_grid_1">
 							<option value=""></option>
@@ -104,4 +104,4 @@
 			</div>
 		</div>
 	</div>
-</div>
+</div>

app/views/desktop/seminar_p.html.erb

@@ -1,8 +1,8 @@
-<div id="seminar_p">
+<div id="conference_p">
 	<div id="content">
 		<div id="header" class="hh3">
 			<div class="dtitle w2 hh3 hp">
-				<span class="thmtxth">Seminar</span>
+				<span class="thmtxth">Conference</span>
 			</div>
 			<div id="search_app" class="hfn w2 hh2 hp thmc3">
 			<input type="text" class="ini_input form" value="Search" id="searchbox" />
@@ -13,10 +13,10 @@
 			<div id="panel_l" class="ph">
 				<div class="s_menu sm_v" content-type="menu">
 					<ul id='setting_left_nav'>
-						<li><a href="<%= desktop_publications_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" custom-load="add" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
-						<li><a href="<%= desktop_publications_seminar_p_add_path %>" callback-method="seminar" class="admtxt hh2 w2 hp" onclick='return false;'>Seminar</a></li>
-						<li><a href="<%= desktop_publications_seminar_p_list_path %>" callback-method="rues" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
+						<li><a href="<%= desktop_publications_conference_p_list_path %>" callback-method="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
+						<li><a href="<%= desktop_publications_conference_p_add_path %>" callback-method="addconference" custom-load="add" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
+						<li><a href="<%= desktop_publications_conference_p_add_path %>" callback-method="conference" class="admtxt hh2 w2 hp" onclick='return false;'>Conference</a></li>
+						<li><a href="<%= desktop_publications_conference_p_list_path %>" callback-method="rues" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
 						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags &amp; Keywords</a></li>
 						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Analysis</a></li>
 						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Import</a></li>
@@ -30,4 +30,4 @@
 		</div>
 	</div>
 	</div>
-</div>
+</div>

app/views/desktop/seminar_pages/add.html.erb

@@ -41,10 +41,10 @@
 		<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="">Seminar Title</textarea></li>
+					<li class="s_grid_row"><textarea class="s_grid_6 s_grid" name="" id="">Conference Title</textarea></li>
 					<li class="s_grid_row">
 					<label>Paper type</label><input type="radio" name="" value="Books" />Oral<input type="radio" name="" value="Chapter" />Poster</li>
-					<li class="s_grid_row"><label>Seminar time</label></li>
+					<li class="s_grid_row"><label>Conference time</label></li>
 					
 					<li class="s_grid_row"><select name="" id="" class="s_grid s_grid_1">
 							<option value=""></option>
@@ -104,4 +104,4 @@
 			</div>
 		</div>
 	</div>
-</div>
+</div>