fixed conference icon and rename _p to _window of conference view
|
@ -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='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>
|
<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>
|
||||||
|
|
||||||
|
|
Before Width: | Height: | Size: 532 B After Width: | Height: | Size: 532 B |
|
@ -9,7 +9,7 @@
|
||||||
"settings":"d_settings.png",
|
"settings":"d_settings.png",
|
||||||
"publication":"d_publication.png",
|
"publication":"d_publication.png",
|
||||||
"journal_p":"d_journal_p.png",
|
"journal_p":"d_journal_p.png",
|
||||||
"seminar_p":"d_seminar_p.png",
|
"conference_p":"d_conference_p.png",
|
||||||
"books":"d_books.png",
|
"books":"d_books.png",
|
||||||
"research":"d_research.png",
|
"research":"d_research.png",
|
||||||
"research_d":"d_research_d.png",
|
"research_d":"d_research_d.png",
|
||||||
|
@ -36,4 +36,4 @@
|
||||||
"connection":"d_connection.png",
|
"connection":"d_connection.png",
|
||||||
"appstore":"d_appstore.png"
|
"appstore":"d_appstore.png"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Before Width: | Height: | Size: 532 B After Width: | Height: | Size: 532 B |
|
@ -9,7 +9,7 @@
|
||||||
"settings":"d_settings.png",
|
"settings":"d_settings.png",
|
||||||
"publication":"d_publication.png",
|
"publication":"d_publication.png",
|
||||||
"journal_p":"d_journal_p.png",
|
"journal_p":"d_journal_p.png",
|
||||||
"seminar_p":"d_seminar_p.png",
|
"conference_p":"d_conference_p.png",
|
||||||
"books":"d_books.png",
|
"books":"d_books.png",
|
||||||
"research":"d_research.png",
|
"research":"d_research.png",
|
||||||
"research_d":"d_research_d.png",
|
"research_d":"d_research_d.png",
|
||||||
|
@ -36,4 +36,4 @@
|
||||||
"connection":"d_connection.png",
|
"connection":"d_connection.png",
|
||||||
"appstore":"d_appstore.png"
|
"appstore":"d_appstore.png"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Before Width: | Height: | Size: 532 B After Width: | Height: | Size: 532 B |
|
@ -9,7 +9,7 @@
|
||||||
"settings":"d_settings.png",
|
"settings":"d_settings.png",
|
||||||
"publication":"d_publication.png",
|
"publication":"d_publication.png",
|
||||||
"journal_p":"d_journal_p.png",
|
"journal_p":"d_journal_p.png",
|
||||||
"seminar_p":"d_seminar_p.png",
|
"conference_p":"d_conference_p.png",
|
||||||
"books":"d_books.png",
|
"books":"d_books.png",
|
||||||
"research":"d_research.png",
|
"research":"d_research.png",
|
||||||
"research_d":"d_research_d.png",
|
"research_d":"d_research_d.png",
|
||||||
|
@ -36,4 +36,4 @@
|
||||||
"connection":"d_connection.png",
|
"connection":"d_connection.png",
|
||||||
"appstore":"d_appstore.png"
|
"appstore":"d_appstore.png"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Before Width: | Height: | Size: 532 B After Width: | Height: | Size: 532 B |
|
@ -9,7 +9,7 @@
|
||||||
"settings":"d_settings.png",
|
"settings":"d_settings.png",
|
||||||
"publication":"d_publication.png",
|
"publication":"d_publication.png",
|
||||||
"journal_p":"d_journal_p.png",
|
"journal_p":"d_journal_p.png",
|
||||||
"seminar_p":"d_seminar_p.png",
|
"conference_p":"d_conference_p.png",
|
||||||
"books":"d_books.png",
|
"books":"d_books.png",
|
||||||
"research":"d_research.png",
|
"research":"d_research.png",
|
||||||
"research_d":"d_research_d.png",
|
"research_d":"d_research_d.png",
|
||||||
|
@ -36,4 +36,4 @@
|
||||||
"connection":"d_connection.png",
|
"connection":"d_connection.png",
|
||||||
"appstore":"d_appstore.png"
|
"appstore":"d_appstore.png"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Before Width: | Height: | Size: 532 B After Width: | Height: | Size: 532 B |
|
@ -9,7 +9,7 @@
|
||||||
"settings":"d_settings.png",
|
"settings":"d_settings.png",
|
||||||
"publication":"d_publication.png",
|
"publication":"d_publication.png",
|
||||||
"journal_p":"d_journal_p.png",
|
"journal_p":"d_journal_p.png",
|
||||||
"seminar_p":"d_seminar_p.png",
|
"conference_p":"d_conference_p.png",
|
||||||
"books":"d_books.png",
|
"books":"d_books.png",
|
||||||
"research":"d_research.png",
|
"research":"d_research.png",
|
||||||
"research_d":"d_research_d.png",
|
"research_d":"d_research_d.png",
|
||||||
|
@ -36,4 +36,4 @@
|
||||||
"connection":"d_connection.png",
|
"connection":"d_connection.png",
|
||||||
"appstore":"d_appstore.png"
|
"appstore":"d_appstore.png"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Before Width: | Height: | Size: 532 B After Width: | Height: | Size: 532 B |
|
@ -9,7 +9,7 @@
|
||||||
"settings":"d_settings.png",
|
"settings":"d_settings.png",
|
||||||
"publication":"d_publication.png",
|
"publication":"d_publication.png",
|
||||||
"journal_p":"d_journal_p.png",
|
"journal_p":"d_journal_p.png",
|
||||||
"seminar_p":"d_seminar_p.png",
|
"conference_p":"d_conference_p.png",
|
||||||
"books":"d_books.png",
|
"books":"d_books.png",
|
||||||
"research":"d_research.png",
|
"research":"d_research.png",
|
||||||
"research_d":"d_research_d.png",
|
"research_d":"d_research_d.png",
|
||||||
|
@ -36,4 +36,4 @@
|
||||||
"connection":"d_connection.png",
|
"connection":"d_connection.png",
|
||||||
"appstore":"d_appstore.png"
|
"appstore":"d_appstore.png"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
|
|
@ -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
|
|
@ -3,8 +3,8 @@ Rails.application.routes.draw do
|
||||||
namespace :panel do
|
namespace :panel do
|
||||||
namespace :personal_conference do
|
namespace :personal_conference do
|
||||||
namespace :desktop 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
|
end
|
||||||
namespace :back_end do
|
namespace :back_end do
|
||||||
match 'writing_conference_setting' => "writing_conferences#writing_conference_setting" ,:as => :writing_conference_setting
|
match 'writing_conference_setting' => "writing_conferences#writing_conference_setting" ,:as => :writing_conference_setting
|
||||||
|
|