fix new ui ask module frontend

Fixed Enable and Disable, Sitemap and Terms of Use for header and footer
Show Custom orbit bar icon only for frontend and desktop
2013-10-15 16:51:16 +08:00 · 2013-10-15 10:37:49 +08:00 · 2013-10-15 10:07:46 +08:00 · 2013-10-14 18:20:26 +08:00 · 2013-10-14 16:49:54 +08:00 · 2013-10-14 16:49:51 +08:00
2777 changed files with 99768 additions and 31067 deletions
@@ -11,10 +11,15 @@ public/assets
 public/index.html
 public/panel/**/*
 public/uploads/**/*
-solr
+solr/data
 tmp/**/*
 uploads/**/*

 *.swp
 *.pid
-*.lck
+*.lck
+
+.sass-cache/*
+*.supported
+mongoid.yml
+*.
@@ -14,7 +14,11 @@ gem 'execjs'
 gem 'jquery-rails', '2.1.4'
 gem 'jquery-ui-rails'
 gem "select2-rails", '3.3.1'
-gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
+gem 'kaminari'
+gem 'time_difference'
+gem "acts_as_unvlogable"
+gem 'youtube_it'
+gem 'gotcha'

 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"
@@ -26,6 +30,7 @@ gem "mongo_session_store-rails3", '3.0.6'
 gem 'nokogiri'

 gem 'fb_graph'
+gem 'rack-gridfs'
 gem 'radius'
 gem 'rake'
 # gem 'remotipart'
@@ -34,7 +39,7 @@ gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
 # gem 'ruby-debug19'
-gem 'rubyzip'
+gem 'rubyzip', '< 1.0.0'

 gem 'sunspot_mongo'
 gem 'sunspot_solr'
@@ -45,14 +50,15 @@ gem 'sinatra'
 gem 'sprockets'
 gem 'social-share-button'

-gem 'tinymce-rails'
+gem 'ckeditor'
+# gem 'tinymce-rails', "~> 3.5.8"
 gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'libv8', '~> 3.11.8' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'mongoid-encryptor', :require => 'mongoid/encryptor'
-gem 'rb-readline' if RUBY_PLATFORM.downcase.include?("linux")
+gem 'rb-readline','~> 0.4.2' if RUBY_PLATFORM.downcase.include?("linux")


-gem "impressionist", :git => 'git://github.com/charlotte-ruby/impressionist.git'
+gem "impressionist",'1.2.0'
 #gem 'contacts'
 #gem 'event-calendar', :require => 'event_calendar'#, :git => 'git://github.com/elevation/event_calendar.git'

@@ -62,6 +68,8 @@ gem 'chinese_pinyin', '0.4.1'
 gem 'rmmseg-cpp-huacnlee', '0.2.9'
 gem 'redis-namespace'
 gem 'redis-search'
+gem 'syslog-logger'
+gem "recaptcha", :require => "recaptcha/rails"

 # Gems used only for assets and not required
 # in production environments by default.
@@ -90,6 +98,8 @@ group :test, :development do
  gem "watchr"
  gem "spork"
  gem "capybara"
+  #gem 'rack-mini-profiler'
+  gem "better_errors"
  # gem 'yard'
  # gem "bluecloth"
 end
@@ -1,402 +0,0 @@
-GIT
-  remote: git://github.com/amatsuda/kaminari.git
-  revision: 2e09b5374fec33b57c6387ca7bac89ecaa60c9eb
-  specs:
-    kaminari (0.14.1)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
-
-GIT
-  remote: git://github.com/charlotte-ruby/impressionist.git
-  revision: 0894f6a550a33f83f4937d655e9f0774521781e4
-  specs:
-    impressionist (1.2.0)
-      httpclient (~> 2.2)
-      nokogiri (~> 1.5)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.12)
-      actionpack (= 3.2.12)
-      mail (~> 2.4.4)
-    actionpack (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    attr_required (0.0.5)
-    bcrypt-ruby (3.0.0)
-    binding_of_caller (0.7.1)
-      debug_inspector (>= 0.0.1)
-    bourne (1.1.2)
-      mocha (= 0.10.5)
-    brakeman (1.9.2)
-      erubis (~> 2.6)
-      fastercsv (~> 1.5)
-      haml (~> 3.0)
-      highline (~> 1.6)
-      multi_json (~> 1.2)
-      ruby2ruby (~> 2.0)
-      ruby_parser (~> 3.1.1)
-      sass (~> 3.0)
-      terminal-table (~> 1.4)
-    bson (1.8.2)
-    bson_ext (1.8.2)
-      bson (~> 1.8.2)
-    builder (3.0.4)
-    capybara (2.0.2)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
-    carrierwave (0.6.2)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-    carrierwave-mongoid (0.2.2)
-      carrierwave (~> 0.6.1)
-      mongoid (~> 2.1)
-    childprocess (0.3.8)
-      ffi (~> 1.0, >= 1.0.11)
-    chinese_pinyin (0.4.1)
-    chronic (0.9.0)
-    coderay (1.0.9)
-    coffee-rails (3.2.2)
-      coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.4.0)
-    columnize (0.3.6)
-    database_cleaner (0.9.1)
-    debug_inspector (0.0.2)
-    debugger (1.2.4)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.7)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.8)
-    delorean (2.1.0)
-      chronic
-    devise (1.5.3)
-      bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
-      warden (~> 1.1)
-    diff-lcs (1.1.3)
-    encrypted_strings (0.3.3)
-    erubis (2.7.0)
-    exception_notification (3.0.1)
-      actionmailer (>= 3.0.4)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    factory_girl (4.2.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
-      railties (>= 3.0.0)
-    faker (1.1.2)
-      i18n (~> 0.5)
-    fastercsv (1.5.5)
-    fattr (2.2.1)
-    fb_graph (2.6.4)
-      httpclient (>= 2.2.0.2)
-      multi_json (>= 1.3)
-      rack-oauth2 (>= 0.14.4)
-      tzinfo
-    ffi (1.4.0)
-    haml (3.1.8)
-    highline (1.6.15)
-    hike (1.2.1)
-    httpclient (2.3.2)
-    i18n (0.6.1)
-    journey (1.0.4)
-    jquery-rails (2.1.4)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.0.1)
-      jquery-rails
-      railties (>= 3.1.0)
-    json (1.7.7)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    method_source (0.8.1)
-    mime-types (1.21)
-    mini_magick (3.5.0)
-      subexec (~> 0.2.1)
-    mocha (0.10.5)
-      metaclass (~> 0.0.1)
-    mongo (1.8.2)
-      bson (~> 1.8.2)
-    mongo_session_store-rails3 (3.0.6)
-      actionpack (>= 3.0)
-      mongo
-    mongoid (2.6.0)
-      activemodel (~> 3.1)
-      mongo (~> 1.7)
-      tzinfo (~> 0.3.22)
-    mongoid-encryptor (0.0.5)
-      activesupport (~> 3.0)
-      encrypted_strings (~> 0.3.3)
-      mongoid (~> 2)
-    mongoid-tree (0.7.0)
-      mongoid (~> 2.0)
-    multi_json (1.6.1)
-    net-ldap (0.3.1)
-    nokogiri (1.5.6)
-    options (2.3.0)
-      fattr
-    orm_adapter (0.0.7)
-    polyglot (0.3.3)
-    pr_geohash (1.0.0)
-    progress_bar (0.4.0)
-      highline (~> 1.6.1)
-      options (~> 2.3.0)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry-debugger (0.2.1)
-      debugger (~> 1.2.0)
-      pry (~> 0.9.10)
-    pry-remote (0.1.6)
-      pry (~> 0.9)
-      slop (~> 3.0)
-    pry-stack_explorer (0.4.9)
-      binding_of_caller (>= 0.7)
-      pry (~> 0.9.11)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-oauth2 (1.0.0)
-      activesupport (>= 2.3)
-      attr_required (>= 0.0.5)
-      httpclient (>= 2.2.0.2)
-      i18n
-      multi_json (>= 1.3.6)
-      rack (>= 1.1)
-    rack-protection (1.3.2)
-      rack
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    radius (0.7.3)
-    rails (3.2.12)
-      actionmailer (= 3.2.12)
-      actionpack (= 3.2.12)
-      activerecord (= 3.2.12)
-      activeresource (= 3.2.12)
-      activesupport (= 3.2.12)
-      bundler (~> 1.0)
-      railties (= 3.2.12)
-    railties (3.2.12)
-      actionpack (= 3.2.12)
-      activesupport (= 3.2.12)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12.1)
-      json (~> 1.4)
-    redis (3.0.2)
-    redis-namespace (1.2.1)
-      redis (~> 3.0.0)
-    redis-search (0.9.0)
-      chinese_pinyin (>= 0.3.0)
-      redis (>= 2.1.1)
-      redis-namespace (>= 1.0.2)
-    resque (1.23.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.0)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    resque-restriction (0.3.0)
-      resque (>= 1.7.0)
-    resque-scheduler (2.0.0)
-      redis (>= 2.0.1)
-      resque (>= 1.20.0)
-      rufus-scheduler
-    rmmseg-cpp-huacnlee (0.2.9)
-    rsolr (1.0.8)
-      builder (>= 2.1.2)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    rspec-rails (2.12.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    ruby2ruby (2.0.3)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.1.1)
-      sexp_processor (~> 4.1)
-    rubyzip (0.9.9)
-    rufus-scheduler (2.0.17)
-      tzinfo (>= 0.3.23)
-    sass (3.2.5)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    select2-rails (3.3.1)
-      sass-rails (>= 3.2)
-      thor (~> 0.14)
-    selenium-webdriver (2.30.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip
-      websocket (~> 1.0.4)
-    sexp_processor (4.1.5)
-    shoulda-matchers (1.4.2)
-      activesupport (>= 3.0.0)
-      bourne (~> 1.1.2)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sinatra (1.3.4)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
-    slop (3.4.3)
-    social-share-button (0.1.1)
-    spork (0.9.2)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    subexec (0.2.2)
-    sunspot (1.3.3)
-      pr_geohash (~> 1.0)
-      rsolr (~> 1.0.7)
-    sunspot-rails-tester (0.0.4)
-      sunspot_rails (~> 1.2)
-    sunspot_mongo (1.0.1)
-      sunspot_rails
-    sunspot_rails (1.3.3)
-      nokogiri
-      sunspot (= 1.3.3)
-    sunspot_solr (1.3.3)
-    terminal-table (1.4.5)
-    thor (0.17.0)
-    tilt (1.3.3)
-    tinymce-rails (3.5.8)
-      railties (>= 3.1.1)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-    uglifier (1.3.0)
-      execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-    warden (1.2.1)
-      rack (>= 1.0)
-    watchr (0.7)
-    websocket (1.0.7)
-    xpath (1.0.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  brakeman
-  bson_ext
-  capybara
-  carrierwave
-  carrierwave-mongoid
-  chinese_pinyin (= 0.4.1)
-  coffee-rails
-  database_cleaner
-  debugger
-  delorean
-  devise (= 1.5.3)
-  exception_notification
-  execjs
-  factory_girl_rails
-  faker
-  fb_graph
-  impressionist!
-  jquery-rails (= 2.1.4)
-  jquery-ui-rails
-  kaminari!
-  mime-types
-  mini_magick
-  mongo_session_store-rails3 (= 3.0.6)
-  mongoid (> 2.1, < 3.0.0)
-  mongoid-encryptor
-  mongoid-tree
-  net-ldap (~> 0.3.1)
-  nokogiri
-  progress_bar
-  pry
-  pry-debugger
-  pry-remote
-  pry-stack_explorer
-  radius
-  rails (~> 3.2.9)
-  rake
-  redis (>= 2.1.1)
-  redis-namespace
-  redis-search
-  resque
-  resque-restriction
-  resque-scheduler
-  rmmseg-cpp-huacnlee (= 0.2.9)
-  rspec (~> 2.0)
-  rspec-rails (~> 2.0)
-  rubyzip
-  sass-rails
-  select2-rails (= 3.3.1)
-  shoulda-matchers
-  simplecov
-  sinatra
-  social-share-button
-  spork
-  sprockets
-  sunspot-rails-tester
-  sunspot_mongo
-  sunspot_solr
-  tinymce-rails
-  uglifier
-  watchr
@@ -10,10 +10,11 @@
 //= require jquery.form
 //= require jquery.tinyscrollbar
 //= require jquery.miniColors.min
+//= require select2
 //= require bootstrap
+//= require orbit_js_1.0.1-front-end
 //= require orbitdesktopAPI
 //= require orbitTimeline
 //= require orbitdesktop
 //= require jquery.gridster
-//= require desktop/books_pages
-//= require select2
+//= require desktop/books_pages
@@ -1,6 +1,6 @@

 orbitDesktop.prototype.themefolder = "desktop_themes";
 orbitDesktopAPI.prototype.notifyImgPath = "/assets/";
-alert("<%= @desktop.inspect %>")
+// alert("<%= @desktop.inspect %>")
 var od = new orbitDesktop("#ajax_container");

@@ -55,7 +55,7 @@ $(document).ready(function(){
 		}
 		return false;
 	});
-	getEvent(selet);
+
 	function resetText() {
 		$events.find('li').find($mon).html('');
 		$events.find('li').find($day).html('');
@@ -63,60 +63,4 @@ $(document).ready(function(){
 		$events.find('li').find($link_text).attr('href', '');
 		$events.find('li').find($time).html('');
 	}
-	function getEvent(selet){
-		$.ajax({
-			type: "GET",
-			url: "/static/nccu_calendar.xml",
-			dataType: "xml",
-			timeout: 1000,
-			error: function(xml){
-				$events.find('.links_next').addClass('disabled')
-				$events.find('.error_mag').show();
-				$events.find('ul').hide();
-				$events.find('.error_mag').html("讀取錯誤");
-			},
-			success: function(xml) {
-				xmlLength = $(xml).find('entry').length;
-				$(xml).find('entry').slice(selet, selet+objLength).each(function(i){
-					title_text = $(this).find('title').text()
-					link_text = $(this).find('link').attr('href')
-					summary_text = $(this).find('summary').text()
-					indexA = summary_text.indexOf("-");
-					indexB = summary_text.indexOf(" ");
-					indexC = summary_text.indexOf("/");
-					//清除前後空白字元
-					summary_text = jQuery.trim(summary_text);
-					//篩選標題
-					title_text = title_text.slice(0, 16)
-					if (summary_text.length == 31) {
-						startDate_text = summary_text.slice(0, indexA);
-						startMon_text = startDate_text.slice((indexC+1), (indexC+3));
-						startDay_text = startDate_text.slice(7);
-						endDate_text = summary_text.slice((indexA+1), indexB);
-						time_text = summary_text.slice((indexB+1));
-					} else {
-						startDate_text = summary_text.slice(0, indexB);
-						startMon_text = startDate_text.slice((indexC+1), (indexC+3));
-						startDay_text = startDate_text.slice(7);
-						endDate_text = '';
-						time_text = summary_text.slice((indexB+1));
-					}
-					if(startMon_text.slice(0, 1) == '0'){
-						startMon_text = month[startMon_text.slice(1)-1];
-					} else {
-						startMon_text = month[startMon_text-1];
-					}
-					$events.find('li').eq(i).find($mon).html(startMon_text);
-					$events.find('li').eq(i).find($day).html(startDay_text);
-					$events.find('li').eq(i).find($link_text).html(title_text+"…");
-					$events.find('li').eq(i).find($link_text).attr('href', link_text);
-					$events.find('li').eq(i).find($time).html('時間：'+time_text);
-					//console.log();
-					/*$('<li></li>')
-					.html('<div class="event_date"><span class="mon">'+startMon_text+'</span><span class="day">'+startDay_text+'</div>')
-					.appendTo('.events ul');*/
-				});//close each(
-			}
-		}); //close $.ajax(
-	}
 });
@@ -7,10 +7,6 @@ function append_id(){
  };
 }

-$("div.editable").live("mouseenter mouseleave", function (event) {
-  $(this).children('.edit_link').toggle();
-});
-
 $("#page_design").live('change', function() {
  $.getScript($(this).attr('rel') + '?design_id=' + $(this).val() + append_id());
 });
@@ -8,32 +8,37 @@ var orbitDesktopAPI = function(){
 		//msg (string) : message to display
 		//type (string : success, imp, alert
 		//time (int) : duration for notification in seconds
-		var $notify = $("#orbitnote");
-		var img, n_height;
+		var $notify = $('#orbitnote'),
+			ani_method = { direction: 'up',easing: 'easeInOutQuint' },
+			img, n_height;
 		if(!type)type="";
 		switch(type){
 			case "alert":
-			img = "note_alert.png";
+				img = "exclamation-sign";
 			break;
 			case "imp":
-			img = "note_imp.png";
+				img = "warning-sign";
 			break;
 			case "success":
-			img = "note_success.png";
+				img = "ok";
 			break;
 			default:
-			img = "note_alert.png";
+				img = "exclamation-sign";
 			break;
 		}
-		$notify.find("img#note_img").attr("src",o.notifyImgPath+img);
-		$notify.find(".note_message").html(msg);
-		n_height = $notify.outerHeight();
-		if(!time)time=5000; else time=time*1000;
-		$notify
-			.css({'top':-n_height, 'display':'block', 'opacity':0})
-			.animate({top:0,opacity:1},200)
+		if( !time || time > 20) time = 5000; else time = time*1000;
+
+		var sign = '<div class="note_type"><span class="sign icon-'+ img +'"></span></div>',
+			message = '<div class="note_message">'+ msg +'</div>',
+			item = '<div class="note_holder admbg">'+ sign + message +'</div>';
+
+		$(item)
+			.prependTo($notify)
+			.stop(1,1)
+			.toggle('slide', ani_method, 300)
 			.delay(time)
-			.animate({top:-n_height,opacity:0},200);
+			.toggle('slide', ani_method, 800);
+		$notify.find('.note_holder:hidden').remove();
 	};
 	this.executeFunc = function(func,callbackFn){
 		//takes 2 arguments 
@@ -67,7 +72,7 @@ var orbitDesktopAPI = function(){
 	this.changeWallpaper = function(wallpaper){
 		//takes 1 parameter
 		//wallpaper (string): takes wallpaper and sets the wallpaper
-		$("img#thmbackground").attr("src",o.wallpaperPath+wallpaper);
+		$("#thmbackground").attr("src",o.wallpaperPath+wallpaper);
 		o.saveWallpaper(wallpaper);
 	};
 	this.confirm = function(settings,callbackfn){
@@ -111,29 +116,35 @@ var orbitDesktopAPI = function(){
 		})
 		return tempArray;
 	};
-	this.appWindow = function(settings,callbackfn){
+	this.appWindow = function(options,callbackfn){
 		//takes set of arguments as array and gives callback
 		//settings.method (string) : like open and close 
 		//settings.title (string) : the window title
 		//settings.extUrl (boolean) : true for opening external url else false
 		//settings.appid (string) : appid.. user can use this appid to open or close or refresh the window
 		//settings.url (string) : it is the url if you want to force external url to open in appwindow... you have to pass extURL in appid if you want to open externalurl
-		if(typeof settings == "undefined")settings = {};
+		var settings = {
+			method : "open",
+			extUrl : true,
+			title : "New Window"
+		}
+		$.extend(settings,options);
 		if(!settings.appid){
 			o.notify("Invalid AppID.","imp",3);
 			return;
 		}
-		if(!settings.method)settings.method = "open";
-		if(!settings.extUrl)settings.extUrl = true;
+		var isWindow = ($("div.app_frame[data-app="+settings.appid+"]").length > 0 ? $("div.app_frame[data-app="+settings.appid+"]") : null);
+		if(isWindow){
+			o.minimizeBarManager.maximize(isWindow);
+			return;
+		}
 		if(settings.method == 'open'){
 			var appurl = "http://www.rulingcom.com";
 			o.windowcounter++;
-			if(!settings.title)settings.title = "New Window "+o.windowcounter;
 			if(settings.extUrl){
 				if(settings.url){
 					
 					if(settings.url.substr(0,4)!="http")settings.url = "http://"+settings.url;
-					console.log(settings.url)
 					var urlregex = new RegExp("^(http:\/\/www.|https:\/\/www.|ftp:\/\/www.|www.){1}([0-9A-Za-z]+\.)");
 					if(urlregex.test(settings.url))
 						appurl = settings.url;
@@ -147,20 +158,34 @@ var orbitDesktopAPI = function(){
 					return;
 				}
 			}
-			var whtml =$('<div id="app_frame_'+o.windowcounter+'" class="thmc2 app_frame" data-app="'+settings.appid+'"><div id="content"><div id="header" class="hh3"><div class="dtitle w2 hh3 hp" style="text-transform:capitalize;"><span class="thmtxth">'+settings.title+'</span></div><span class="icon-remove hh3 hp thmtxt"></span></div><div id="holder_'+o.windowcounter+'" class="app_holder"><iframe src="'+appurl+'" frameborder="0" scrolling="auto"></iframe><div class="clear"></div></div></div></div>');
+			var whtml =$('<div id="app_frame_'+o.windowcounter+'" class="thmc2 app_frame" data-app="'+settings.appid+'" data-title="'+ settings.title +'"><div class="app_frame_header"><div class="dtitle hh2 hp"><span class="thmtxth">'+settings.title+'</span></div><span class="icon-remove hh2 hp thmtxt"></span><span class="icon-minus hh2 hp thmtxt"></span></div><div id="holder_'+o.windowcounter+'" class="app_holder clear"><iframe src="'+appurl+'" frameborder="0" scrolling="auto"></iframe></div></div>');
 			$(o.contentHolder).append(whtml);
-			var parentwindow = $(o.contentHolder).find("div#app_frame_"+o.windowcounter);
+			var parentwindow = $(o.contentHolder).find("#app_frame_"+o.windowcounter);
 			var app_holder_height = parentwindow.height() - 72;
 			var app_holder_width = parentwindow.width();
 			parentwindow.find("iframe").attr({"height":app_holder_height,"width":app_holder_width});
-			parentwindow.find("div.app_holder").height(app_holder_height);
-			parentwindow.find("span.icon-remove").click(function(){
-				parentwindow.remove();
+			parentwindow.find(".app_holder").height(app_holder_height);
+			parentwindow.find(".icon-remove").click(function(){
+				o.appWindow.close(parentwindow);
+			});
+			parentwindow.find(".icon-minus").click(function(){
+				o.appWindow.minimize(parentwindow);
 			})
+
 		}
+
+		this.appWindow.close = function(win){
+			win.remove();
+		}
+
+		this.appWindow.minimize = function(win){
+			o.minimizeBarManager.minimize(win)
+		}
+
 		if(typeof callbackfn=="function"){
-			callbackfn.call(this);
+			callbackfn.call(this,parentwindow);
 		}
+		return parentwindow;
 	};
 	this.toolPopup = function(settings){
 		if(settings == "destroy"){
@@ -206,12 +231,6 @@ var orbitDesktopAPI = function(){
 			}
 		}
 	};
-	this.use_select2 = function(){
-		$('select:not(.select2-offscreen)').select2({
-			minimumResultsForSearch: -1
-			// minimumInputLength: -1
-		});
-	}
 };
 orbitDesktopAPI.prototype.notifyImgPath = "temp";
 orbitDesktopAPI.prototype.wallpaperPath = "temp";
@@ -21,4 +21,8 @@ var bindTreeDragHandle = function(){
 			$.post("<%= Rails.application.routes.url_helpers.admin_update_position_path %>", { id: ui.item.attr('id'), parent_id: ui.item.parent().closest('li').attr('id'), position: ui.item.index() } );
  	}
 	});
-}
+}
+
+$("div.editable").live("mouseenter mouseleave", function (event) {
+  $(this).children('.edit_link').toggle();
+});
@@ -1,6 +0,0 @@
-$(".attributes").append('<%= escape_javascript(render :partial=>"attribute_field",:locals=>{:attribute_field=>@attribute_field,:attribute_field_counter=>@attribute_field_counter} )%>');
-            $(".dataType").change(function () {
-                        $(this).parents("legend").next("div").find("div[class^='type']").addClass("hide");
-                        $(this).parents("legend").next("div").find("."+$(this).find("option:selected").attr("ref")).removeClass("hide");
-
-                })
@@ -4,16 +4,16 @@
 *the top of the compiled file, but it's generally better to create a new file per style scope.
 *= require desktop/desktop-font
 *= require bootstrap
- *= require bootstrap-orbit
+ *= require orbit_bar_bootstrap
+ *= require basic/orbit_bar
 *= require jquery.miniColors
 *= require jquery.gridster
 *= require jquery-ui
 *= require font-awesome
- *= require icons
+ *= require basic/icon
 *= require desktop/desktop-component
 *= require desktop/desktop-main
 *= require desktop/desktop-media
 *= require desktop/desktop-select2
 *= require desktop/desktop-timeline
- *= require orbit-bar
 */
@@ -3,12 +3,14 @@ $gray: #ddd;
@mixin font-main($font-size) {
 	font-family: "Source Sans Pro", sans-serif;
 	font-size: #{$font-size}px;
-	font-weight: 300;
 }
@mixin font-sub($font-size) {
 	font-family: "Source Sans Pro", Arial, sans-serif;
 	font-size: #{$font-size}px;
-	font-weight: 300;
+}
+@mixin font-icon($font-size) {
+  font-family: "FontAwesome";
+  font-size: #{$font-size}px;
 }
@mixin transition-type($property, $sec) {
 	-webkit-transition: #{$property} #{$sec}s ease;
@@ -50,6 +50,14 @@
    width: 384px; }
  .s_grid_row .s_grid_12 {
    width: 420px; }
+  .s_grid_row .s_grid_13 {
+    width: 456px; }
+  .s_grid_row .s_grid_14 {
+    width: 492px; }
+  .s_grid_row .s_grid_15 {
+    width: 528px; }
+  .s_grid_row .s_grid_16 {
+    width: 564px; }
  .s_grid_row:last-child {
    margin-bottom: 0; }
  .s_grid_row .s_grid_h_1 {
@@ -92,20 +100,28 @@
  z-index: 9;
  left: 0;
  top: 60px;
-  font-size: 15px; }
-
-.sdm_o li {
-  border-top: solid 1px #f2f2f2; }
-
-.sdm_o li:first-child {
-  border: none; }
-
-.sdm_o a {
-  display: block; }
-
-.sdm_o .admtxt {
-  display: block;
-  line-height: 36px; }
+  font-size: 15px;
+  min-width: 120px;
+  border: solid 2px #dddddd;
+  -webkit-box-sizing: border-box;
+  /* webkit */
+  -khtml-box-sizing: border-box;
+  /* konqueror */
+  -moz-box-sizing: border-box;
+  /* firefox */
+  -ms-box-sizing: border-box;
+  /* ie */
+  box-sizing: border-box;
+  /* css3 */ }
+  .sdm_o li {
+    border-top: solid 1px #f7f7f7; }
+  .sdm_o li:first-child {
+    border: none; }
+  .sdm_o a {
+    display: block; }
+  .sdm_o .admtxt {
+    display: block;
+    line-height: 36px; }

 /* simple dropdown menu with indicator */
 .sdm_mdr .sdm_t {
@@ -119,45 +135,34 @@
 .s_menu {
  font-size: 15px;
  line-height: 36px; }
-
-.s_menu li {
-  border-top: solid 1px #dddddd; }
-
-.s_menu li:first-child {
-  border: none; }
-
-.s_menu a {
-  display: block; }
+  .s_menu li {
+    border-top: solid 1px #eaeaea; }
+  .s_menu li:first-child {
+    border: none; }
+  .s_menu a {
+    display: block; }

 /* simple tabs */
 .s_tab {
  font-size: 15px;
  line-height: 36px; }
-
-.s_tab ul {
-  overflow: hidden; }
-
-.s_tab li {
-  float: left; }
-
-.s_tab a {
-  display: block; }
-
-.s_tab .admbg {
-  background-color: #f0f0f0; }
+  .s_tab ul {
+    overflow: hidden; }
+  .s_tab li {
+    float: left; }
+  .s_tab a {
+    display: block; }
+  .s_tab .admbg {
+    background-color: #f0f0f0; }

 .st_c {
  display: none; }

-.st_c:first-child {
-  display: block; }
-
 /* simple form */
 .s_form {
  font-size: 15px; }
  .s_form label {
    font-size: 13px;
-    font-weight: normal;
    display: inline-block;
    vertical-align: middle;
    width: 100px;
@@ -167,6 +172,9 @@
      line-height: 32px; }
  .s_form input[type=text],
  .s_form input[type=password],
+  .s_form input[type=submit],
+  .s_form input[type=reset],
+  .s_form input[type=button],
  .s_form select {
    height: 32px;
    margin-top: 0;
@@ -197,7 +205,7 @@
    .s_form input[type=text]:focus,
    .s_form input[type=password]:focus,
    .s_form textarea:focus {
-      background-color: #f7f7f7; }
+      border-color: #c4c4c4; }
  .s_form textarea {
    resize: none; }
    .s_form textarea.full_height {
@@ -214,7 +222,8 @@
  .s_form .s_table thead th {
    border-bottom: solid 1px #eeeeee; }

-.check_box_g {
+/* simple select */
+.s_select_g {
  padding: 4px 8px;
  -webkit-box-sizing: border-box;
  /* webkit */
@@ -226,22 +235,89 @@
  /* ie */
  box-sizing: border-box;
  /* css3 */ }
-  .check_box_g li {
+  .s_select_g li {
    margin: 0 6px 6px 0;
    padding: 0; }
-  .check_box_g li,
-  .check_box_g li > * {
+  .s_select_g li,
+  .s_select_g li > * {
    display: inline-block;
    vertical-align: middle; }
-  .check_box_g label {
+  .s_select_g label {
    width: auto;
    margin: 0; }
-  .check_box_g > label {
+  .s_select_g > label {
    font-size: 15px;
    display: block;
    padding: 4px 0; }
-  .check_box_g li label {
-    padding-left: 4px; }
+  .s_select_g li label {
+    padding-left: 4px;
+    cursor: pointer; }
+    .s_select_g li label:before {
+      display: inline-block;
+      vertical-align: middle;
+      width: 14px;
+      height: 14px;
+      line-height: 14px;
+      text-align: center;
+      margin-right: 6px;
+      content: '';
+      border: solid 1px #c4c4c4; }
+  .s_select_g input[type=checkbox],
+  .s_select_g input[type=radio] {
+    display: none; }
+  .s_select_g input[type=checkbox]:checked + label:before, .s_select_g input[type=radio]:checked + label:before {
+    background-color: #444444;
+    border-color: #444444;
+    color: #fff;
+    font-family: "FontAwesome";
+    font-size: 12px; }
+  .s_select_g input[type=checkbox]:checked + label:before {
+    content: "\f00c"; }
+  .s_select_g input[type=radio] + label:before {
+    border-radius: 8px; }
+  .s_select_g input[type=radio]:checked + label:before {
+    content: "\f111";
+    font-size: 9px;
+    -webkit-text-size-adjust: none; }
+
+/* simple switch */
+.s_switch {
+  overflow: hidden; }
+  .s_switch .s_switch_status {
+    font-size: 1.5em;
+    line-height: 20px;
+    height: 20px;
+    float: left;
+    margin-right: 60px; }
+  .s_switch .s_switch_switcher {
+    display: block;
+    float: right;
+    position: relative;
+    width: 48px;
+    height: 20px;
+    overflow: hidden; }
+    .s_switch .s_switch_switcher input[type=checkbox] {
+      width: 144px;
+      height: 20px;
+      margin: 0;
+      position: absolute;
+      top: 0;
+      left: -96px; }
+      .s_switch .s_switch_switcher input[type=checkbox] + .s_switch_toggle {
+        display: block;
+        position: absolute;
+        left: -2px;
+        top: -2px;
+        width: 16px;
+        height: 20px;
+        background-color: #000;
+        border: solid 2px white;
+        cursor: pointer;
+        -webkit-transition: left 0.3s ease;
+        -moz-transition: left 0.3s ease;
+        transition: left 0.3s ease; }
+      .s_switch .s_switch_switcher input[type=checkbox]:checked + .s_switch_toggle {
+        left: 30px; }

 /* tool bar */
 .toolbar {
@@ -249,28 +325,23 @@
  font-size: 15px;
  line-height: 36px;
  position: relative;
-  z-index: 9; }
-
-.toolbar .sdm, .toolbar .fn_g {
-  display: inline-block;
-  vertical-align: top; }
-
-.toolbar .sdm_o {
-  top: 36px;
-  background-color: #f0f0f0; }
-
-.toolbar button {
-  border: none;
-  outline: none;
-  padding: 0 16px;
-  margin: 0;
-  font-family: inherit;
-  font-size: 15px;
-  vertical-align: top; }
-
-.toolbar .fn_btn {
-  display: inline-block;
-  vertical-align: top; }
+  z-index: 99; }
+  .toolbar .sdm, .toolbar .fn_g {
+    display: inline-block;
+    vertical-align: top; }
+  .toolbar .sdm_o {
+    top: 36px; }
+  .toolbar button {
+    border: none;
+    outline: none;
+    padding: 0 16px;
+    margin: 0;
+    font-family: inherit;
+    font-size: 15px;
+    vertical-align: top; }
+  .toolbar .fn_btn {
+    display: inline-block;
+    vertical-align: top; }

 /* tiny scrollbar */
 .tinycanvas {
@@ -281,13 +352,18 @@
    width: auto;
    height: 100%;
    overflow: hidden;
-    position: relative; }
+    position: relative;
+    z-index: 10; }
  .tinycanvas .overview {
    position: absolute;
    left: 0;
    top: 0;
-    min-width: 100%;
+    width: 100%;
    height: 100%; }
+    .tinycanvas .overview:after {
+      content: "";
+      display: table;
+      width: 100%; }
    .tinycanvas .overview > .column {
      float: left;
      border-right: solid 1px #eeeeee;
@@ -346,7 +422,7 @@
      width: 6px; }
  .tinycanvas .scrollbar {
    position: absolute;
-    z-index: 9;
+    z-index: 11;
    visibility: hidden;
    opacity: 0;
    -webkit-transition: opacity 0.3s ease;
@@ -357,7 +433,7 @@
      visibility: visible; }
    .tinycanvas .scrollbar.sb_h {
      left: 0;
-      bottom: -6px;
+      bottom: 0;
      height: 6px; }
    .tinycanvas .scrollbar.sb_v {
      right: 0;
@@ -368,10 +444,7 @@
  .tinycanvas:hover .scrollbar {
    visibility: visible;
    opacity: 1; }
-
-.toolbar + .tinycanvas,
-.s_tab + .tinycanvas {
-  height: 480px; }
-
-#panel_r .tinycanvas {
-  padding: 12px 0; }
+  .toolbar + .tinycanvas, .s_tab + .tinycanvas {
+    height: 480px; }
+  #panel_r .tinycanvas {
+    padding: 12px 0; }
@@ -19,9 +19,11 @@
 			margin-left: 0;
 		}
 	}
-	// fixed width column
-	// full width 420px
-	@for $i from 1 through 12 {
+	// fixed width column with 12px gutter
+	// 276px width for 8 columns
+	// 420px width for 12 columns
+	// 564px width for 16 columns
+	@for $i from 1 through 16 {
 		.s_grid_#{$i} {
 			width: 36px * $i - 12px;
 		}
@@ -38,6 +40,7 @@
 			height: 44px * $j - 12px;
 		}
 	}
+
 }

 /* simple dropdown menu */
@@ -58,19 +61,23 @@
 	left: 0;
 	top: 60px;
 	font-size: 15px;
+	min-width: 120px;
+	border: solid 2px $gray;
+	@include box-sizing;
+	
+	li {
+		border-top: solid 1px lighten( $gray, 10% );
+	}
+	li:first-child {
+		border: none;
+	}
+	a {
+		display: block;
+	}
+	.admtxt {
+		display: block;
+		line-height: 36px;
 	}
-.sdm_o li {
-	border-top: solid 1px #f2f2f2;
-}
-.sdm_o li:first-child {
-	border: none;
-}
-.sdm_o a {
-	display: block;
-}
-.sdm_o .admtxt {
-	display: block;
-	line-height: 36px;
 }

 /* simple dropdown menu with indicator */
@@ -86,42 +93,41 @@
 .s_menu { 
 	font-size: 15px;
 	line-height: 36px;
-}
-.s_menu li {
-	border-top: solid 1px #ddd;
-}
-.s_menu li:first-child {
-	border: none;
-}
-.s_menu a {
-	display: block;
+
+	li {
+		border-top: solid 1px lighten($gray, 5%);
+	}
+	li:first-child {
+		border: none;
+	}
+	a {
+		display: block;
+	}
 }

 /* simple tabs */
 .s_tab {
 	font-size: 15px;
 	line-height: 36px;
+
+	ul {
+		overflow: hidden;
+	}
+	li {
+		float: left;
+	}
+	a {
+		display: block;
+	}
+	.admbg {
+		background-color: #f0f0f0;
+	}
 }
 .stb_h {}
 .stb_v {}
-.s_tab ul {
-	overflow: hidden;
-}
-.s_tab li {
-	float: left;
-}
-.s_tab a {
-	display: block;
-}
-.s_tab .admbg {
-	background-color: #f0f0f0;
-}
 .st_c {
 	display: none;
 }
-.st_c:first-child {
-	display: block;
-}

 /* simple form */
 .s_form {
@@ -130,7 +136,6 @@
 	// basic style
 	label {
 		font-size: 13px;
-		font-weight: normal;
 		display: inline-block;
 		vertical-align: middle;
 		width: 100px;
@@ -143,6 +148,9 @@
 	}
 	input[type=text],
 	input[type=password],
+	input[type=submit],
+	input[type=reset],
+	input[type=button],
 	select {
 		height: 32px;
 		margin-top: 0;
@@ -164,7 +172,8 @@
 		@include box-sizing;

 		&:focus {
-			background-color: lighten($gray, 10%);
+			// background-color: lighten($gray, 10%);
+			border-color: darken($gray, 10%);
 		}
 	}
 	textarea {
@@ -192,8 +201,8 @@
 	}
 }

-
-.check_box_g {
+/* simple select */
+.s_select_g {
 	padding: 4px 8px;
 	// border: solid 1px $gray;
 	@include box-sizing;
@@ -218,6 +227,87 @@
 	}
 	li label {
 		padding-left: 4px;
+		cursor: pointer;
+
+		&:before {
+			display: inline-block;
+			vertical-align: middle;
+			width: 14px;
+			height: 14px;
+			line-height: 14px;
+			text-align: center;
+			margin-right: 6px;
+			content: '';
+			border: solid 1px darken($gray, 10%);
+		}
+	}
+	input[type=checkbox],
+	input[type=radio]
+	{
+		display: none;
+	}
+	input[type=checkbox]:checked + label:before, input[type=radio]:checked + label:before {
+		background-color: darken($gray, 60%);
+		border-color: darken($gray, 60%);
+		color: #fff;
+		@include font-icon(12);
+	}
+	input[type=checkbox]:checked + label:before {
+		content: "\f00c";
+	}
+	input[type=radio] + label:before {
+		border-radius: 8px;
+	}
+	input[type=radio]:checked + label:before {
+		content: "\f111";
+		font-size: 9px;
+		-webkit-text-size-adjust: none;
+	}
+}
+
+/* simple switch */
+.s_switch {
+	overflow: hidden;
+
+	.s_switch_status {
+		font-size: 1.5em;
+		line-height: 20px;
+		height: 20px;
+		float: left;
+		margin-right: 60px;
+	}
+	.s_switch_switcher {
+		display: block;
+		float: right;
+		position: relative;
+		width: 48px;
+		height: 20px;
+		overflow: hidden;
+
+		input[type=checkbox] {
+			width: 144px;
+			height: 20px;
+			margin: 0;
+			position: absolute;
+			top: 0;
+			left: -96px;
+
+			+ .s_switch_toggle {
+				display: block;
+				position: absolute;
+				left: -2px;
+				top: -2px;
+				width: 16px;
+				height: 20px;
+				background-color: #000;
+				border: solid 2px #fff;
+				cursor: pointer;
+				@include transition-type(left,0.3);
+			}
+			&:checked  + .s_switch_toggle {
+				left: 30px;
+			}
+		}
 	}
 }

@@ -227,28 +317,28 @@
 	font-size: 15px;
 	line-height: 36px;
 	position: relative;
-	z-index: 9;
-}
-.toolbar .sdm, .toolbar .fn_g {
-	display: inline-block;
-	vertical-align: top;
-}
-.toolbar .sdm_o {
-	top: 36px;
-	background-color: #f0f0f0;
-}
-.toolbar button {
-	border: none;
-	outline: none;
-	padding: 0 16px;
-	margin: 0;
-	font-family: inherit;
-	font-size: 15px;
-	vertical-align: top;
-}
-.toolbar .fn_btn {
-	display: inline-block;
-	vertical-align: top;
+	z-index: 99;
+	
+	.sdm, .fn_g {
+		display: inline-block;
+		vertical-align: top;
+	}
+	.sdm_o {
+		top: 36px;
+	}
+	button {
+		border: none;
+		outline: none;
+		padding: 0 16px;
+		margin: 0;
+		font-family: inherit;
+		font-size: 15px;
+		vertical-align: top;
+	}
+	.fn_btn {
+		display: inline-block;
+		vertical-align: top;
+	}
 }

 /* tiny scrollbar */
@@ -262,14 +352,21 @@
 		height: 100%;
 		overflow: hidden;
 		position: relative;
+		z-index: 10;
 	}
 	.overview {
 		position: absolute;
 		left: 0;
 		top: 0;
-		min-width: 100%;
+		width: 100%;
 		height: 100%;

+		&:after {
+			content: "";
+			display: table;
+			width: 100%;
+		}
+
 		> .column {
 			float: left;
 			border-right: solid 1px #eee;
@@ -323,7 +420,7 @@
 	}
 	.scrollbar {
 		position: absolute;
-		z-index: 9;
+		z-index: 11;
 		visibility: hidden;
 		opacity: 0;
 		@include transition-type(opacity, 0.3);
@@ -334,7 +431,7 @@
 		}
 		&.sb_h {
 			left: 0;
-			bottom: -6px;
+			bottom: 0;
 			height: 6px;
 		}
 		&.sb_v {
@@ -351,11 +448,11 @@
 		visibility: visible;
 		opacity: 1;
 	}
-}
-.toolbar + .tinycanvas,
-.s_tab + .tinycanvas {
-	height: 480px;
-}
-#panel_r .tinycanvas {
-	padding: 12px 0;
+	.toolbar + &,
+	.s_tab + & {
+		height: 480px;
+	}
+	#panel_r & {
+		padding: 12px 0;
+	}
 }
@@ -54,7 +54,6 @@ table {
 body {
  font-family: "Source Sans Pro", sans-serif;
  font-size: 12px;
-  font-weight: 300;
  background-color: #000; }

 a, a:hover {
@@ -70,23 +69,34 @@ a:focus {
 .clear:after {
  display: table;
  width: 100%;
-  content: ''; }
+  content: '';
+  clear: both; }
+
+.valign:before {
+  content: '';
+  height: 100%;
+  display: inline-block;
+  vertical-align: middle; }

 .o-loading {
-  font-size: 13px;
-  font-weight: normal; }
+  font-size: 13px; }
+  .fullsize .o-loading {
+    padding: 12px; }
  .o-loading i {
    font-size: 20px; }

 #thmbackground {
-  min-height: 100%;
-  min-width: 980px;
  width: 100%;
-  height: auto;
+  height: 100%;
  position: fixed;
  top: 0;
  left: 0;
-  z-index: -1; }
+  z-index: -1;
+  background-repeat: no-repeat;
+  -webkit-background-size: cover;
+  -moz-background-size: cover;
+  -o-background-size: cover;
+  background-size: cover; }

 #bgover {
  position: fixed;
@@ -120,13 +130,14 @@ a:focus {
  background-color: #fff; }

 .admbg2 {
-  background-color: #ddd; }
+  background-color: #dddddd; }

 .admtxt {
  color: #666; }

-.admtxt:hover {
-  color: #666; }
+a.admtxt.admbg2:hover {
+  color: #fff;
+  background-color: #aaaaaa; }

 .hfn {
  font-size: 15px;
@@ -146,6 +157,15 @@ a:focus {
 .ini_input:focus {
  outline: none; }

+.text_ofl {
+  overflow: hidden; }
+  .text_ofl span {
+    display: inline-block;
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis; }
+
 /* - Opacity */
 .op00 {
  opacity: 0; }
@@ -237,7 +257,15 @@ a:focus {
 .element {
  margin: 0 12px 12px 0;
  float: left;
-  position: relative; }
+  position: relative;
+  cursor: pointer;
+  -webkit-transition: all 0.2s ease;
+  -moz-transition: all 0.2s ease;
+  transition: all 0.2s ease; }
+  .element:active {
+    -webkit-transform: scale(0.92);
+    -moz-transform: scale(0.92);
+    transform: scale(0.92); }

 .group {
  float: left;
@@ -245,12 +273,14 @@ a:focus {

 /* desktop layout */
 #container {
-  padding: 48px 0 0 156px; }
+  padding: 48px 0 0 156px;
+  min-width: 800px; }

 #header {
  padding: 0 0 12px 0;
-  min-width: 800px;
-  height: 72px; }
+  height: 72px;
+  position: relative;
+  z-index: 2; }

 #side {
  width: 60px;
@@ -259,12 +289,13 @@ a:focus {
  margin-right: 96px;
  top: 120px;
  left: 0;
-  z-index: 11; }
+  z-index: 13; }

 #holder {
  height: 516px;
  width: auto;
-  position: relative; }
+  position: relative;
+  z-index: 1; }

 #rwidget {
  height: 516px; }
@@ -294,7 +325,7 @@ a:focus {

 .fn_des.admtxt {
  line-height: 60px;
-  padding: 0 6px;
+  padding: 0 12px;
  font-size: 15px;
  position: absolute;
  z-index: 9;
@@ -333,44 +364,64 @@ a:focus {
  .section_label li {
    font-size: 15px; }
  .section_label li:first-child {
-    font-size: 18px;
-    font-weight: normal; }
+    font-size: 18px; }

 /* panel */
 #panel_l {
-  background-color: #f0f0f0;
+  background-color: #f7f7f7;
  float: left; }

 #panel_r {
+  background-color: #fff;
  margin-left: 252px;
-  position: relative; }
+  position: relative;
+  width: auto; }

 /* Desktop Notification */
 #orbitnote {
  position: fixed;
  top: 0;
  left: 50%;
-  margin-left: -206px;
+  margin-left: -200px;
  z-index: 99999;
  width: 400px;
-  padding: 0 6px 6px 6px;
-  background-color: #000;
-  background-color: rgba(0, 0, 0, 0.6); }
+  -webkit-transition: height 2s ease;
+  -moz-transition: height 2s ease;
+  transition: height 2s ease; }
  #orbitnote .note_holder {
-    background-color: #f3f3f3;
-    border: solid 1px white;
-    border-top: none;
    overflow: hidden;
-    padding: 24px 24px; }
+    padding: 36px;
+    border: solid 2px #dddddd;
+    border-top: 0;
+    display: none; }
    #orbitnote .note_holder .note_type {
-      float: left; }
-      #orbitnote .note_holder .note_type img {
-        display: block; }
+      display: inline-block;
+      vertical-align: middle;
+      width: 60px;
+      height: 60px;
+      color: #fff; }
+      #orbitnote .note_holder .note_type .sign {
+        display: block;
+        font-size: 40px;
+        width: 40px;
+        height: 40px;
+        padding: 10px;
+        border-radius: 30px;
+        text-align: center; }
+        #orbitnote .note_holder .note_type .sign.icon-ok {
+          background-color: #5BB75B; }
+        #orbitnote .note_holder .note_type .sign.icon-exclamation-sign {
+          background-color: #DA4F49; }
+        #orbitnote .note_holder .note_type .sign.icon-warning-sign {
+          background-color: #FAA732; }
    #orbitnote .note_holder .note_message {
      color: #333;
-      margin: 10px 0 0 48px;
-      font-size: 15px;
-      font-weight: normal; }
+      display: inline-block;
+      vertical-align: middle;
+      word-wrap: break-word;
+      width: 240px;
+      margin: 0 0 0 20px;
+      font-size: 15px; }

 /* Desktop Dialogue */
 #orbitdiag {
@@ -379,7 +430,8 @@ a:focus {
  height: 100%;
  left: 0;
  top: 0;
-  z-index: 12; }
+  z-index: 12;
+  display: none; }
  #orbitdiag .tile {
    background-color: #000; }
  #orbitdiag .diag_holder {
@@ -401,7 +453,6 @@ a:focus {
        margin: 0 6px;
        text-align: center;
        font-size: 15px;
-        font-weight: normal;
        line-height: 36px; }
        #orbitdiag .diag_holder .diag_holder_inner .diag_btn:hover {
          outline: solid 2px white; }
@@ -418,12 +469,12 @@ a:focus {
  position: absolute;
  left: 0;
  bottom: 0;
-  z-index: 3; }
+  z-index: 3;
+  white-space: nowrap; }
  [data-sizex="1"] .appname, .w1.h1 .appname {
    text-align: center; }
  [data-sizey="2"] .appname {
-    font-size: 21px;
-    font-weight: normal; }
+    font-size: 21px; }
  .hh2 .appname {
    position: relative;
    width: auto;
@@ -437,7 +488,7 @@ a:focus {
  height: 60px;
  margin: 0 auto;
  position: relative; }
-  [data-sizex="1"] .appicon {
+  [data-sizex="1"] .appicon, .w1.h1 .appicon {
    margin-top: 24px; }
  #sections .appicon {
    width: 30px;
@@ -475,8 +526,17 @@ a:focus {
  left: 0;
  top: 0; }

+.gridster ul {
+  margin: -6px 0 0 -6px; }
+
 .widget.gs_w {
-  cursor: move; }
+  cursor: move;
+  overflow: hidden; }
+
+.gs_w.dragging {
+  -webkit-transform: scale(0.92);
+  -moz-transform: scale(0.92);
+  transform: scale(0.92); }

 /* header drop menu */
 .sdm_mdr .sdm_o {
@@ -507,7 +567,6 @@ a:focus {

 .theme_preview {
  width: 528px;
-  height: 150px;
  line-height: 36px;
  font-size: 15px; }

@@ -518,15 +577,24 @@ a:focus {
    margin-right: 12px; }
  .theme_plate > div:first-child {
    margin-right: 48px; }
+  .theme_plate .g_sep {
+    margin-right: 0; }
+
+#color_input th {
+  vertical-align: bottom; }

 .stock_wallpaper .ssl_item {
  margin-bottom: 6px; }

 .s_title {
  font-size: 21px;
-  font-weight: normal;
  line-height: 60px;
  text-align: left; }
+  .s_title.size_large {
+    font-size: 36px; }
+  .s_title.size_small {
+    font-size: 15px;
+    line-height: 2em; }

 .s_subtitle {
  font-size: 15px;
@@ -538,30 +606,88 @@ a:focus {
  padding: 24px 0;
  margin-top: 12px;
  overflow: hidden;
-  border-top: solid 1px #eeeeee;
-  background-color: #fff; }
+  border-top: solid 1px #eeeeee; }
+  .s_action .setting_btn {
+    margin-left: 12px; }

 .setting_btn {
  display: block;
  float: right;
  font-size: 15px;
-  font-weight: normal;
  line-height: 36px;
  text-align: center;
  border: 0; }

-.group_search {
+/* Apps Manager */
+#app_info {
  float: left;
-  margin-right: 36px; }
+  width: 420px;
+  height: 516px;
+  margin-right: 36px;
+  display: none; }
+  #app_info .app_info_header {
+    height: 120px;
+    margin: -12px -12px 12px -12px;
+    position: relative;
+    background-color: #f7f7f7;
+    -webkit-box-sizing: border-box;
+    /* webkit */
+    -khtml-box-sizing: border-box;
+    /* konqueror */
+    -moz-box-sizing: border-box;
+    /* firefox */
+    -ms-box-sizing: border-box;
+    /* ie */
+    box-sizing: border-box;
+    /* css3 */ }
+    #app_info .app_info_header > * {
+      height: 100%; }
+    #app_info .app_info_header .app_info_icon {
+      display: block;
+      margin: 0 auto;
+      margin-top: 30px;
+      -webkit-box-sizing: border-box;
+      /* webkit */
+      -khtml-box-sizing: border-box;
+      /* konqueror */
+      -moz-box-sizing: border-box;
+      /* firefox */
+      -ms-box-sizing: border-box;
+      /* ie */
+      box-sizing: border-box;
+      /* css3 */ }
+    #app_info .app_info_header .app_info_name {
+      display: inline-block;
+      vertical-align: middle;
+      font-size: 2em;
+      width: 300px;
+      word-wrap: break-word; }
+    #app_info .app_info_header .panel_close {
+      position: absolute;
+      right: 12px;
+      top: 12px;
+      font-size: 20px; }
+  #app_info .app_info_list {
+    line-height: 1.5em;
+    overflow: hidden; }
+    #app_info .app_info_list label {
+      color: #aaaaaa; }
+
+#app_list {
+  float: left; }
+  #app_list .element > * {
+    cursor: pointer; }

 .search_result {
  float: left;
-  margin-right: 24px;
-  max-width: 340px; }
-
-.g_sep {
-  width: 11px;
-  border-left: solid 1px white; }
+  overflow: hidden; }
+  .search_result .message {
+    font-size: 15px;
+    word-wrap: break-word; }
+    .search_result .message b {
+      font-size: 20px;
+      display: block;
+      margin-top: 12px; }

 .grp {
  height: 528px;
@@ -586,14 +712,13 @@ a:focus {

 /* list item */
 .list_t_item {
-  /*padding: 2px;*/
  overflow: hidden; }

 .list_t_title {
-  margin-bottom: 6px;
-  color: #333;
+  padding-bottom: 6px;
+  color: #000;
  font-size: 15px;
-  font-weight: normal; }
+  line-height: 1.3em; }

 .list_t_des {
  line-height: 1.5em;
@@ -601,202 +726,28 @@ a:focus {
  margin-bottom: 4px;
  font-size: 13px; }

-.list_item_function a {
-  display: inline-block;
-  padding: 4px;
-  font-size: 11px;
-  -webkit-text-size-adjust: none; }
-
-/* Connection Page */
-#connection_setting {
-  height: 492px; }
-
-#connection_setting .s_form {
-  float: left;
-  margin: 0 12px 0 0;
-  padding-left: 24px;
-  height: 100%;
-  border-left: solid 1px #dddddd; }
-
-#connection_setting .s_form:first-child {
-  padding-left: 0;
-  border: none; }
-
-#connection_setting .s_form label {
-  line-height: 30px; }
-
-#connection_setting .s_form .c_icon, #connection_setting .s_form .c_name {
-  display: inline-block;
-  vertical-align: middle; }
-
-#connection_setting .s_form .c_name {
-  padding: 0 12px;
-  font-size: 18px; }
-
-#connection_setting .s_form input[type=text], #connection_setting .s_form input[type=password] {
-  width: 202px; }
-
-#connection_setting .setting_btn {
-  margin-left: 12px; }
-
-#connection_setting .setting_btn.disable {
-  background-color: #ddd;
-  cursor: default; }
-
-#connection_setting .c_status {
-  float: right;
-  padding: 6px;
-  background-color: #eee;
-  color: #ccc;
-  font-size: 9px;
-  font-weight: normal;
-  -webkit-text-size-adjust: none;
-  -webkit-transition: background-color 0.5s ease;
-  -moz-transition: background-color 0.5s ease;
-  transition: background-color 0.5s ease; }
-
-#connection_setting .c_status_on {
-  background-color: #51A351;
-  color: #fff; }
-
-#connection_setting .c_info {
-  padding: 7px 6px;
-  background-color: #fcfcfc;
-  cursor: default;
-  font-size: 18px;
-  font-weight: normal; }
-
-/* Journal Papers */
-[page-name="journal_p_list"] .list_t_item .inner {
-  padding-left: 30px; }
-
-[page-name="journal_p_list"] .list_item_action {
-  font-size: 12px;
-  float: left;
-  margin-left: -30px; }
-
-[page-name="journal_p_list"] .list_item_action a {
-  display: block;
-  width: 20px;
-  height: 20px;
-  line-height: 20px;
-  margin: 1px 1px 6px 1px; }
-
-[page-name="journal_p_list"] .list_item_action .icon-star-empty {
-  color: #999;
-  font-size: 20px; }
-
-[page-name="journal_p_list"] .list_item_action .icon-star {
-  color: #faa732;
-  font-size: 20px; }
-
-[page-name="journal_p_list"] .list_item_action .icon-check-empty {
-  color: #999;
-  font-size: 20px; }
-
-[page-name="journal_p_list"] .list_item_action .icon-check {
-  color: #333;
-  font-size: 20px; }
-
-[page-name="journal_p_list"] .list_t_item.file_view {
-  height: 148px; }
-
-[page-name="journal_p_list"] .file_view .file {
-  display: inline-block;
-  width: 62px;
-  height: 50px;
-  text-align: center; }
-
-[page-name="journal_p_list"] .file_view .file:hover {
-  background-color: #ddd; }
-
-[page-name="journal_p_list"] .file_view .file img {
-  width: 24px;
-  display: block;
-  margin: 0 auto;
-  margin-top: 4px; }
-
-[page-name="journal_p_list"] .file_view .filetitle {
-  font-size: 11px;
-  -webkit-text-size-adjust: none; }
-
-/* Journal Paper Add */
-#paper_add .s_grid_con {
-  float: left;
-  height: 456px;
-  margin-left: 12px;
-  padding-left: 12px;
-  border-left: solid 1px #eeeeee; }
-
-#paper_add .s_grid_con:first-child {
-  margin-left: 0;
-  padding-left: 0;
-  border: none; }
-
-#paper_add .f_w {
-  width: 336px; }
-
-#paper_add label {
-  margin-right: 0; }
-
-/* Journal Journal list */
-[page-name="journal_p_journal"] .datalist_item .inner {
-  padding-left: 30px; }
-
-[page-name="journal_p_journal"] .list_item_action {
-  font-size: 12px;
-  float: left;
-  margin-left: -30px; }
-
-[page-name="journal_p_journal"] .list_item_action i {
-  color: #999;
-  font-size: 20px;
-  display: block;
-  width: 20px;
-  height: 20px;
-  line-height: 20px;
-  margin: 1px 1px 6px 1px; }
-
-[page-name="journal_p_journal"] .list_t_desc {
-  font-family: Arial, sans-serif;
-  font-size: 12px;
-  color: #999; }
-
-/* Journal Co-Author */
-[page-name="journal_p_coauthor"] .list_t_item {
-  height: 110px; }
-
-[page-name="journal_p_coauthor"] .list_item_function a {
-  display: inline-block;
-  padding: 4px;
-  font-family: Arial, sans-serif;
-  font-size: 11px;
-  -webkit-text-size-adjust: none; }
-
-[page-name="journal_p_coauthor"] .info {
-  font-family: Arial, sans-serif; }
-
-[page-name="journal_p_coauthor"] .info li {
-  margin-bottom: 8px;
-  color: #999; }
-
-[page-name="journal_p_coauthor"] .info .name {
-  font-size: 18px;
-  line-height: 24px;
-  color: #333; }
-
-/* Journal Co-Author Relationship*/
-[page-name="journal_p_coauthor_relation"] .edit_co_author_relation {
-  /*margin-left: -10px;*/ }
-
-[page-name="journal_p_coauthor_relation"] .form_space {
-  margin-bottom: 10px;
-  font-size: 18px;
-  font-family: Arial, sans-serif; }
-
-/* Journal New Co-Author */
-#new_co_author label {
-  margin-right: 0; }
+.list_item_function {
+  position: absolute;
+  right: 0;
+  bottom: -30px;
+  width: 100%;
+  height: 30px;
+  line-height: 30px;
+  text-align: right;
+  -webkit-transition: all 0.3s ease;
+  -moz-transition: all 0.3s ease;
+  transition: all 0.3s ease; }
+  .list_item_function a {
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 4px;
+    padding: 0 6px;
+    font-size: 11px;
+    -webkit-text-size-adjust: none; }
+    .list_item_function a :first-child {
+      margin-left: 0; }
+  .datalist_item:hover .list_item_function {
+    bottom: 0; }

 /* App */
 .app_frame {
@@ -809,18 +760,24 @@ a:focus {
  right: 0;
  bottom: 0;
  z-index: 12; }
-
-.app_frame .app_holder {
-  background-color: #fff;
-  position: absolute;
-  width: 100%; }
-
-.app_frame #header .icon-remove {
-  display: block;
-  float: right;
-  line-height: 60px;
-  font-size: 20px;
-  cursor: pointer; }
+  .app_frame .app_holder {
+    background-color: #fff;
+    position: absolute;
+    width: 100%; }
+  .app_frame .app_frame_header {
+    height: 72px; }
+    .app_frame .app_frame_header .icon-remove {
+      display: block;
+      float: right;
+      line-height: 60px;
+      font-size: 20px;
+      cursor: pointer; }
+     .app_frame .app_frame_header .icon-minus {
+      display: block;
+      float: right;
+      line-height: 60px;
+      font-size: 20px;
+      cursor: pointer; }

 /*Tooltip popup */
 .desktop_toolpopup {
@@ -66,24 +66,37 @@ a:focus { outline: none; }
 	display: table;
 	width: 100%;
 	content: '';
+	clear: both;
+}
+.valign:before {
+	content: '';
+	height: 100%;
+	display: inline-block;
+	vertical-align: middle;
 }
 .o-loading {
 	font-size: 13px;
-	font-weight: normal;
+	// font-weight: normal;

+	.fullsize & {
+		padding: 12px;
+	}
 	i {
 		font-size: 20px;
 	}
 }
 #thmbackground {
-	min-height: 100%;
-	min-width: 980px;
 	width: 100%;
-	height: auto;
+	height: 100%;
 	position: fixed;
 	top: 0;
 	left: 0;
 	z-index: -1;
+	background-repeat: no-repeat;
+	-webkit-background-size: cover;
+	   -moz-background-size: cover;
+		 -o-background-size: cover;
+			background-size: cover;
 }
 #bgover {
 	position: fixed;
@@ -109,9 +122,12 @@ a:focus { outline: none; }

 /* Desktop Global Style */
 .admbg { background-color: #fff; }
-.admbg2 { background-color: #ddd; }
+.admbg2 { background-color: $gray; }
 .admtxt { color: #666; }
-.admtxt:hover { color: #666; }
+a.admtxt.admbg2:hover {
+	color: #fff;
+	background-color: darken($gray, 20%);
+}
 .hfn {
 	font-size: 15px;
 	line-height: 36px;
@@ -126,6 +142,17 @@ a:focus { outline: none; }
 	border: 0;
 	}
 .ini_input:focus { outline: none; }
+.text_ofl {
+	overflow: hidden;
+
+	span {
+		display: inline-block;
+		width: 100%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+	}
+}

 /* - Opacity */
@for $i from 0 through 10 {
@@ -162,7 +189,15 @@ a:focus { outline: none; }
 	margin: 0 12px 12px 0;
 	float: left;
 	position: relative;
+	cursor: pointer;
+	@include transition-type(all,0.2);
+
+	&:active {
+		-webkit-transform: scale(0.92);
+		-moz-transform: scale(0.92);
+		transform: scale(0.92);
 	}
+}
 .group{
 	float: left;
 	margin-right: 24px;
@@ -171,11 +206,13 @@ a:focus { outline: none; }
 /* desktop layout */
 #container {
 	padding: 48px 0 0 156px;
+	min-width: 800px;
 	}
 #header {
 	padding: 0 0 12px 0;
-	min-width: 800px;
 	height: 72px;
+	position: relative;
+	z-index: 2;
 	}
 #side { 
 	width: 60px;
@@ -184,12 +221,13 @@ a:focus { outline: none; }
 	margin-right: 96px;
 	top: 120px;
 	left: 0;
-	z-index: 11;
+	z-index: 13;
 	}
 #holder {
 	height: 516px;
 	width: auto;
 	position: relative;
+	z-index: 1;
 	}
 #rwidget {
 	height: 516px;
@@ -227,7 +265,7 @@ a:focus { outline: none; }
 }
 .fn_des.admtxt {
 	line-height: 60px;
-	padding: 0 6px;
+	padding: 0 12px;
 	font-size: 15px;
 	position: absolute;
 	z-index: 9;
@@ -273,18 +311,19 @@ a:focus { outline: none; }
 	}
 	li:first-child {
 		font-size: 18px;
-		font-weight: normal;
+		// font-weight: normal;
 	}
 }
-
 /* panel */
 #panel_l {
-	background-color: #f0f0f0;
+	background-color: lighten($gray, 10%);
 	float: left;
 }
 #panel_r {
+	background-color: #fff;
 	margin-left: 252px;
 	position: relative;
+	width: auto;
 }

 /* Desktop Notification */
@@ -292,32 +331,48 @@ a:focus { outline: none; }
 	position: fixed;
 	top: 0;
 	left: 50%;
-	margin-left: -206px;
+	margin-left: -200px;
 	z-index: 99999;
 	width: 400px;
-	padding: 0 6px 6px 6px;
-	background-color: #000;
-	background-color: rgba(0,0,0,0.6);
+	@include transition-type(height,2);

 	.note_holder {
-		background-color: #f3f3f3;
-		border: solid 1px #fff;
-		border-top: none;
 		overflow: hidden;
-		padding: 24px 24px;
+		padding: 36px;
+		border: solid 2px $gray;
+		border-top: 0;
+		display: none;

 		.note_type {
-			float: left;
+			display: inline-block;
+			vertical-align: middle;
+			width: 60px;
+			height: 60px;
+			color: #fff;
 			
-			img {
+			.sign {
 				display: block;
+				font-size: 40px;
+				width: 40px;
+				height: 40px;
+				padding: 10px;
+				border-radius: 30px;
+				text-align: center;
+
+				&.icon-ok { background-color: #5BB75B; }
+				&.icon-exclamation-sign { background-color: #DA4F49; }
+				&.icon-warning-sign { background-color: #FAA732; }
 			}
 		}
 		.note_message {
 			color: #333;
-			margin: 10px 0 0 48px;
+			display: inline-block;
+			vertical-align: middle;
+			word-wrap: break-word;
+			width: 240px;
+			margin: 0 0 0 20px;
 			font-size: 15px;
-			font-weight: normal;
+			// font-weight: normal;
 		}
 	}
 }
@@ -330,6 +385,7 @@ a:focus { outline: none; }
 	left: 0;
 	top: 0;
 	z-index: 12;
+	display: none;

 	.tile {
 		background-color: #000;
@@ -357,7 +413,7 @@ a:focus { outline: none; }
 				margin: 0 6px;
 				text-align: center;
 				font-size: 15px;
-				font-weight: normal;
+				// font-weight: normal;
 				line-height: 36px;

 				&:hover {
@@ -382,6 +438,7 @@ a:focus { outline: none; }
 	left: 0;
 	bottom: 0;
 	z-index: 3;
+	white-space: nowrap;

 	[data-sizex="1"] &,
 	.w1.h1 & {
@@ -389,7 +446,7 @@ a:focus { outline: none; }
 	}
 	[data-sizey="2"] & {
 		font-size: 21px;
-		font-weight: normal;
+		// font-weight: normal;
 	}
 	.hh2 & {
 		position: relative;
@@ -407,7 +464,7 @@ a:focus { outline: none; }
 	margin: 0 auto;
 	position: relative;

-	[data-sizex="1"] & {
+	[data-sizex="1"] &, .w1.h1 & {
 		margin-top: 24px;
 	}
 	#sections & {
@@ -417,8 +474,6 @@ a:focus { outline: none; }
 		margin-right: 6px;
 	}
 }
-
-
 .appholder {
 	position: relative;
 	z-index: 2;
@@ -442,7 +497,7 @@ a:focus { outline: none; }
 	margin: 0 12px 0 0;
 	position: relative;
 	z-index: 9;
-	}
+}
 .tile {
 	display: block;
 	width: 100%;
@@ -450,9 +505,18 @@ a:focus { outline: none; }
 	position: absolute;
 	left: 0;
 	top: 0;
-	}
+}
+.gridster ul {
+	margin: -6px 0 0 -6px;
+}
 .widget.gs_w {
 	cursor: move;
+	overflow: hidden;
+}
+.gs_w.dragging {
+	-webkit-transform: scale(0.92);
+	-moz-transform: scale(0.92);
+	transform: scale(0.92);
 }

 /* header drop menu */
@@ -484,7 +548,6 @@ a:focus { outline: none; }
 }
 .theme_preview {
 	width: 528px;
-	height: 150px;
 	line-height: 36px;
 	font-size: 15px;
 }
@@ -498,6 +561,12 @@ a:focus { outline: none; }
 	> div:first-child {
 		margin-right: 48px;
 	}
+	.g_sep {
+		margin-right: 0;
+	}
+}
+#color_input th {
+	vertical-align: bottom
 }
 .stock_wallpaper {
 	.ssl_item {
@@ -507,9 +576,17 @@ a:focus { outline: none; }

 .s_title {
 	font-size: 21px;
-	font-weight: normal;
+	// font-weight: normal;
 	line-height: 60px;
 	text-align: left;
+
+	&.size_large {
+		font-size: 36px;
+	}
+	&.size_small {
+		font-size: 15px;
+		line-height: 2em;
+	}
 }
 .s_subtitle {
 	font-size: 15px;
@@ -522,33 +599,90 @@ a:focus { outline: none; }
 	margin-top: 12px;
 	overflow: hidden;
 	border-top: solid 1px #eee;
-	background-color: #fff;
+	// background-color: #fff;
+
+	.setting_btn {
+		margin-left: 12px;
+	}
 }
 .setting_btn {
 	display: block;
 	float: right;
 	font-size: 15px;
-	font-weight: normal;
+	// font-weight: normal;
 	line-height: 36px;
 	text-align: center;
 	border: 0;
 }

-
-.group_search{
+/* Apps Manager */
+#app_info {
 	float: left;
+	width: 420px;
+	height: 516px;
 	margin-right: 36px;
-	
+	display: none;
+
+	.app_info_header {
+		height: 120px;
+		margin: -12px -12px 12px -12px;
+		position: relative;
+		background-color: lighten($gray, 10%);
+		@include box-sizing;
+		
+		> * {
+			height: 100%;
+		}
+		.app_info_icon {
+			display: block;
+			margin: 0 auto;
+			margin-top: 30px;
+			@include box-sizing;
+		}
+		.app_info_name {
+			display: inline-block;
+			vertical-align: middle;
+			font-size: 2em;
+			width: 300px;
+			word-wrap: break-word;
+		}
+		.panel_close {
+			position: absolute;
+			right: 12px;
+			top: 12px;
+			font-size: 20px;
+		}
+	}
+	.app_info_list {
+		line-height: 1.5em;
+		overflow: hidden;
+
+		label {
+			color: darken($gray, 20%);
+		}
+	}
+}
+#app_list {
+	float: left;
+
+	.element > * {
+		cursor: pointer;
+	}
 }
 .search_result{
 	float: left;
-	margin-right: 24px;
-	max-width: 340px;
-}
-.g_sep {
-	width: 11px;
-	border-left:
-	solid 1px #fff;
+	overflow: hidden;
+
+	.message {
+		font-size: 15px;
+		word-wrap: break-word;
+
+		b {
+			font-size: 20px;
+			display: block;
+			margin-top: 12px;
+		}
+	}
 }


@@ -572,12 +706,15 @@ a:focus { outline: none; }
 }

 /* list item */
-.list_t_item { /*padding: 2px;*/ overflow: hidden; }
+.list_t_item { 
+	overflow: hidden;
+}
 .list_t_title { 
-	margin-bottom: 6px;
-	color: #333;
+	padding-bottom: 6px;
+	color: #000;
 	font-size: 15px;
-	font-weight: normal;
+	line-height: 1.3em;
+	// font-weight: normal;
 }
 .list_t_des { 
 	line-height: 1.5em;
@@ -585,168 +722,32 @@ a:focus { outline: none; }
 	margin-bottom: 4px;
 	font-size: 13px;
 }
-.list_item_function a {
-	display: inline-block;
-	padding: 4px;
-	font-size: 11px;
-	-webkit-text-size-adjust: none;
-}
+.list_item_function {
+	position: absolute;
+	right: 0;
+	bottom: -30px;
+	width: 100%;
+	height: 30px;
+	line-height: 30px;
+	text-align: right;
+	@include transition-type(all,0.3);

-/* Connection Page */
-#connection_setting { height: 492px; }
-#connection_setting .s_form {
-	float: left;
-	margin: 0 12px 0 0;
-	padding-left: 24px;
-	height: 100%;
-	border-left: solid 1px #ddd;
-}
-#connection_setting .s_form:first-child { padding-left: 0; border: none; }
-#connection_setting .s_form label { line-height: 30px; }
-#connection_setting .s_form .c_icon, #connection_setting .s_form .c_name {
-	display: inline-block;
-	vertical-align: middle;
-}
-#connection_setting .s_form .c_name { padding: 0 12px; font-size: 18px; }
-#connection_setting .s_form input[type=text], #connection_setting .s_form input[type=password] { width: 202px; }
-#connection_setting .setting_btn { margin-left: 12px; }
-#connection_setting .setting_btn.disable { background-color: #ddd; cursor: default; }
-#connection_setting .c_status {
-	float: right;
-	padding: 6px;
-	background-color: #eee;
-	color: #ccc;
-	font-size: 9px;
-	font-weight: normal;
-	-webkit-text-size-adjust: none;
-	@include transition-type("background-color",0.5);
-}
-#connection_setting .c_status_on { background-color: #51A351; color: #fff; }
-#connection_setting .c_info {
-	padding: 7px 6px;
-	background-color: #fcfcfc;
-	cursor: default;
-	font-size: 18px;
-	font-weight: normal;
-}
+	a {
+		display: inline-block;
+		vertical-align: top;
+		margin-left: 4px;
+		padding: 0 6px;
+		font-size: 11px;
+		-webkit-text-size-adjust: none;

-/* Journal Papers */
-[page-name="journal_p_list"] .list_t_item .inner { padding-left: 30px; }
-[page-name="journal_p_list"] .list_item_action {
-	font-size: 12px;
-	float: left;
-	margin-left: -30px;
+		:first-child {
+			margin-left: 0;
+		}
+	}
+	.datalist_item:hover & {
+		bottom: 0;
+	}
 }
-[page-name="journal_p_list"] .list_item_action a { 
-	display: block;
-	width: 20px; 
-	height: 20px;
-	line-height: 20px;
-	margin: 1px 1px 6px 1px;
-}
-[page-name="journal_p_list"] .list_item_action .icon-star-empty { color: #999; font-size: 20px; }
-[page-name="journal_p_list"] .list_item_action .icon-star { color: #faa732; font-size: 20px; }
-[page-name="journal_p_list"] .list_item_action .icon-check-empty { color: #999; font-size: 20px; }
-[page-name="journal_p_list"] .list_item_action .icon-check { color: #333; font-size: 20px; }
-
-[page-name="journal_p_list"] .list_t_item.file_view {
-	height: 148px;
-}
-[page-name="journal_p_list"] .file_view .file {
-	display: inline-block;
-	width: 62px;
-	height: 50px;
-	text-align: center;
-}
-[page-name="journal_p_list"] .file_view .file:hover {
-	background-color: #ddd;
-}
-[page-name="journal_p_list"] .file_view .file img {
-	width: 24px;
-	display: block;
-	margin: 0 auto;
-	margin-top: 4px;
-}
-[page-name="journal_p_list"] .file_view .filetitle {
-	font-size: 11px;
-	-webkit-text-size-adjust: none;
-}
-
-/* Journal Paper Add */
-#paper_add .s_grid_con {
-	float: left;
-	height: 456px;
-	margin-left: 12px;
-	padding-left: 12px;
-	border-left: solid 1px #eee;
-}
-#paper_add .s_grid_con:first-child { margin-left: 0; padding-left: 0; border: none; }
-#paper_add .f_w { width: 336px; }
-#paper_add label { margin-right: 0; }
-
-/* Journal Journal list */
-[page-name="journal_p_journal"] .datalist_item .inner {
-	padding-left: 30px;
-}
-[page-name="journal_p_journal"] .list_item_action {
-	font-size: 12px;
-	float: left;
-	margin-left: -30px;
-}
-[page-name="journal_p_journal"] .list_item_action i {
-	color: #999;
-	font-size: 20px;
-	display: block;
-	width: 20px;
-	height: 20px;
-	line-height: 20px;
-	margin: 1px 1px 6px 1px;
-}
-[page-name="journal_p_journal"] .list_t_desc {
-	font-family: Arial, sans-serif;
-	font-size: 12px;
-	color: #999;
-}
-
-/* Journal Co-Author */
-[page-name="journal_p_coauthor"] {}
-[page-name="journal_p_coauthor"] .list_t_item {
-	height: 110px;
-}
-[page-name="journal_p_coauthor"] .list_item_function {}
-[page-name="journal_p_coauthor"] .list_item_function a {
-	display: inline-block;
-	padding: 4px;
-	font-family: Arial, sans-serif;
-	font-size: 11px;
-	-webkit-text-size-adjust: none;
-}
-[page-name="journal_p_coauthor"] .info {
-	font-family: Arial, sans-serif;
-}
-[page-name="journal_p_coauthor"] .info li {
-	margin-bottom: 8px;
-	color: #999;
-}
-[page-name="journal_p_coauthor"] .info .name {
-	font-size: 18px;
-	line-height: 24px;
-	color: #333;
-}
-/* Journal Co-Author Relationship*/
-[page-name="journal_p_coauthor_relation"] .edit_co_author_relation {
-	/*margin-left: -10px;*/
-}
-[page-name="journal_p_coauthor_relation"] .form_space {
-	margin-bottom: 10px;
-	font-size: 18px;
-	font-family: Arial, sans-serif;
-}
-/* Journal New Co-Author */
-#new_co_author label {
-	margin-right: 0;
-}
-

 /* App */
 .app_frame {
@@ -759,18 +760,23 @@ a:focus { outline: none; }
 	right: 0;
 	bottom: 0;
 	z-index: 12;
-}
-.app_frame .app_holder { 
-	background-color: #fff;
-	position: absolute;
-	width: 100%;
-}
-.app_frame #header .icon-remove {
-	display: block;
-	float: right;
-	line-height: 60px;
-	font-size: 20px;
-	cursor: pointer;
+
+	.app_holder { 
+		background-color: #fff;
+		position: absolute;
+		width: 100%;
+	}
+	.app_frame_header{
+		height: 72px;
+
+		.icon-remove {
+			display: block;
+			float: right;
+			line-height: 60px;
+			font-size: 20px;
+			cursor: pointer;
+		}
+	}
 }

 /*Tooltip popup */
@@ -1,10 +1,10 @@
@media only screen and (min-width: 1240px){

-	#panel_r.pw { width: 800px; }
+	/*#panel_r.pw { width: 800px; }*/

 }
@media only screen and (min-width: 1900px){

-	#panel_r.pw { width: 1400px; }
+	/*#panel_r.pw { width: 1400px; }*/

 }
@@ -86,24 +86,21 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
  position: absolute;
  z-index: 9999;
  top: 100%;
-  background: #fff;
+  background-color: #fff;
  color: #000;
-  border: 1px solid #dddddd;
-  border-top: 0; }
+  border: 2px solid #dddddd; }

 .select2-drop.select2-drop-above {
-  margin-top: 1px;
-  border-top: 1px solid #dddddd;
-  border-bottom: 0; }
+  margin-top: 1px; }

 .select2-container .select2-choice div {
  display: block;
-  width: 20px;
+  width: 21px;
  height: 100%;
  position: absolute;
  right: 0;
  top: 0;
-  background: #ccc;
+  border-left: solid 1px #dddddd;
  -webkit-box-sizing: border-box;
  /* webkit */
  -khtml-box-sizing: border-box;
@@ -119,7 +116,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
  display: block;
  width: 100%;
  height: 100%;
-  background: url(<%= asset_path "desktop/select2/select2.png" %>) no-repeat 0 1px; }
+  background: url(<%= asset_path "desktop/select2/select2.png" %>) no-repeat 0 50%; }

 .select2-search {
  display: inline-block;
@@ -159,22 +156,18 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
  outline: none; }

 .select2-dropdown-open .select2-choice {
-  border-bottom-color: transparent;
-  background-color: #eee; }
+  border-bottom-color: transparent; }

 .select2-dropdown-open .select2-choice div {
-  background: transparent;
-  border-left: none;
+  background-color: #dddddd;
  filter: none; }

 .select2-dropdown-open .select2-choice div b {
-  background-position: -18px 1px; }
+  background-position: -20px 50%; }

 /* results */
 .select2-results {
  max-height: 200px;
-  padding: 0 0 0 4px;
-  margin: 4px 4px 4px 0;
  font-size: 13px;
  position: relative;
  overflow-x: hidden;
@@ -208,13 +201,17 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
 .select2-results li {
  list-style: none;
  display: list-item;
-  background-image: none; }
+  background-image: none;
+  border-top: solid 1px #f7f7f7; }
+
+.select2-results li :first-child {
+  border-top: 0; }

 .select2-results li.select2-result-with-children > .select2-result-label {
  font-weight: bold; }

 .select2-results .select2-result-label {
-  padding: 4px 6px;
+  padding: 6px;
  margin: 0;
  cursor: pointer;
  -webkit-touch-callout: none;
@@ -356,11 +353,11 @@ disabled look for disabled choices in the results dropdown

 .select2-search-choice-close {
  display: block;
-  width: 12px;
-  height: 13px;
+  width: 10px;
+  height: 10px;
  position: absolute;
  right: 3px;
-  top: 4px;
+  top: 5px;
  font-size: 1px;
  outline: none;
  background: url(<%= asset_path "desktop/select2/select2.png" %>) right top no-repeat; }
@@ -369,10 +366,10 @@ disabled look for disabled choices in the results dropdown
  left: 3px; }

 .select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
-  background-position: right -11px; }
+  background-position: right -20px; }

 .select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close {
-  background-position: right -11px; }
+  background-position: right -20px; }

 /* disabled styles */
 .select2-container-multi.select2-container-disabled .select2-choices {
@@ -397,7 +394,8 @@ disabled look for disabled choices in the results dropdown

 .select2-offscreen {
  position: absolute;
-  left: -10000px; }
+  left: -10000px;
+  top: 0; }

 /* Retina-ize icons */
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) {
@@ -86,27 +86,26 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
    position: absolute;
    z-index: 9999;
    top: 100%;
-
-    background: #fff;
+    background-color: #fff;
    color: #000;
-    border: 1px solid $gray;
-    border-top: 0;
+    border: 2px solid $gray;
+    // border-top: 0;
 }

 .select2-drop.select2-drop-above {
    margin-top: 1px;
-    border-top: 1px solid $gray;
-    border-bottom: 0;
+    // border-top: 1px solid $gray;
+    // border-bottom: 0;
 }

 .select2-container .select2-choice div {
    display: block;
-    width: 20px;
+    width: 21px;
    height: 100%;
    position: absolute;
    right: 0;
    top: 0;
-    background: #ccc;
+    border-left: solid 1px $gray;
    @include box-sizing;
 }

@@ -114,7 +113,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
    display: block;
    width: 100%;
    height: 100%;
-    background: url('select2/select2.png') no-repeat 0 1px;
+    background: url('select2/select2.png') no-repeat 0 50%;
 }

 .select2-search {
@@ -156,7 +155,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
 }

 .select2-search input.select2-active {
-    background: #fff image-url('select2-spinner.gif') no-repeat 100%;
+    background: #fff url('select2/spinner.gif') no-repeat 100%;
 }

 .select2-container-active .select2-choice,
@@ -167,23 +166,22 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013

 .select2-dropdown-open .select2-choice {
    border-bottom-color: transparent;
-    background-color: #eee;
 }

 .select2-dropdown-open .select2-choice div {
-    background: transparent;
-    border-left: none;
+    background-color: $gray;
+    // border-left: none;
    filter: none;
 }
 .select2-dropdown-open .select2-choice div b {
-    background-position: -18px 1px;
+    background-position: -20px 50%;
 }

 /* results */
 .select2-results {
    max-height: 200px;
-    padding: 0 0 0 4px;
-    margin: 4px 4px 4px 0;
+    // padding: 0 0 0 4px;
+    // margin: 4px 4px 4px 0;
    font-size: 13px;
    position: relative;
    overflow-x: hidden;
@@ -207,6 +205,11 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
    list-style: none;
    display: list-item;
    background-image: none;
+    border-top: solid 1px lighten($gray, 10%);
+
+    :first-child {
+        border-top: 0;
+    }
 }

 .select2-results li.select2-result-with-children > .select2-result-label {
@@ -214,7 +217,7 @@ Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013
 }

 .select2-results .select2-result-label {
-    padding: 4px 6px;
+    padding: 6px;
    margin: 0;
    cursor: pointer;

@@ -270,7 +273,7 @@ disabled look for disabled choices in the results dropdown
 }

 .select2-more-results.select2-active {
-    background: #f4f4f4 image-url('select2-spinner.gif') no-repeat 100%;
+    background: #f4f4f4 url('select2/spinner.gif') no-repeat 100%;
 }

 .select2-more-results {
@@ -349,7 +352,7 @@ disabled look for disabled choices in the results dropdown
 }

 .select2-container-multi .select2-choices .select2-search-field input.select2-active {
-    background: #fff image-url('select2-spinner.gif') no-repeat 100% !important;
+    background: #fff url('select2/spinner.gif') no-repeat 100% !important;
 }

 .select2-default {
@@ -377,11 +380,11 @@ disabled look for disabled choices in the results dropdown

 .select2-search-choice-close {
    display: block;
-    width: 12px;
-    height: 13px;
+    width: 10px;
+    height: 10px;
    position: absolute;
    right: 3px;
-    top: 4px;
+    top: 5px;
    font-size: 1px;
    outline: none;
    background: url('select2/select2.png') right top no-repeat;
@@ -392,10 +395,10 @@ disabled look for disabled choices in the results dropdown
 }

 .select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
-  background-position: right -11px;
+  background-position: right -20px;
 }
 .select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close {
-    background-position: right -11px;
+    background-position: right -20px;
 }

 /* disabled styles */
@@ -427,6 +430,7 @@ disabled look for disabled choices in the results dropdown
 .select2-offscreen {
    position: absolute;
    left: -10000px;
+    top: 0;
 }

 /* Retina-ize icons */
@@ -12,6 +12,9 @@
 .main-list {
 	margin-bottom: 0;
 }
+#filter .main-list, #filter + .main-list {
+ 	table-layout: fixed;
+}
 .main-wrap>.main-list thead th {
 	background-color: transparent;
 	border-right: medium none;
@@ -36,7 +39,7 @@
 }
 .main-list tbody .quick-edit .nav {
 	position: absolute;
-	width: 350px;
+	width: 440px;
 	left: -8px;
 }
 .main-list tbody .quick-edit .nav .dropdown-menu {