developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modularize conference

This commit is contained in:
Rueshyna 2013-01-24 18:25:09 +08:00 committed by chris
parent d4df7c82d3
commit 8f334f6948
13 changed files with 60 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/desktop.js
View File

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

44
app/controllers/desktop_publications_controller.rb
View File

@ -1,10 +1,6 @@
require 'mime/types'
class DesktopPublicationsController< ApplicationController
#def journal_p
# render "desktop/journal_p", :layout => false
#end
def books
render "desktop/books", :layout => false
end
@ -16,44 +12,4 @@ class DesktopPublicationsController< ApplicationController
def books_add
render "desktop/books/add", :layout => false
end
def conference_p
render "desktop/conference_p", :layout => false
end
def conference_p_list
render "desktop/conference_pages/list", :layout => false
end
def conference_p_add
render "desktop/conference_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 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

3
app/views/desktop/index.html.erb
View File

@ -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="<%= 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='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='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>
@ -103,3 +103,4 @@
o.notify("Welcome "+o.currentUsername+"!!","alert",3);
</script>
<%= javascript_include_tag "personal_journal" %>
<%= javascript_include_tag "personal_conference" %>

33
app/views/desktop/seminar_p.html.erb
View File

@ -1,33 +0,0 @@
<div id="conference_p">
<div id="content">
<div id="header" class="hh3">
<div class="dtitle w2 hh3 hp">
<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" />
<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_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>
<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>

1
vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference.js vendored Normal file
View File

@ -0,0 +1 @@
//= require_tree ./personal_conference/desktop

0
vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/.gitkeep vendored Normal file
View File

2
app/assets/javascripts/desktop/conference_pages.js → vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js vendored
View File

@ -39,7 +39,7 @@ orbitDesktop.prototype.initializeConference = function(target,url,cache){
bindHandlers();
}
this.initializeConference.rues = function(){
this.initializeConference.coauthor = function(){
var bindHandlers = function(){
o.simple_drop_down();

5
vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_p_controller.rb vendored Normal file
View File

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

14
vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb vendored Normal file
View File

@ -0,0 +1,14 @@
class Panel::PersonalConference::Desktop::ConferencePagesController < ApplicationController
def index
respond_to do |format|
format.html { render :layout => false}
end
end
def new
respond_to do |format|
format.html { render :layout => false}
end
end
end

33
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_p.html.erb vendored Normal file
View File

@ -0,0 +1,33 @@
<div id="conference_p">
<div id="content">
<div id="header" class="hh3">
<div class="dtitle w2 hh3 hp">
<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" />
<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="<%= panel_personal_conference_desktop_conference_pages_path %>" callback-method="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
<li><a href="" callback-method="addconference" custom-load="add" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
<li><a href="<%= new_panel_personal_conference_desktop_conference_page_path %>" callback-method="conference" class="admtxt hh2 w2 hp" onclick='return false;'>Conference</a></li>
<li><a href="" callback-method="coauthor" 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" container="true" class="ph pw admbg hp">
</div>
<div class="clear"></div>
</div>
</div>
</div>
</div>

0
app/views/desktop/seminar_pages/list.html.erb → vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb vendored
View File

0
app/views/desktop/seminar_pages/add.html.erb → vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/new.html.erb vendored
View File

4
vendor/built_in_modules/personal_conference/config/routes.rb vendored
View File

@ -2,6 +2,10 @@ 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]
end
namespace :back_end do
match 'writing_conference_setting' => "writing_conferences#writing_conference_setting" ,:as => :writing_conference_setting
resources :writing_conferences do