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

Major tinyscrollbar update

Browse Source
This commit is contained in:
harrybomrah authored and Matt K. Fu committed 2013-04-17 10:54:38 +08:00
1 parent 8e98cb3ec9
commit 1d06bcaae7
17 files changed
+91 -109
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
Vendored
+4 -3
View File
@@ -12,11 +12,12 @@
</div>
</div>
<div id="co_author_relation_table" class="tinycanvas vp">
<!-- <div id="co_author_relation_table" class="tinycanvas vp">
<div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport">
<div class="viewport"> -->
<div class="overview" content-layout="datalist" per-column="4" base-width="300">
<%= render :partial => 'show_form'%>
</div>
</div>
<!-- </div>
</div>
-->
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb
Vendored
+4 -4
View File
@@ -4,9 +4,9 @@
<%= link_to "New Type", panel_personal_conference_desktop_conference_co_author_relations_path, :class=>"bt-new-type fn_btn hp hh1 thmc2 thmtxt", "ajax-remote"=>"get" %>
</div>
</div>
<div id="co_author" class="tinycanvas vp">
<!-- <div id="co_author" class="tinycanvas vp">
<div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport">
<div class="viewport"> -->
<div class="overview" content-layout="datalist" per-column="4" base-width="400">
<% @conference_co_authors.each_with_index do |co_author,i| %>
<div class="g_col">
@@ -26,5 +26,5 @@
</div>
<% end %>
</div>
</div>
</div>
<!-- </div>
</div> -->
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
Vendored
+4 -4
View File
@@ -22,7 +22,7 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div>
</div>
<div id="paper_add" class="tinycanvas vp">
<!-- <div id="paper_add" class="tinycanvas vp">
<div class="scrollbar sb_h vp">
<div class="track">
<div class="thumb thmc2">
@@ -31,7 +31,7 @@
</div>
</div>
</div>
<div class="viewport">
<div class="viewport"> -->
<div class="overview" content-layout="column" base-width="450">
<div column="true">
<div class="s_form">
@@ -206,8 +206,8 @@
</div>
</div>
</div>
</div>
</div>
<!-- </div>
</div> -->
<%= stylesheet_link_tag "token-input-facebook" %>
<%= javascript_include_tag :defaults, "jquery.tokeninput" %>
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb
Vendored
+4 -3
View File
@@ -13,9 +13,9 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div>
</div>
<div id="conference_list" class="tinycanvas vp">
<!-- <div id="conference_list" class="tinycanvas vp">
<div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport">
<div class="viewport"> -->
<div class="overview" content-layout="datalist" per-column="5" base-width="300">
<% @conference_lists.each_with_index do |conference_list,i| %>
<div class="g_col">
@@ -32,5 +32,6 @@
</div>
<% end %>
</div>
</div>
<!-- </div>
</div>
-->
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
Vendored
+4 -4
View File
@@ -65,13 +65,13 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div>
</div>
<div id="paper_list" class="tinycanvas vp">
<!-- <div id="paper_list" class="tinycanvas vp">
<div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport">
<div class="viewport"> -->
<div class="overview" content-layout="datalist" per-column="5" base-width="300">
<% @writing_conferences.each do |w| %>
<%= publication_record w, @view_by%>
<% end %>
</div>
</div>
</div>
<!-- </div>
</div> -->
vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
Vendored
+1
View File
@@ -56,6 +56,7 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper
"ajax-remote" => "delete",
"confirm-message" => t("sure?"),
"callback-method" => "paperDelete",
"delete-item" => "true",
:class => "journal_paper_delete admbg2 admtxt",
:href => panel_personal_journal_desktop_journal_page_path(publication))
end
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
Vendored
+4 -3
View File
@@ -12,11 +12,12 @@
</div>
</div>
<div id="co_author_relation_table" class="tinycanvas vp">
<!-- <div id="co_author_relation_table" class="tinycanvas vp">
<div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport">
<div class="viewport"> -->
<div class="overview" content-layout="datalist" per-column="5" base-width="300">
<%= render :partial => 'show_form'%>
</div>
</div>
<!-- </div>
</div>
-->
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
Vendored
+4 -3
View File
@@ -4,9 +4,9 @@
<%= link_to "New Type", panel_personal_journal_desktop_journal_co_author_relations_path, :class=>"bt-new-type fn_btn hp hh1 thmc2 thmtxt", "ajax-remote"=>"get" %>
</div>
</div>
<div id="co_author" class="tinycanvas vp">
<!-- <div id="co_author" class="tinycanvas vp">
<div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport">
<div class="viewport"> -->
<div class="overview" content-layout="datalist" per-column="4" base-width="300">
<ul>
<% @journal_co_authors.each_with_index do |co_author,i| %>
@@ -24,5 +24,6 @@
<% end %>
</ul>
</div>
</div>
<!-- </div>
</div>
-->
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
Vendored
+6 -9
View File
@@ -23,7 +23,7 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div>
</div>
<div id="paper_add" class="tinycanvas vp">
<!-- <div id="paper_add" class="tinycanvas vp">
<div class="scrollbar sb_h vp">
<div class="track">
<div class="thumb thmc2">
@@ -31,7 +31,7 @@
</div>
</div>
</div>
<div class="viewport">
<div class="viewport"> -->
<div class="overview" content-layout="column" base-width="450">
<div column="true">
<div class="s_form">
@@ -190,12 +190,9 @@
<td colspan="3">
<div id='add_plugin_file' class="info_input plugin_files_block s_action">
<%= hidden_field_tag 'plugin_file_field_count', @writing_journal.writing_journal_files.count %>
<<<<<<< Updated upstream
<a class="add setting_btn thmc1 thmtxt w1 hh1 hp" href=""><i class="icon-plus icon-white"></i> add</a>
=======
<a class="add setting_btn thmc1 thmtxt w1 hh2 hp" href="#"><i class="icon-plus icon-white"></i> add</a>
>>>>>>> Stashed changes
<a class="add setting_btn thmc1 thmtxt w1 hh1 hp" href="#"><i class="icon-plus icon-white"></i> add</a>
</div>
</td>
</tr>
@@ -232,9 +229,9 @@
</div>
</div>
</div>
</div>
<!-- </div>
</div>
-->
<script>
$(document).ready(function(){
$("#writing_conference_author_tokens").tokenInput("/panel/personal_conference/desktop/conference_pages/new.json", {
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
Vendored
+1 -5
View File
@@ -77,14 +77,10 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div>
</div>
<div id="paper_list" class="tinycanvas vp">
<div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport">
<div class="overview" content-layout="datalist" base-width="300" per-column="5">
<% @writing_journals.each do |w| %>
<%= publication_record w, @view_by%>
<% end %>
</div>
</div>
</div>
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
Vendored
+2 -5
View File
@@ -13,9 +13,7 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div>
</div>
<div id="journal_list" class="tinycanvas vp">
<div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport">
<div class="overview" content-layout="datalist" base-width="300" per-column="5">
<% @journal_lists.each_with_index do |journal_list,i| %>
<div class="g_col">
@@ -32,5 +30,4 @@
</div>
<% end %>
</div>
</div>
</div>