Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

Conflicts:
	app/helpers/admin/item_helper.rb
This commit is contained in:
Christophe Vilayphiou 2012-05-11 18:09:34 +08:00
commit ef49df448d
6 changed files with 83 additions and 6 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

View File

@ -7,7 +7,7 @@
position: relative; position: relative;
} }
.nav-list ol { .nav-list ol {
margin-left: 10px; margin-left: 20px;
} }
.nav-list ol li { .nav-list ol li {
padding: 5px 0; padding: 5px 0;
@ -149,3 +149,27 @@
#main-sidebar .quick-edit a:hover { #main-sidebar .quick-edit a:hover {
background-color: #DDDDDD; background-color: #DDDDDD;
} }
ol.nav>li>.icons-moves {
display: none;
}
.sortable i {
position: absolute;
left: -20px;
top: 6px;
margin-right: 0;
opacity: 0.3;
filter: alpha(opacity=30);
}
.sortable i:hover {
cursor:move;
opacity: 0.7;
filter: alpha(opacity=70);
}
.placeholder {
background-color: rgba(0,136,204,.6);
border-radius: 3px;
}
.ui-nestedSortable-error {
background: rgba(255,206,206,.6);
color: #8a1f11;
}

View File

@ -685,6 +685,7 @@
#banner [id^="slideshow-"] { #banner [id^="slideshow-"] {
z-index: 2 !important; z-index: 2 !important;
} }
[class^="icons-"] { [class^="icons-"] {
display: inline-block; display: inline-block;
width: 16px; width: 16px;
@ -1243,12 +1244,63 @@
.icons-plus { .icons-plus {
background-position: -288px -576px; background-position: -288px -576px;
} }
/*20*/
.icons-power { .icons-power {
background-position: -0px -608px; background-position: -0px -608px;
} }
/*20*/ .icons-output {
.icons- { background-position: -32px -608px;
background-position: -0px -608px; }
.icons-col-resize {
background-position: -64px -608px;
}
.icons-move {
background-position: -96px -608px;
}
.icons-size-out {
background-position: -128px -608px;
}
.icons-size-in {
background-position: -160px -608px;
}
.icons-slash {
background-position: -192px -608px;
}
.icons-level {
background-position: -224px -608px;
}
.icons-share {
background-position: -256px -608px;
}
.icons-share2 {
background-position: -288px -608px;
}
.icons-re {
background-position: -320px -608px;
}
.icons-insert {
background-position: -352px -608px;
}
.icons-insert2 {
background-position: -384px -608px;
}
.icons-download {
background-position: -416px -608px;
}
.icons-tag-rignt {
background-position: -448px -608px;
}
.icons-tag-top {
background-position: -480px -608px;
}
.icons-tag-bottom {
background-position: -512px -608px;
}
.icons-tag-left {
background-position: -544px -608px;
}
.icons-moves {
background-position: -576px -608px;
} }
/*21*/ /*21*/
.icons- { .icons- {

View File

@ -11,6 +11,7 @@ module Admin::ItemHelper
no_nested = 'no-nest' no_nested = 'no-nest'
end end
ret << "<li id='#{node.id}' class='#{no_nested}'>" ret << "<li id='#{node.id}' class='#{no_nested}'>"
ret << "<i class='icons-moves'></i>"
ret << "<div class='with_action'>" ret << "<div class='with_action'>"
ret << (link_to node.i18n_variable[I18n.locale], dest) ret << (link_to node.i18n_variable[I18n.locale], dest)
ret << "<div class='quick-edit hide'>" ret << "<div class='quick-edit hide'>"

View File

@ -6,11 +6,11 @@
$('ol.sortable').nestedSortable({ $('ol.sortable').nestedSortable({
disableNesting: 'no-nest', disableNesting: 'no-nest',
forcePlaceholderSize: true, forcePlaceholderSize: true,
handle: 'div', handle: 'i',
helper: 'clone', helper: 'clone',
items: 'li', items: 'li',
maxLevels: 3, maxLevels: 3,
opacity: .6, opacity: .5,
placeholder: 'placeholder', placeholder: 'placeholder',
revert: 250, revert: 250,
tabSize: 25, tabSize: 25,