merging
This commit is contained in:
commit
3182f5c9a8
30 files changed
+2104
-429
No files matched your search
@@ -16,3 +16,4 @@
|
||||
//= require orbitdesktop
|
||||
//= require jquery.gridster
|
||||
//= require desktop/books_pages
|
||||
//= require jquery.tokeninput
|
||||
File diff suppressed because it is too large.
Load diff
@@ -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;
|
||||
@@ -395,8 +400,21 @@ var orbitDesktop = function(dom){
|
||||
|
||||
// })
|
||||
}
|
||||
$('*[content-type=menu] a').removeClass('thmc1 thmtxt active');
|
||||
dom.addClass('thmc1 thmtxt active');
|
||||
// $('*[content-type=menu] a').removeClass('thmc1 thmtxt active');
|
||||
// dom.addClass('thmc1 thmtxt active');
|
||||
o.highlight_sub_menu_item(dom);
|
||||
}
|
||||
this.highlight_sub_menu_item = function(no){
|
||||
$('*[content-type=menu] a').removeClass('thmc1 thmtxt active');
|
||||
var dom;
|
||||
if(typeof no == "number"){
|
||||
dom = $('*[content-type=menu] a').eq(no);
|
||||
dom.addClass('thmc1 thmtxt active');
|
||||
}else if(typeof no == "object"){
|
||||
dom = no;
|
||||
dom.addClass('thmc1 thmtxt active');
|
||||
}
|
||||
return dom;
|
||||
}
|
||||
|
||||
this.initializeDesktop = function(target,url,cache){ //this is for initializing main desktops that are sections and tiles
|
||||
|
||||
@@ -0,0 +1,122 @@
|
||||
/* Example tokeninput style #2: Facebook style */
|
||||
ul.token-input-list-facebook {
|
||||
overflow: hidden;
|
||||
height: auto !important;
|
||||
height: 1%;
|
||||
width: 400px;
|
||||
border: 1px solid #8496ba;
|
||||
cursor: text;
|
||||
font-size: 12px;
|
||||
font-family: Verdana, sans-serif;
|
||||
min-height: 1px;
|
||||
z-index: 999;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
background-color: #fff;
|
||||
list-style-type: none;
|
||||
clear: left;
|
||||
}
|
||||
|
||||
ul.token-input-list-facebook li input {
|
||||
border: 0;
|
||||
width: 100px;
|
||||
padding: 3px 8px;
|
||||
background-color: white;
|
||||
margin: 2px 0;
|
||||
-webkit-appearance: caret;
|
||||
}
|
||||
|
||||
li.token-input-token-facebook {
|
||||
overflow: hidden;
|
||||
height: auto !important;
|
||||
height: 15px;
|
||||
margin: 3px;
|
||||
padding: 1px 3px;
|
||||
background-color: #eff2f7;
|
||||
color: #000;
|
||||
cursor: default;
|
||||
border: 1px solid #ccd5e4;
|
||||
font-size: 11px;
|
||||
border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
-webkit-border-radius: 5px;
|
||||
float: left;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
li.token-input-token-facebook p {
|
||||
display: inline;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
li.token-input-token-facebook span {
|
||||
color: #a6b3cf;
|
||||
margin-left: 5px;
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
li.token-input-selected-token-facebook {
|
||||
background-color: #5670a6;
|
||||
border: 1px solid #3b5998;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
li.token-input-input-token-facebook {
|
||||
float: left;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
list-style-type: none;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-facebook {
|
||||
position: absolute;
|
||||
width: 400px;
|
||||
background-color: #fff;
|
||||
overflow: hidden;
|
||||
border-left: 1px solid #ccc;
|
||||
border-right: 1px solid #ccc;
|
||||
border-bottom: 1px solid #ccc;
|
||||
cursor: default;
|
||||
font-size: 11px;
|
||||
font-family: Verdana, sans-serif;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-facebook p {
|
||||
margin: 0;
|
||||
padding: 5px;
|
||||
font-weight: bold;
|
||||
color: #777;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-facebook ul {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-facebook ul li {
|
||||
background-color: #fff;
|
||||
padding: 3px;
|
||||
margin: 0;
|
||||
list-style-type: none;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-facebook ul li.token-input-dropdown-item-facebook {
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-facebook ul li.token-input-dropdown-item2-facebook {
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-facebook ul li em {
|
||||
font-weight: bold;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-facebook ul li.token-input-selected-dropdown-item-facebook {
|
||||
background-color: #3b5998;
|
||||
color: #fff;
|
||||
}
|
||||
@@ -0,0 +1,204 @@
|
||||
/* Example tokeninput style #2: Mac Style */
|
||||
fieldset.token-input-mac {
|
||||
position: relative;
|
||||
padding: 0;
|
||||
margin: 5px 0;
|
||||
background: #fff;
|
||||
width: 400px;
|
||||
border: 1px solid #A4BDEC;
|
||||
border-radius: 10px;
|
||||
-moz-border-radius: 10px;
|
||||
-webkit-border-radius: 10px;
|
||||
}
|
||||
|
||||
fieldset.token-input-mac.token-input-dropdown-mac {
|
||||
border-radius: 10px 10px 0 0;
|
||||
-moz-border-radius: 10px 10px 0 0;
|
||||
-webkit-border-radius: 10px 10px 0 0;
|
||||
box-shadow: 0 5px 20px 0 rgba(0,0,0,0.25);
|
||||
-moz-box-shadow: 0 5px 20px 0 rgba(0,0,0,0.25);
|
||||
-webkit-box-shadow: 0 5px 20px 0 rgba(0,0,0,0.25);
|
||||
}
|
||||
|
||||
ul.token-input-list-mac {
|
||||
overflow: hidden;
|
||||
height: auto !important;
|
||||
height: 1%;
|
||||
cursor: text;
|
||||
font-size: 12px;
|
||||
font-family: Verdana, sans-serif;
|
||||
min-height: 1px;
|
||||
z-index: 999;
|
||||
margin: 0;
|
||||
padding: 3px;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
ul.token-input-list-mac.error {
|
||||
border: 1px solid #C52020;
|
||||
}
|
||||
|
||||
ul.token-input-list-mac li {
|
||||
list-style-type: none;
|
||||
}
|
||||
|
||||
li.token-input-token-mac p {
|
||||
display: inline;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
li.token-input-token-mac span {
|
||||
color: #a6b3cf;
|
||||
margin-left: 5px;
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
/* TOKENS */
|
||||
|
||||
li.token-input-token-mac {
|
||||
font-family: "Lucida Grande", Arial, sans-serif;
|
||||
font-size: 9pt;
|
||||
line-height: 12pt;
|
||||
overflow: hidden;
|
||||
height: 16px;
|
||||
margin: 3px;
|
||||
padding: 0 10px;
|
||||
background: none;
|
||||
background-color: #dee7f8;
|
||||
color: #000;
|
||||
cursor: default;
|
||||
border: 1px solid #a4bdec;
|
||||
border-radius: 15px;
|
||||
-moz-border-radius: 15px;
|
||||
-webkit-border-radius: 15px;
|
||||
float: left;
|
||||
}
|
||||
|
||||
li.token-input-highlighted-token-mac {
|
||||
background-color: #bbcef1;
|
||||
border: 1px solid #598bec;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
li.token-input-selected-token-mac {
|
||||
background-color: #598bec;
|
||||
border: 1px solid transparent;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
li.token-input-highlighted-token-mac span.token-input-delete-token-mac {
|
||||
color: #000;
|
||||
}
|
||||
|
||||
li.token-input-selected-token-mac span.token-input-delete-token-mac {
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
li.token-input-input-token-mac {
|
||||
border: none;
|
||||
background: transparent;
|
||||
float: left;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
li.token-input-input-token-mac input {
|
||||
border: 0;
|
||||
width: 100px;
|
||||
padding: 3px;
|
||||
background-color: transparent;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-mac {
|
||||
position: absolute;
|
||||
border: 1px solid #A4BDEC;
|
||||
border-top: none;
|
||||
left: -1px;
|
||||
right: -1px;
|
||||
background-color: #fff;
|
||||
overflow: hidden;
|
||||
cursor: default;
|
||||
font-size: 10pt;
|
||||
font-family: "Lucida Grande", Arial, sans-serif;
|
||||
padding: 5px;
|
||||
border-radius: 0 0 10px 10px;
|
||||
-moz-border-radius: 0 0 10px 10px;
|
||||
-webkit-border-radius: 0 0 10px 10px;
|
||||
box-shadow: 0 5px 20px 0 rgba(0,0,0,0.25);
|
||||
-moz-box-shadow: 0 5px 20px 0 rgba(0,0,0,0.25);
|
||||
-webkit-box-shadow: 0 5px 20px 0 rgba(0,0,0,0.25);
|
||||
clip:rect(0px, 1000px, 1000px, -10px);
|
||||
}
|
||||
|
||||
div.token-input-dropdown-mac p {
|
||||
font-size: 8pt;
|
||||
margin: 0;
|
||||
padding: 0 5px;
|
||||
font-style: italic;
|
||||
color: #aaa;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-mac h3.token-input-dropdown-category-mac {
|
||||
font-family: "Lucida Grande", Arial, sans-serif;
|
||||
font-size: 10pt;
|
||||
font-weight: bold;
|
||||
border: none;
|
||||
padding: 0 5px;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-mac ul {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-mac ul li {
|
||||
list-style-type: none;
|
||||
cursor: pointer;
|
||||
background: none;
|
||||
background-color: #fff;
|
||||
margin: 0;
|
||||
padding: 0 0 0 25px;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-mac ul li.token-input-dropdown-item-mac {
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-mac ul li.token-input-dropdown-item-mac.odd {
|
||||
background-color: #ECF4F9;
|
||||
border-radius: 15px;
|
||||
-moz-border-radius: 15px;
|
||||
-webkit-border-radius: 15px;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-mac ul li.token-input-dropdown-item-mac span.token-input-dropdown-item-description-mac {
|
||||
float: right;
|
||||
font-size: 8pt;
|
||||
font-style: italic;
|
||||
padding: 0 10px 0 0;
|
||||
color: #999;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-mac ul li strong {
|
||||
font-weight: bold;
|
||||
text-decoration: underline;
|
||||
font-style: none;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-mac ul li.token-input-selected-dropdown-item-mac,
|
||||
div.token-input-dropdown-mac ul li.token-input-selected-dropdown-item-mac.odd {
|
||||
background-color: #598bec;
|
||||
color: #fff;
|
||||
border-radius: 15px;
|
||||
-moz-border-radius: 15px;
|
||||
-webkit-border-radius: 15px;
|
||||
}
|
||||
|
||||
div.token-input-dropdown-mac ul li.token-input-selected-dropdown-item-mac span.token-input-dropdown-item-description-mac,
|
||||
div.token-input-dropdown-mac ul li.token-input-selected-dropdown-item-mac.odd span.token-input-dropdown-item-description-mac {
|
||||
color: #fff;
|
||||
}
|
||||
@@ -0,0 +1,127 @@
|
||||
/* Example tokeninput style #1: Token vertical list*/
|
||||
ul.token-input-list {
|
||||
overflow: hidden;
|
||||
height: auto !important;
|
||||
height: 1%;
|
||||
width: 400px;
|
||||
border: 1px solid #999;
|
||||
cursor: text;
|
||||
font-size: 12px;
|
||||
font-family: Verdana, sans-serif;
|
||||
z-index: 999;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
background-color: #fff;
|
||||
list-style-type: none;
|
||||
clear: left;
|
||||
}
|
||||
|
||||
ul.token-input-list li {
|
||||
list-style-type: none;
|
||||
}
|
||||
|
||||
ul.token-input-list li input {
|
||||
border: 0;
|
||||
width: 350px;
|
||||
padding: 3px 8px;
|
||||
background-color: white;
|
||||
-webkit-appearance: caret;
|
||||
}
|
||||
|
||||
ul.token-input-disabled,
|
||||
ul.token-input-disabled li input {
|
||||
background-color: #E8E8E8;
|
||||
}
|
||||
|
||||
ul.token-input-disabled li.token-input-token {
|
||||
background-color: #D9E3CA;
|
||||
color: #7D7D7D
|
||||
}
|
||||
|
||||
ul.token-input-disabled li.token-input-token span {
|
||||
color: #CFCFCF;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
li.token-input-token {
|
||||
overflow: hidden;
|
||||
height: auto !important;
|
||||
height: 1%;
|
||||
margin: 3px;
|
||||
padding: 3px 5px;
|
||||
background-color: #d0efa0;
|
||||
color: #000;
|
||||
font-weight: bold;
|
||||
cursor: default;
|
||||
display: block;
|
||||
}
|
||||
|
||||
li.token-input-token p {
|
||||
float: left;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
li.token-input-token span {
|
||||
float: right;
|
||||
color: #777;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
li.token-input-selected-token {
|
||||
background-color: #08844e;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
li.token-input-selected-token span {
|
||||
color: #bbb;
|
||||
}
|
||||
|
||||
div.token-input-dropdown {
|
||||
position: absolute;
|
||||
width: 400px;
|
||||
background-color: #fff;
|
||||
overflow: hidden;
|
||||
border-left: 1px solid #ccc;
|
||||
border-right: 1px solid #ccc;
|
||||
border-bottom: 1px solid #ccc;
|
||||
cursor: default;
|
||||
font-size: 12px;
|
||||
font-family: Verdana, sans-serif;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
div.token-input-dropdown p {
|
||||
margin: 0;
|
||||
padding: 5px;
|
||||
font-weight: bold;
|
||||
color: #777;
|
||||
}
|
||||
|
||||
div.token-input-dropdown ul {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
div.token-input-dropdown ul li {
|
||||
background-color: #fff;
|
||||
padding: 3px;
|
||||
list-style-type: none;
|
||||
}
|
||||
|
||||
div.token-input-dropdown ul li.token-input-dropdown-item {
|
||||
background-color: #fafafa;
|
||||
}
|
||||
|
||||
div.token-input-dropdown ul li.token-input-dropdown-item2 {
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
div.token-input-dropdown ul li em {
|
||||
font-weight: bold;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
div.token-input-dropdown ul li.token-input-selected-dropdown-item {
|
||||
background-color: #d0efa0;
|
||||
}
|
||||
@@ -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| %>
|
||||
|
||||
Reference in new issue
Block a user