developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/desktop_work' into desktop 

* origin/desktop_work:
  simple layout tinyscrollbar fixed
  highlighting fixed…
  fixed adding.
  layout fix
  tinyscrollbar_bug fixed
  url handling modified.. tinyscrollbar modified… star checkbox fixed..
  tinyscrollbar fixed
  some changes for gridster
  Lot of changes in gridster

Conflicts:
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
This commit is contained in:
Rueshyna 2013-03-05 17:34:28 +08:00
parent 806ffe0a1e dc92ef9f42
commit d5f1d13670
6 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Gemfile.lock
View File

@ -141,7 +141,6 @@ GEM
jquery-rails
railties (>= 3.1.0)
json (1.7.7)
libv8 (3.11.8.13)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@ -225,7 +224,6 @@ GEM
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.3)
rb-readline (0.4.2)
rdoc (3.12.1)
json (~> 1.4)
redis (3.0.2)
@ -235,7 +233,6 @@ GEM
chinese_pinyin (>= 0.3.0)
redis (>= 2.1.1)
redis-namespace (>= 1.0.2)
ref (1.0.2)
resque (1.23.0)
multi_json (~> 1.0)
redis-namespace (~> 1.0)
@ -316,9 +313,6 @@ GEM
sunspot (= 1.3.3)
sunspot_solr (1.3.3)
terminal-table (1.4.5)
therubyracer (0.11.3)
libv8 (~> 3.11.8.12)
ref
thor (0.17.0)
tilt (1.3.3)
tinymce-rails (3.5.8)
@ -363,7 +357,6 @@ DEPENDENCIES
jquery-rails (= 2.1.4)
jquery-ui-rails
kaminari!
libv8 (~> 3.11.8)
mime-types
mini_magick
mongo_session_store-rails3 (= 3.0.6)
@ -380,7 +373,6 @@ DEPENDENCIES
radius
rails (~> 3.2.9)
rake
rb-readline
redis (>= 2.1.1)
redis-namespace
redis-search
@ -401,7 +393,6 @@ DEPENDENCIES
sunspot-rails-tester
sunspot_mongo
sunspot_solr
therubyracer
tinymce-rails
uglifier
watchr

15
app/assets/javascripts/orbitdesktop.js
View File

@ -310,11 +310,16 @@ var orbitDesktop = function(dom){
column_container.empty();
$("div[container=true]").html(h);
$("div[container=true] div.overview").html(temp_div.html());
o.tinyscrollbar_ext({
main : ".tinycanvas",
fill : base_width * total_columns
})
if(isNaN(base_width)){
o.tinyscrollbar_ext({
main : ".tinycanvas",
})
}else{
o.tinyscrollbar_ext({
main : ".tinycanvas",
fill : base_width * total_columns
})
}
}
this.menu_item = function(dom,customload,submenuitem){
if(!customload)customload=false;

2
app/views/desktop/settings/themes.html.erb
View File

@ -8,7 +8,7 @@
<div class="tinycanvas vp">
<div class="scrollbar sb_v vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport">
<div class="overview" content-layout="simple" base-width="1000">
<div class="overview" content-layout="simple">
<div id="st1" class="st_c">
<div class="theme_list ssl">
<% @themes.each do |theme| %>

2
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb vendored
View File

@ -15,7 +15,7 @@
<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="overview" content-layout="datalist" per-column="5" base-width="300">
<div class="overview" content-layout="datalist" per-column="4" base-width="300">
<%= render :partial => 'show_form'%>
</div>
</div>

1
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb vendored
View File

@ -10,7 +10,6 @@
<div class="overview" content-layout="datalist" per-column="4" base-width="300">
<ul>
<% @journal_co_authors.each_with_index do |co_author,i| %>
<li class="list_t_item" item="true">
<ul class="info">
<li><div class="name"><%= co_author.co_author %></div></li>

1
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb vendored
View File

@ -224,6 +224,7 @@
</div>
</div>
</div>
</div>
</div>
</div>