mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-14 00:39:57 +09:00
Conflict resolved.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11300 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong
parent
e9ce267c57
commit
abef8deda9
1 changed files with 51 additions and 32 deletions
|
|
@ -13,17 +13,14 @@
|
|||
</div>
|
||||
<div id="site">
|
||||
<div class="col map">
|
||||
<section class="mapi">
|
||||
<div id="siteMapTree"></div>
|
||||
<section class="mapi" id="siteMapTree">
|
||||
<script id="tmpl_menuTree" type="text/x-jquery-tmpl">
|
||||
<ul>
|
||||
{{html Nodes}}
|
||||
</ul>
|
||||
</script>
|
||||
|
||||
<script id="tmpl_menuTreeNode" type="text/x-jquery-tmpl">
|
||||
<li id="${MenuId}">
|
||||
<i class="v"></i><i class="h"></i>
|
||||
<a href="#" class="tx">${MenuTitle}</a>
|
||||
<span class="side">
|
||||
<button data-toggle="#add">메뉴추가</button>
|
||||
|
|
@ -32,7 +29,13 @@
|
|||
{{html SubTree}}
|
||||
</li>
|
||||
</script>
|
||||
|
||||
</section>
|
||||
<div class="x_btn-group" style="margin:15px 0;padding:10px 0;border-top:1px solid #ccc;text-align:right">
|
||||
<button type="button" class="x_btn x_btn-small x_btn-inverse"><i class="x_icon-plus x_icon-white"></i> 사이트맵 추가</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col map">
|
||||
<section class="mapi">
|
||||
<ul>
|
||||
<li class="root">
|
||||
<div class="item">
|
||||
|
|
@ -384,6 +387,7 @@
|
|||
<a href="#download" class="x_btn x_btn-small x_btn-inverse" data-show="#download" data-hide="#add_page,#add_url"><i class="x_icon-plus x_icon-white"></i> 다른 메뉴타입설치</a>
|
||||
</div>
|
||||
</section>
|
||||
<button type="button" class="x_close" data-hide="#download">×</button>
|
||||
</div>
|
||||
<div class="col" id="add_page">
|
||||
<fieldset>
|
||||
|
|
@ -488,7 +492,6 @@
|
|||
</section>
|
||||
<button type="button" class="x_close" data-hide="#download">×</button>
|
||||
</div>
|
||||
|
||||
<div class="col" >
|
||||
<section>
|
||||
<h1>메뉴 1</h1>
|
||||
|
|
@ -515,11 +518,11 @@
|
|||
</div>
|
||||
<style>
|
||||
/* Site */
|
||||
#site{position:relative;overflow-x:auto;overflow-y:hidden}
|
||||
.col{position:relative;float:left;height:100%;min-width:200px;padding:0 10px;overflow-y:auto;overflow-x:hidden;border-left:1px solid #ddd}
|
||||
.col:first-child{border:0;padding-left:0}
|
||||
.col>section>h1{ line-height:30px;font-size:16px;border-bottom:2px solid #666;margin:0;color:#333}
|
||||
.col>section>ul{ margin:0;padding:0;list-style:none}
|
||||
#site{position:relative;overflow-x:auto;overflow-y:hidden;white-space:nowrap}
|
||||
.col{display:inline-block;vertical-align:top;position:relative;white-space:normal;height:100%;min-width:220px;padding:10px 25px 10px 10px;margin:0 4px 0 0;overflow-y:auto;overflow-x:hidden;border:1px solid #ddd}
|
||||
.col>*>h1{line-height:30px;font-size:16px;border-bottom:2px solid #666;margin:0;color:#333}
|
||||
.col>*>ul{margin:0;padding:0;list-style:none}
|
||||
.col>.x_close{position:absolute;top:0;right:0;width:24px;height:24px}
|
||||
/* .mapi * */
|
||||
.mapi{margin:0 0 15px 0;min-width:200px}
|
||||
.mapi ul{margin:0;padding:0;list-style:none}
|
||||
|
|
@ -528,8 +531,8 @@
|
|||
.mapi a{text-decoration:none}
|
||||
.mapi>ul{padding:1px}
|
||||
/* .root */
|
||||
.mapi .root{margin-topp:15px;border:0 !important}
|
||||
.mapi .root:first-child{ margin-top:0}
|
||||
.mapi .root{margin-top:15px;border:0 !important}
|
||||
.mapi .root:first-child{margin-top:0}
|
||||
.mapi .root>ul{margin-top:10px}
|
||||
.mapi .root>.item{position:relative;border-bottom:2px solid #666;margin:0 -80px 0 0;zoom:1}
|
||||
.mapi .root>.item>strong{font-size:16px}
|
||||
|
|
@ -568,19 +571,44 @@
|
|||
.mapi .selected>.item>.tx>i[class*="-white"]{opacity:1;filter:alpha(opacity=100)}
|
||||
/* li>.item>.side */
|
||||
.mapi .side{position:absolute;z-index:2;top:3px;right:3px;line-height:0}
|
||||
.mapi .side>a{display:inline-block;border-radius:3px;width:24px;height:24px;overflow:hidden;line-height:0;text-indent:24px;background:#94A55C url({getUrl('')}common/img/glyphicons-halflings-white.png) no-repeat}
|
||||
.mapi .side>a[href="#add"]{background-position:5px -91px}
|
||||
.mapi .side>a[href="#info"]{background-position:-427px 5px}
|
||||
.mapi .side>a:hover,
|
||||
.mapi .side>a:focus,
|
||||
.mapi .side>a.active{background-color:#333}
|
||||
.mapi .side>button{border:0;border-radius:3px;width:24px;height:24px;overflow:hidden;line-height:0;text-indent:24px;background:#94A55C url({getUrl('')}common/img/glyphicons-halflings-white.png) no-repeat}
|
||||
.mapi .side>button[data-toggle="#add"]{background-position:5px -91px}
|
||||
.mapi .side>button[data-toggle="#info"]{background-position:-427px 5px}
|
||||
.mapi .side>button:hover,
|
||||
.mapi .side>button:focus,
|
||||
.mapi .side>button.active{background-color:#333}
|
||||
/* li>.item>ul */
|
||||
.mapi .root>ul ul{display:none}
|
||||
.mapi .root>ul li.open>ul{display:block}
|
||||
/* Add */
|
||||
#add.col>section>ul>li{ border-top:1px dotted #ccc;padding:7px 0}
|
||||
#add.col>section>ul>li:first-child{ border-top:0}
|
||||
|
||||
/* Add */
|
||||
#add li{border-top:1px solid #ddd;position:relative;white-space:nowrap}
|
||||
#add li:first-child{border-top:0}
|
||||
#add li>a{display:block;padding:6px 15px 6px 8px;color:#333;text-decoration:none;background:#fff;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s}
|
||||
#add li>a:hover,
|
||||
#add li>a:focus,
|
||||
#add li.active>a{background:#666;color:#fff}
|
||||
#add li>a>i{position:absolute;top:7px;right:5px;opacity:.5;filter:alpha(opacity=50)}
|
||||
#add li>a:hover>i,
|
||||
#add li>a:focus>i,
|
||||
#add li.active>a>i{background-image:url({getUrl('')}common/img/glyphicons-halflings-white.png);background-repeat:no-repeat;opacity:1;filter:alpha(opacity=100)}
|
||||
/* Add Page */
|
||||
#add_page ul{margin:15px 0}
|
||||
/* Add URL */
|
||||
#add_url ul{margin:15px 0}
|
||||
#add_url .clone ul{margin:0}
|
||||
#add_url .clone li{list-style:none}
|
||||
#add_url .clone ul ul{padding-left:15px}
|
||||
#add_url .clone .root{margin-top:15px}
|
||||
/* Download */
|
||||
#download.col{max-width:500px}
|
||||
#download .list{padding:1px 0;border-bottom:1px solid #ccc;}
|
||||
#download .item{border-top:1px solid #ddd;padding:1px 0;position:relative}
|
||||
#download .item:first-child{border:0}
|
||||
#download h2{font-size:14px}
|
||||
#download a.x_icon-download-alt{width:24px;height:24px;background-color:#94A55C;position:absolute;top:7px;right:0;border-radius:3px;background-position:-90px -19px}
|
||||
#download a.x_icon-download-alt:hover,
|
||||
#download a.x_icon-download-alt:focus{background-color:#333}
|
||||
#download p>i{font-style:normal;color:#ccc}
|
||||
</style>
|
||||
<!--[if IE 7]>
|
||||
<script>
|
||||
|
|
@ -617,16 +645,7 @@ function onSiteMapReceived(htData){
|
|||
// it makes sense to configure a plugin only if overriding the defaults
|
||||
})
|
||||
.bind("create_node.jstree", function (event, data) {
|
||||
var v = $("<i>").addClass("v");
|
||||
var h = $("<i>").addClass("h");
|
||||
//'<i class="v"></i><i class="h"></i>'
|
||||
var btns = $("<span>").addClass("side").html('<button data-toggle="#add">메뉴추가</button> <button data-toggle="#info">속성편집</button>');
|
||||
|
||||
//data.rslt.obj.prepend(h);
|
||||
//data.rslt.obj.prepend(v);
|
||||
h.insertBefore(data.rslt.obj.find("a"));
|
||||
v.insertBefore(data.rslt.obj.find("a"));
|
||||
|
||||
data.rslt.obj.append(btns);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue