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

Merge branch 'publication' into journal_list

Browse Source 
* publication: (23 commits)
  adjust update password textfield position
  correct user passwd and sent json to front-end
  correct user passwd and sent json to front-end
  if coauthor not in coauthor db then it will be add in db
  fixed journal update method
  jumping menus updated..
  remove edit page cancel buttom
  delete fixed..
  multiple file fixed
  have done multiple file
  can add multiple file
  Module store
  Joshua's html
  Change icons
  add quick link to change user password, but it's not work
  change template
  add templete
  add templete
  url fixed and edit form fixed for tinyscrollbar
  easy to make fake data
  ...
This commit is contained in:
Rueshyna committed 2012-11-30 21:02:18 +08:00
2 parents 2f05885c4a 192779fb6e
commit ccacef6d9e
107 files changed
+3638 -1066
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/admin/ad_images/_form.html.erb
+5 -5
View File
@@ -19,7 +19,7 @@
<div class="widget-action clear">
<a href="#" class="action"><i title="Set the announcement to start and end dates" class="icon-exclamation-sign icon-white tip"></i></a>
</div>
<h3 class="widget-title"><i class="icons-calendar icons-white"></i><%= t('nccu.date') %></h3>
<h3 class="widget-title"><i class="icons-calendar"></i><%= t('nccu.date') %></h3>
<div class="widget-content clear">
<div id="calendarRange">
<div class="input-append">
@@ -73,7 +73,7 @@
<div class="widget-action clear">
<a class="action"><i title="Upload pictures" class="icon-exclamation-sign icon-white tip"></i></a>
</div>
<h3 class="widget-title"><i class="icons-picture icons-white"></i><%= t('nccu.picture') %></h3>
<h3 class="widget-title"><i class="icons-pictures"></i><%= t('nccu.picture') %></h3>
<div class="widget-content clear">
<div class="control-group">
<div class="upload-picture">
@@ -101,7 +101,7 @@
<div class="widget-action clear">
<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="Upload pictures"></i></a>
</div>
<h3 class="widget-title"><i class="icons-star-thin icons-white"></i><%= t(:type) %></h3>
<h3 class="widget-title"><i class="icons-star-thin"></i><%= t(:type) %></h3>
<div class="widget-content clear">
<%= f.select :link_open ,AdImage::LINK_OPEN_TYPES%>
</div>
@@ -111,7 +111,7 @@
<div class="widget-action clear">
<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="Set the range time"></i></a>
</div>
<h3 class="widget-title"><i class="icons-time icons-white"></i><%= t(:frequency) %></h3>
<h3 class="widget-title"><i class="icons-time"></i><%= t(:frequency) %></h3>
<div class="widget-content clear">
<%= f.text_field :weight ,:class=> 'span3',:placeholder=>"在套圖中出現次數 1次請輸入1" %>
</div>
@@ -121,7 +121,7 @@
<div class="widget-action clear">
<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="Add a reference link"></i></a>
</div>
<h3 class="widget-title"><i class="icons-link icons-white"></i><%= t(:link) %></h3>
<h3 class="widget-title"><i class="icons-landscape"></i><%= t(:link) %></h3>
<div class="widget-content clear">
<%= f.text_field :out_link ,:class=> 'span3',:placeholder => "輸入連結"%>
</div>
app/views/admin/assets/_asset.html.erb
+1 -1
View File
@@ -2,7 +2,7 @@
<td><%= check_box_tag 'to_delete[]', asset.id, false, :class => "checkbox_in_list" %></td>
<td><%= asset.title rescue nil %></td>
<td>
<i class="icons-picture img-peview" rel="popover" data-content="<img src='<%= asset.data.url %>' />" data-original-title="<%= asset.data.filename %>"></i>
<i class="icons-pictures img-peview" rel="popover" data-content="<img src='<%= asset.data.url %>' />" data-original-title="<%= asset.data.filename %>"></i>
<div class="quick-edit">
<ul class="nav nav-pills hide">
<li><%= link_to t(:edit), edit_admin_asset_path(asset), :remote => true, :class => 'edit' %></li>
app/views/admin/dashboards/index.html.erb
+4 -4
View File
@@ -3,7 +3,7 @@
<% end -%>
<div id="isotope">
<div class="item element">
<h3><i class="icons-content"></i><%= t(:content) %></h3>
<h3><i class="icons-booklet"></i><%= t(:content) %></h3>
<div class="detail w-a h-a">
<p class="totle"><span><%= t(:all_content) %></span><%= @module_app_contents_total %></p>
<table class="table table-striped">
@@ -445,7 +445,7 @@
<div class="item element">
<h3><i class="icons-"></i><%= t(:traffic) %></h3>
<h3><i class="icons-plane"></i><%= t(:traffic) %></h3>
<div class="detail w-a h-a">
<p class="totle"><span><%= t(:total_visitors) %></span><%= display_visitors %></p>
<table class="table table-striped">
@@ -493,7 +493,7 @@
</div>
<div class="item element">
<h3><i class="icons-"></i><%= t(:recent_update) %></h3>
<h3><i class="icons-update"></i><%= t(:recent_update) %></h3>
<div class="detail noStatistics w-b h-a">
<table class="table table-striped">
<thead>
@@ -530,7 +530,7 @@
</div>
<div class="item element">
<h3><i class="icons-"></i><%= t(:most_visited_page) %></h3>
<h3><i class="icons-trophy"></i><%= t(:most_visited_page) %></h3>
<div class="detail noStatistics w-b h-a">
<table class="table table-striped">
<thead>
app/views/admin/module_store/index.html.erb
+58
View File
@@ -0,0 +1,58 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
<% end %>
<% content_for :page_specific_css do %>
<%= stylesheet_link_tag 'modulestore' %>
<% end %>
<% content_for :page_specific_javascript do %>
<%= javascript_include_tag 'lib/jquery.cycle.all.latest.js' %>
<script type="text/javascript">
// Banner slideshow
$(function() {
$('.slide').cycle({
fx: 'scrollRight',
speed: 600,
timeout: 4000,
slideExpr: 'img',
next: '.next',
prev: '.prev'
});
});
</script>
<% end %>
<div class="md-bg">
<div class="modulestore md-store">
<div class="header">
<h1 class="home"><a href="modulestore">Orbit Module Store</a></h1>
<div class="slide-wrap">
<div class="slide-feature"></div>
<div class="slide">
<div class="slide-nav">
<a class="prev" href="#">&lsaquo;</a>
<a class="next" href="#">&rsaquo;</a>
</div>
<a href="#"><img src="<%= asset_path 'modulestore/slide01.jpg' %>"></a>
<a href="#"><img src="<%= asset_path 'modulestore/slide01.jpg' %>"></a>
<a href="#"><img src="<%= asset_path 'modulestore/slide01.jpg' %>"></a>
</div>
</div>
</div>
<div class="main">
<div class="app-list row">
<% 9.times do %>
<div class="app span3">
<a href="module_store/show">
<img src="<%= asset_path 'modulestore/app.jpg' %>" alt="App" />
<div class="detail">
<strong class="apptitle">Orange theme</strong>
<em class="price">Free download</em>
</div>
</a>
</div>
<% end %>
</div>
</div>
</div>
app/views/admin/module_store/show.html.erb
+97
View File
@@ -0,0 +1,97 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
<% end %>
<% content_for :page_specific_css do %>
<%= stylesheet_link_tag 'modulestore' %>
<% end %>
<% content_for :page_specific_javascript do %>
<%= javascript_include_tag 'lib/jquery.cycle.all.latest.js' %>
<script type="text/javascript">
$(function() {
$('.slide').cycle({
fx: 'scrollRight',
speed: 'fast',
timeout: 4000,
pager: '.detail-slide-nav',
pagerEvent: 'mouseover',
slideExpr: 'img'
});
});
</script>
<% end %>
<div class="modulestore-detail md-store">
<div class="header">
<h1 class="home"><a href="modulestore.html">Orbit Module Store</a></h1>
</div>
<div class="main row-fluid clearfix">
<div class="left-col span3">
<%= image_tag 'modulestore/app-icon.jpg', :class => "app-icon" %>
<a href="#" class="price btn btn-primary">Free download</a>
<ul class="download-meta">
<li><strong class="downloads">Download:<span> 257985 times</span></strong></li>
<li>
<h3 class="who-are-using-this-apps">Who are using this apps?</h3>
<ul>
<li>NTU College of Liberal Arts</li>
<li>NTU Department of Mathematics</li>
<li>NCKU Graduate Institute of Communication Engineering</li>
<li>NCCU Graduate Institute of Biomedical Electronics and Bioinformatics</li>
<li>NTHU Nano-Electro-Mechanical System Research Center</li>
</ul>
</li>
<li>
<h3 class="recommends">Who are using this also like</h3>
<ul class="recommend-thumbs">
<li>
<a href=""><%= image_tag 'modulestore/dropbox.jpg' %></a>
<a href=""><%= image_tag 'modulestore/screen-capture.jpg' %></a>
<a href=""><%= image_tag 'modulestore/deault-app-icon.jpg' %></a>
</li>
</ul>
</li>
</ul>
</div>
<div class="right-col span6">
<ul class="breadcrumb">
<li><a href="Orbit_module_home.html">Home</a> <span class="divider">/</span></li>
<li class="active">Orbit</li>
</ul>
<h2>Orbit app name here</h2>
<h3>Description</h3>
<p class="app-description">
Orbit Blog makes it easy to post text, photos and video onto your blog.
We created Orbit blog to give you an easy way to share your thoughts about current events, what's going on in your life, or anything else you'd care to discuss with the world. We've developed a host of features to make blogging as simple and effective as possible:
* Free hosting for your images, video, and blog content
* Powerful Template Designer for customizing your blog's look and feel
* Drag and drop widget arrangements
* Hundreds of background images and of flexible default templates
* Built-in blog stats for realtime traffic data
* Easy, built-in monetization with AdSense
* Mobile support for blogging-on-the-go
* Use your custom URL for free
* Support for individual, team, and private blogs
* Post and comment notifications
* Gadget directory with hundreds of free widgets and add-ons
* Available in 4 languages
</p>
<div class="screenshots">
<h3>Screenshots</h3>
<div class="slide">
<div class="detail-slide-nav">
</div>
<a href="#"><%= image_tag 'modulestore/screenshot1.jpg' %></a>
<a href="#"><%= image_tag 'modulestore/screenshot2.jpg' %></a>
<a href="#"><%= image_tag 'modulestore/screenshot3.jpg' %></a>
<a href="#"><%= image_tag 'modulestore/screenshot4.jpg' %></a>
<a href="#"><%= image_tag 'modulestore/screenshot5.jpg' %></a>
</div>
</div>
<div>
</div>
</div>
app/views/admin/plugins/index.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
app/views/admin/sites/_side_bar.html.erb
+10 -2
View File
@@ -1,5 +1,5 @@
<%= content_tag :li, :class => active_for_controllers('sites') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('site.settings'), admin_site_site_info_path(@site) %>
<%= link_to content_tag(:i, nil, :class => 'icons-cog') + content_tag(:span, t('site.settings')), admin_site_site_info_path(@site) %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('sites')) do -%>
<%= content_tag :li, link_to(t('site.info'), admin_site_site_info_path(@site)), :class => active_for_action('sites', 'site_info') %>
@@ -13,5 +13,13 @@
<% end -%>
<%= content_tag :li, :class => active_for_controllers('designs') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-window-block') + content_tag(:span, t(:template)), admin_designs_path %>
<%= link_to content_tag(:i, nil, :class => 'icons-brush') + content_tag(:span, t(:template)), admin_designs_path %>
<% end -%>
<%= content_tag :li, :class => active_for_controllers('template_store', 'module_store') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-cart') + content_tag(:span, t(:purchase)), admin_purchases_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('template_store', 'module_store')) do -%>
<%= content_tag :li, link_to(t('store.template'), admin_template_store_path), :class => active_for_action('template_store', 'index') %>
<%= content_tag :li, link_to(t('store.module'), admin_module_store_path), :class => active_for_action('module_store', 'index') %>
<% end %>
<% end -%>
app/views/admin/template_store/index.html.erb
+30
View File
@@ -0,0 +1,30 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
<% end %>
<% content_for :page_specific_css do %>
<%= stylesheet_link_tag 'templatestore' %>
<% end %>
<div class="templatestore tp-store">
<div class="header">
<h1 class="home"><a href="template_store">Orbit Template Store</a></h1>
</div>
<div class="main">
<div class="template-list row">
<% 9.times do %>
<div class="template span3">
<a href="template_store/show">
<img src="<%= asset_path 'templatestore/template.jpg' %>" alt="Template" />
<div class="detail">
<strong class="template-title">Orange theme</strong>
<em class="price">Free download</em>
</div>
</a>
</div>
<% end %>
</div>
</div>
</div>
app/views/admin/template_store/show.html.erb
+77
View File
@@ -0,0 +1,77 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
<% end %>
<% content_for :page_specific_css do %>
<%= stylesheet_link_tag 'templatestore' %>
<% end %>
<% content_for :page_specific_javascript do %>
<%= javascript_include_tag 'lib/jquery.cycle.all.latest.js' %>
<script type="text/javascript">
$(function() {
$('.slide').cycle({
fx: 'scrollRight',
speed: 'fast',
timeout: 4000,
pager: '.detail-slide-nav',
pagerEvent: 'mouseover',
slideExpr: 'img'
});
});
</script>
<% end %>
<div class="templatestore-detail tp-store">
<div class="header">
<h1 class="home"><a href="templatestore.html">Orbit Template Store</a></h1>
</div>
<div class="main row-fluid">
<div class="left-col span3">
<%= image_tag 'templatestore/template-icon.jpg', :class => "template-icon" %>
<a href="#" class="price btn btn-primary">Free download</a>
<ul class="view-meta">
<li><strong class="views">Views:<span> 7985 times</span></strong></li>
</ul>
</div>
<div class="right-col span6">
<ul class="breadcrumb">
<li><a href="Orbit_template_home.html">Home</a> <span class="divider">/</span></li>
<li class="active">Orbit</li>
</ul>
<h2>Orbit Template name here</h2>
<h3>Description</h3>
<p class="template-description">
Orbit Blog makes it easy to post text, photos and video onto your blog.
We created Orbit blog to give you an easy way to share your thoughts about current events, what's going on in your life, or anything else you'd care to discuss with the world. We've developed a host of features to make blogging as simple and effective as possible:
* Free hosting for your images, video, and blog content
* Powerful Template Designer for customizing your blog's look and feel
* Drag and drop widget arrangements
* Hundreds of background images and of flexible default templates
* Built-in blog stats for realtime traffic data
* Easy, built-in monetization with AdSense
* Mobile support for blogging-on-the-go
* Use your custom URL for free
* Support for individual, team, and private blogs
* Post and comment notifications
* Gadget directory with hundreds of free widgets and add-ons
* Available in 4 languages
</p>
<div class="screenshots">
<h3>Screenshots</h3>
<div class="slide">
<div class="detail-slide-nav">
</div>
<a href="#"><%= image_tag 'templatestore/screenshot1.jpg' %></a>
<a href="#"><%= image_tag 'templatestore/screenshot2.jpg' %></a>
<a href="#"><%= image_tag 'templatestore/screenshot3.jpg' %></a>
<a href="#"><%= image_tag 'templatestore/screenshot4.jpg' %></a>
<a href="#"><%= image_tag 'templatestore/screenshot5.jpg' %></a>
</div>
</div>
<div>
</div>
</div>
app/views/admin/users_new_interface/_plugin_summary.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<div class="item element">
<h3><i class="icons-content"></i>Module Name</h3>
<h3><i class="icons-booklet"></i>Module Name</h3>
<div class="detail w-a h-a">
<table class="table table-striped">
<thead>
app/views/admin/users_new_interface/edit.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
<% content_for :page_specific_css do -%>
app/views/admin/users_new_interface/index.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
<%= render :partial => "js_and_css"%>
app/views/admin/users_new_interface/index_summary.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
<%= render :partial => "js_and_css"%>
app/views/admin/users_new_interface/index_thumbnail.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
<%= render :partial => "js_and_css"%>
app/views/admin/users_new_interface/new.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
<% content_for :page_specific_css do -%>
app/views/admin/users_new_interface/plugin_dashbroad.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
<div class="member-plugin">
app/views/admin/users_new_interface/show.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
<%= render :partial => "js_and_css"%>
app/views/admin/users_new_interface/temp_edit.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% content_for :side_bar do %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
<% end %>
<% content_for :page_specific_css do -%>
app/views/desktop/index.html.erb
+2 -2
View File
@@ -5,13 +5,13 @@
<ul class="dock_child hh3 thmc4" style="width: 180px;">
<li class="dock_item"><a callback-method='initializeAppSearch' href="<%= desktop_app_manager_path %>" class="widget_fn wh3 hh3" id="d_app_manager" onclick="return false;"><span class="widget_icon"><img src="" alt="App Manager" id="app_manager_icon" width="30" height="30"/></span></a></li>
<li class="dock_item"><a callback-method='initializeSectionsManager' href="<%= desktop_sections_path %>" class="widget_fn wh3 hh3" id="d_sections" onclick="return false;"><span class="widget_icon"><img src="" alt="All Sections" id="sections_icon" width="30" height="30"/></span></a></li>
<li class="dock_item"><a callback-method='initializeSettings' href="<%= desktop_settings_path %>" class="widget_fn wh3 hh3" id="d_settings" onclick="return false;"><span class="widget_icon"><img src="" alt="Settings" id="settings_icon" width="30" height="30"/></span></a></li>
<li class="dock_item"><a callback-method='initializeSettings' href="<%= desktop_settings_path %>" custom-load="settings" class="widget_fn wh3 hh3" id="d_settings" onclick="return false;"><span class="widget_icon"><img src="" alt="Settings" id="settings_icon" width="30" height="30"/></span></a></li>
</ul>
</li>
<li class="d_cate"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_publication' onclick="return false;"><span class="widget_icon"><img src="" alt="Publication" id="publication_icon" width="30" height="30"/></span></a>
<ul class="dock_child hh3 thmc4" style="width: 180px;">
<li class="dock_item"><a callback-method='initializeJournalPapers' href="<%= desktop_publications_journal_p_path %>" class="widget_fn wh3 hh3" id='d_journal_p' 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="<%= desktop_publications_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' onclick="return false;"><span class="widget_icon"><img src="" alt="Seminar Papers" id="seminar_p_icon" width="30" height="30"/></span></a></li>
app/views/desktop/journal_p.html.erb
+2 -2
View File
@@ -14,9 +14,9 @@
<div class="s_menu sm_v" content-type="menu">
<ul id='setting_left_nav'>
<li><a href="<%= desktop_journal_pages_path %>" callback-method="list" load="true" class="hh2 w2 hp thmc1 thmtxt xx" onclick='return false;'>List</a></li>
<li><a href="<%= new_desktop_journal_page_path %>" callback-method="addpaper" class="admtxt hh2 w2 hp xx" onclick='return false;'>Add/Edit</a></li>
<li><a href="<%= new_desktop_journal_page_path %>" custom-load="addpaper" callback-method="addpaper" custom-load="addpaper" class="admtxt hh2 w2 hp xx" onclick='return false;'>Add/Edit</a></li>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Journals</a></li>
<li><a href="<%= new_desktop_co_author_path %>" class="admtxt hh2 w2 hp" callback-method="coauthor" onclick='return false;'>Co-Authors</a></li>
<li><a href="<%= new_desktop_co_author_path %>" class="admtxt hh2 w2 hp" callback-method="coauthor" custom-load="coauthor" 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>
app/views/desktop/journal_pages/_form.html.erb
+49 -8
View File
@@ -2,7 +2,9 @@
<div class="fn_g hp">
<%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %>
<!-- class: bt-cancle can't be remove -->
<%= submit_tag "Cancel", :type => "button", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %>
<% if not @writing_journal.new_record? %>
<%= submit_tag "Cancel", :type => "button", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %>
<% end %>
</div>
<div class="hh2 hp sdm">
<div class="sdm_t hh2">Entry Year</div>
@@ -185,15 +187,37 @@
<span class="icon-plus input_append"></span>
<ul>
<li class="s_grid_row">
<div> <%= label_tag("", "Full Text", class: "s_grid_2 s_grid") %></div>
<!--
<%= f.fields_for :writing_journal_files, @writing_journal do |wjf| %>
<%= wjf.file_field :file %>
<% end %>
-->
<table>
<thead>
<tr>
<th class="s_grid_2 s_grid">File</th>
<th class="s_grid_2 s_grid">File Name</th>
<th><span id='add_plugin_file' class="icon-plus input_append"></span></th>
</tr>
</thead>
<tfoot>
<tr>
<td>
<div id='add_plugin_file' class="info_input plugin_files_block">
<%= hidden_field_tag 'plugin_file_field_count', @writing_journal.writing_journal_files.count %>
<a class="add"><span><i class="icon-plus icon-white"></i> add </span></a>
</div>
</td>
</tr>
</tfoot>
<tbody>
<% @writing_journal.writing_journal_files.each_with_index do |writing_journal_file, i| %>
<%= f.fields_for :writing_journal_files, writing_journal_file do |f| %>
<%= render :partial => 'form_file', :object => writing_journal_file, :locals => {:f => f, :i => i} %>
<% end %>
<% end %>
</tbody>
</table>
</li>
</div>
<div class="s_grid_con s_form">
<li class="s_grid_row">
<%= f.text_area :note, size: "20x2", plcaeholder: "Note", class: "s_grid_6 s_grid"%>
<%= f.text_area :note, size: "20x2", placeholder: "Note", class: "s_grid_6 s_grid"%>
</li>
</ul>
</div>
@@ -213,5 +237,22 @@
</script>
<%= javascript_include_tag "archive_plugin_form" %>
<script>
$('#add_plugin_file a.add').click(function(){
var new_id = $(this).prev().attr('value');
var old_id = new RegExp("new_writing_journal_files", "g");
$(this).prev().attr('value', parseInt(new_id) + 1);
var newfield = $(("<%= escape_javascript(add_attribute 'form_file', f, :writing_journal_files) %>").replace(old_id, new_id));
$(this).parents('table').append(newfield);
newfield.find('.action a.delete').click(function(){
newfield.remove();
});
});
$('.action a.remove_existing_record').click(function(){
$(this).next('.should_destroy').attr('value', 1);
$("tr#add_plugin_file_" + $(this).prev().attr('value')).hide();
});
</script>
app/views/desktop/journal_pages/_form_file.html.erb
+23
View File
@@ -0,0 +1,23 @@
<tr id="<%= "plugin_file_#{form_file.id}" if !form_file.new_record? %>" class="list_item">
<td>
<div>
<%= f.file_field :file, class: "s_grid_1 s_grid" %>
<%= form_file.file.file ? ( link_to t(:view), form_file.file.url, {:class => 'btn s_grid_1 s_grid', :target => '_blank', :title => t(:view)} ) : '' %>
</div>
</td>
<td>
<%= f.text_field :title, :class=>'s_grid_1 s_grid' %>
</td>
<td>
<span class="action">
<% if form_file.new_record? %>
<a class="delete"><i class="icon-remove"></i></a>
<% else %>
<%= f.hidden_field :id %>
<a class="remove_existing_record"><i class="icon-remove"></i></a>
<%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
<% end %>
</span>
</td>
</tr>
app/views/desktop/settings.html.erb
+24 -24
View File
@@ -1,26 +1,26 @@
<div id="settings">
<div id="content">
<div id="header" class="hh3">
<div class="dtitle w2 hh3 hp">
<span class="thmtxth">Settings</span>
</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="" class="admtxt hh2 w2 hp" onclick='return false;'>Overview</a></li>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Account</a></li>
<li><a href="<%= desktop_sections_path %>" callback-method="sections" class="admtxt hh2 w2 hp" onclick='return false;'>Sections</a></li>
<li><a href="<%= desktop_themes_path %>" callback-method="themes" class="admtxt hh2 w2 hp" onclick='return false;'>Theme</a></li>
<li><a href="<%= desktop_connections_path %>" callback-method="connection" class="admtxt hh2 w2 hp" onclick='return false;'>Connection</a></li>
</ul>
</div>
</div>
<div id="panel_r" container="true" class="ph pw admbg hp">
</div>
<div class="clear"></div>
</div>
<div id="content">
<div id="header" class="hh3">
<div class="dtitle w2 hh3 hp">
<span class="thmtxth">Settings</span>
</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="" class="admtxt hh2 w2 hp" onclick='return false;'>Overview</a></li>
<li><a href="<%= edit_user_registration_path %>" callback-method="account" custom-load="account" class="admtxt hh2 w2 hp" load="true" onclick='return false;'>Account</a></li>
<li><a href="<%= desktop_sections_path %>" callback-method="sections" custom-load="sections" class="admtxt hh2 w2 hp" onclick='return false;'>Sections</a></li>
<li><a href="<%= desktop_themes_path %>" callback-method="themes" class="admtxt hh2 w2 hp" onclick='return false;'>Theme</a></li>
<li><a href="<%= desktop_connections_path %>" callback-method="connection" class="admtxt hh2 w2 hp" onclick='return false;'>Connection</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>
app/views/devise/registrations/edit.html.erb
+5 -16
View File
@@ -1,25 +1,14 @@
<h2>Edit <%= resource_name.to_s.humanize %></h2>
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
<%= devise_error_messages! %>
<%= form_for(resource, :as => resource_name, :url => users_passwd_path(resource_name), :html => { :method => :put, "form-type"=>"ajax_form" }) do |f| %>
<div><%= f.submit "Update" %></div>
<div><%= f.label :email %><br />
<%= f.email_field :email %></div>
<div><%= f.label :current_password %>
<%= f.password_field :current_password %></div>
<div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
<div><%= f.label :password %>
<%= f.password_field :password %></div>
<div><%= f.label :password_confirmation %><br />
<%= f.password_field :password_confirmation %></div>
<div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
<%= f.password_field :current_password %></div>
<div><%= f.submit "Update" %></div>
<% end %>
<h3>Cancel my account</h3>
<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
<%= link_to "Back", :back %>
app/views/layouts/_guest_orbit_menu.erb
+2 -2
View File
@@ -1,5 +1,5 @@
<a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
<ul class="dropdown-menu">
<li><%= link_to content_tag(:i, nil, :class => 'icons-dashboard') + t(:dashboard_), admin_dashboards_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.new_admin.user'), admin_users_new_interface_index_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-gauge') + t(:dashboard_), admin_dashboards_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-group') + t('admin.new_admin.user'), admin_users_new_interface_index_path %></li>
</ul>
app/views/layouts/_member_orbit_menu.erb
+3 -3
View File
@@ -1,14 +1,14 @@
<a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
<ul class="dropdown-menu">
<li><%= link_to content_tag(:i, nil, :class => 'icons-dashboard') + t(:dashboard_), admin_dashboards_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.new_admin.user'), admin_users_new_interface_index_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-gauge') + t(:dashboard_), admin_dashboards_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-group') + t('admin.new_admin.user'), admin_users_new_interface_index_path %></li>
<li><%#= link_to content_tag(:i, nil, :class => 'icons-content') + t(:content) %></li>
<li><%#= link_to content_tag(:i, nil, :class => 'icons-member') + t(:member), admin_users_path %></li>
<li><%#= link_to content_tag(:i, nil, :class => 'icons-asset') + t(:asset), admin_assets_path %></li>
<%if (is_admin? rescue false)%>
<li class="divider"></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-structure') + t(:structure), admin_items_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-flow-cascade') + t(:structure), admin_items_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('site.settings'), admin_site_site_info_path(@site) %></li>
<% end -%>
<li><%#= link_to content_tag(:i, nil, :class => 'icons-plus-cube') + t(:add_item) %></li>
app/views/layouts/_orbit_bar.html.erb
+29 -42
View File
@@ -9,31 +9,29 @@
<% end -%>
</div>
<ul class="nav">
<li><%= link_to t(:homepage), root_path, :class => 'orbit-bar-home' %></li>
<li><%= link_to t(:desktop), desktop_path, :class => 'orbit-bar-desktop' %></li>
<li><%= link_to '', root_path, {'data-icon' => 'house'} %></li>
<li><%= link_to '', desktop_path, {'data-icon' => 'desktop'} %></li>
</ul>
<ul class="nav pull-right">
<li class="dropdown language">
<a class="dropdown-toggle orbit-bar-language" href="#" data-toggle="dropdown">language</a>
<a class="dropdown-toggle" href="#" data-toggle="dropdown" data-icon="earth"></a>
<ul class="dropdown-menu language-menu">
<% @site_in_use_locales.each do |locale| %>
<%= content_tag :li, (link_to t(:_locale, :locale => locale), add_locale(remove_locale((referer rescue request.fullpath)), locale)), :class => (I18n.locale.eql?(locale.to_sym) ? 'active' : nil) %>
<% end %>
</ul>
</li>
<li class="search clear" title="<%= t :search_google %>">
<a class="orbit-bar-search" href="#">search</a>
<li class="search clear" title="<%= t :search_google %>">
<a class="orbit-bar-search" href="#" data-icon="search"></a>
<form class="navbar-search" method="get" action="http://www.google.com/custom">
<input type="hidden" name="client" value="pub-&amp" />
<input type="hidden" name="ie" id="ie" value="utf-8" />
<input type="hidden" name="oe" id="oe" value="utf-8" />
<input type="hidden" name="cof" id="cof" value="AH:center;AWFID:03de271f1940eea3;" />
<input type='hidden' name='domains' value='<%= @site.search["domains"] rescue ''%>'>
<input type='hidden' name='sitesearch' value='<%= @site.search["sitesearch"] rescue '' %>'>
<%= text_field_tag 'q','',{:class => "search-query span3",:placeholder=> t(:search_nccu) ,:disabled=> ((@site.search["sitesearch"] || @site.search["domains"] ).blank? rescue true)}%>
</form>
</li>
<input type="hidden" name="client" value="pub-&amp" />
<input type="hidden" name="ie" id="ie" value="utf-8" />
<input type="hidden" name="oe" id="oe" value="utf-8" />
<input type="hidden" name="cof" id="cof" value="AH:center;AWFID:03de271f1940eea3;" />
<input type='hidden' name='domains' value='<%= @site.search["domains"] rescue ''%>'>
<input type='hidden' name='sitesearch' value='<%= @site.search["sitesearch"] rescue '' %>'>
<%= text_field_tag 'q','',{:class => "search-query span3",:placeholder=> t(:search_nccu) ,:disabled=> ((@site.search["sitesearch"] || @site.search["domains"] ).blank? rescue true)}%>
</form>
</li>
<% if user_signed_in? %>
<li class="dropdown active">
<a class="orbit-bar-account" href="#" data-toggle="dropdown">
@@ -42,20 +40,9 @@
<span class="member-name"><%= current_user.name %></span>
</a>
<ul class="dropdown-menu account-menu">
<li>
<a href="#">
<i class="icons-wrench"></i>
<%= t(:account_settings) %>
</a>
</li>
<li>
<a class="orbit-bar-desktop" href="#">
<i class="icons-desktop"></i>
<%= t(:desktop) %>
</a>
</li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-out') + ' ' + t(:logout), destroy_user_session_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-tools') + ' ' + t(:account_setting), desktop_path+"#settings-account" %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-desktop') + ' ' + t(:desktop), desktop_path %></li>
<li><%= link_to content_tag(:i, nil, :class => 'icons-outlog') + ' ' + t(:logout), destroy_user_session_path %></li>
<li class="divider"></li>
<li>
<a href="#">
@@ -91,15 +78,15 @@
<li>
<%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary' %>
</li>
<li class="divider hide"><span><%= t(:or_lower) %></span></li>
<% end %>
</ul>
<%#= link_to t(:register), new_user_registration_path, :class => 'btn btn-danger register' %>
</div>
</li>
<% end %>
</ul>
</div>
</div>
</header>
</li>
<li class="divider hide"><span><%= t(:or_lower) %></span></li>
<% end %>
</ul>
<%#= link_to t(:register), new_user_registration_path, :class => 'btn btn-danger register' %>
</div>
</li>
<% end %>
</ul>
</div>
</div>
</header>
app/views/layouts/_side_bar.html.erb
+1 -1
View File
@@ -1,6 +1,6 @@
<div id="main-sidebar" class="my_scroll">
<div id="position">
<%= link_to content_tag(:i, nil, :class => (local_assigns.has_key? :icon) ? icon : 'icons-dashboard') + content_tag(:span, (local_assigns.has_key? :link_name) ? link_name : t('admin.dashboard')), (local_assigns.has_key? :link_url) ? link_url : admin_dashboards_path %>
<%= link_to content_tag(:i, nil, :class => (local_assigns.has_key? :icon) ? icon : 'icons-gauge') + content_tag(:span, (local_assigns.has_key? :link_name) ? link_name : t('admin.dashboard')), (local_assigns.has_key? :link_url) ? link_url : admin_dashboards_path %>
<div id="collapse-menu"><i class="icon-chevron-right"></i><i class="icon-chevron-right"></i></div>
</div>
<div class="scrollbar">
app/views/layouts/_side_bar_content.html.erb
+5 -5
View File
@@ -7,7 +7,7 @@
<% end %>
<%= content_tag :li, :class => (active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals') || active_for_app_auth('Announcement') || active_for_ob_auths_object("BulletinCategory") ) do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + content_tag(:span, t('admin.announcement')), panel_announcement_back_end_bulletins_path %>
<%= link_to content_tag(:i, nil, :class => 'icons-megaphone') + content_tag(:span, t('admin.announcement')), panel_announcement_back_end_bulletins_path %>
<%= content_tag :ul, :class => ("nav nav-list " + (visible_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals')||active_for_ob_auths_object("BulletinCategory"))) do -%>
<%= content_tag :li, link_to((t('announcement.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index')if (is_manager? rescue nil) %>
<%= content_tag :li, link_to((t('announcement.add_new') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') if (is_manager? rescue nil) %>
@@ -34,7 +34,7 @@
<% end -%>
<%= content_tag :li, :class => active_for_controllers('ad_banners', 'ad_images') ||active_for_ob_auths_object("AdBanner") ||active_for_app_auth('ad_banner') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-link') + content_tag(:span, t('admin.ad_banner')), admin_ad_banners_path %>
<%= link_to content_tag(:i, nil, :class => 'icons-landscape') + content_tag(:span, t('admin.ad_banner')), admin_ad_banners_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners', 'ad_images') ) do -%>
<%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
@@ -57,7 +57,7 @@
<% end -%>
<%= content_tag :li, :class => active_for_controllers('albums','album_images','gallery_categories','/panel/gallery/back_end/tags') || active_for_app_auth("gallery") do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-picture') + content_tag(:span, t('admin.orbit_gallery')), panel_gallery_back_end_albums_path %>
<%= link_to content_tag(:i, nil, :class => 'icons-pictures') + content_tag(:span, t('admin.orbit_gallery')), panel_gallery_back_end_albums_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('albums') ) do -%>
<%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
<%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
@@ -69,7 +69,7 @@
<% end %>
<%= content_tag :li, :class => active_for_controllers('archive_files', 'panel/archive/back_end/tags', 'archive_file_categorys') do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-asset') + content_tag(:span, t('admin.archive')), panel_archive_back_end_archive_files_path %>
<%= link_to content_tag(:i, nil, :class => 'icons-archive') + content_tag(:span, t('admin.archive')), panel_archive_back_end_archive_files_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('archive_files', 'tags', 'archive_file_categorys')) do -%>
<%= content_tag :li, link_to((t('admin.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_archive_back_end_archive_files_path), :class => active_for_action('archive_file', 'index')if (is_manager? rescue nil) %>
<%= content_tag :li, link_to((t('admin.add_new') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_archive_back_end_archive_file_path), :class => active_for_action('archive_file', 'new') if (is_admin? rescue nil)%>
@@ -90,7 +90,7 @@
<% end -%>
<% end %>
<%= content_tag :li, :class => active_for_controllers('locations') || active_for_app_auth("gprs") do -%>
<%= link_to content_tag(:i, nil, :class => 'icons-link') + content_tag(:span, t('admin.gprs')), panel_gprs_back_end_locations_path %>
<%= link_to content_tag(:i, nil, :class => 'icons-location') + content_tag(:span, t('admin.gprs')), panel_gprs_back_end_locations_path %>
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('locations') ) do -%>
<%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
<%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>