fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 18:51:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

bootstrap.layout code renewal.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12567 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2013-01-17 04:36:10 +00:00
parent 96ece44f09
commit 4d2ebf63f1
5 changed files with 56 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

38
layouts/bootstrap.layout/bootstrap.layout.css vendored
View file

@ -8,9 +8,9 @@ body,table,input,textarea,select,button{font-family:나눔고딕,NanumGothic,NG,
}
h1,h2,h3,h4,h5,h6,th,strong,b{font-weight:600}
/* Bootstrap Override */
.x_close{font-family:"Helvetica Neue", Helvetica, Arial, sans-serif}
.x_btn-link{margin:0;padding:0}
.x_navbar .x_brand{font-size:14px;color:#fff}
.close{font-family:"Helvetica Neue", Helvetica, Arial, sans-serif}
.btn-link{margin:0;padding:0}
.navbar .brand{font-size:14px;color:#fff}
h1,h2,h3,h4,h5,h6{line-height:1.5}
h1{font-size:26px}
h2{font-size:22px}
@ -37,25 +37,25 @@ input[type=radio]{margin:0}
.skip>a{height:1px;overflow:hidden;display:block;text-align:center;font-weight:bold;margin:-1px 0 0 0;color:#fff;text-decoration:none}
.skip>a:focus{height:auto;padding:8px 0;border-radius:0 0 4px 4px;background:#333}
/* Header */
.header>.x_row{position:relative}
.header>.row{position:relative}
.header h1 a{color:#333;font-family:Arial, Helvetica, sans-serif;text-decoration:none}
/* GNB */
.gnb.x_navbar .x_dropdown-menu{background:none;margin:0 10px}
.gnb.x_navbar .x_dropdown-menu a{font-weight:normal}
.gnb.x_navbar .x_dropdown-menu:before,
.gnb.x_navbar .x_dropdown-menu:after{content:normal !important}
.gnb.x_navbar-inverse .x_navbar-inner{background:#444;border-color:#444}
.gnb.x_navbar-inverse .active .x_dropdown-toggle{background:#111}
.gnb.x_navbar-inverse .x_dropdown-toggle{color:#fff}
.gnb.x_navbar-inverse .x_dropdown-menu a{color:#fff}
.gnb.x_navbar .x_navbar-form{border-color:#666;border-bottom:0;box-shadow:none;padding:10px 0}
.gnb.x_navbar .x_btn-navbar{margin-right:0}
.gnb.navbar .dropdown-menu{background:none;margin:0 10px}
.gnb.navbar .dropdown-menu a{font-weight:normal}
.gnb.navbar .dropdown-menu:before,
.gnb.navbar .dropdown-menu:after{content:normal !important}
.gnb.navbar-inverse .navbar-inner{background:#444;border-color:#444}
.gnb.navbar-inverse .active .dropdown-toggle{background:#111}
.gnb.navbar-inverse .dropdown-toggle{color:#fff}
.gnb.navbar-inverse .dropdown-menu a{color:#fff}
.gnb.navbar .navbar-form{border-color:#666;border-bottom:0;box-shadow:none;padding:10px 0}
.gnb.navbar .btn-navbar{margin-right:0}
@media all and (min-width:980px){
.gnb.x_navbar{position:relative;z-index:1;margin:5px 0 20px 0}
.gnb.x_navbar .x_dropdown-toggle{font-weight:bold;padding:10px 20px}
.gnb.x_navbar .x_dropdown-menu{border-radius:0 0 6px 6px;margin:0}
.gnb.x_navbar-inverse .x_dropdown-menu{background:#111}
.gnb.x_navbar .x_navbar-form{padding:0}
.gnb.navbar{position:relative;z-index:1;margin:5px 0 20px 0}
.gnb.navbar .dropdown-toggle{font-weight:bold;padding:10px 20px}
.gnb.navbar .dropdown-menu{border-radius:0 0 6px 6px;margin:0}
.gnb.navbar-inverse .dropdown-menu{background:#111}
.gnb.navbar .navbar-form{padding:0}
}
/* Account */
.account{position:absolute;right:0;bottom:5px;z-index:2;margin:0}

20
layouts/bootstrap.layout/bootstrap.layout.js vendored
View file

@ -8,12 +8,12 @@ jQuery(function($){
});
// Login Error
$('#fo_login_widget .message').parent('.x_well').show();
$('#fo_login_widget .message').parent('.well').show();
// GNB
var $gnb = $('.gnb');
var $gnb_drop_toggle = $gnb.find('a.x_dropdown-toggle');
var $gnb_drop_menu = $gnb.find('ul.x_dropdown-menu');
var $gnb_drop_toggle = $gnb.find('a.dropdown-toggle');
var $gnb_drop_menu = $gnb.find('ul.dropdown-menu');
$(window).resize(function(){
var ww = $(window).width();
if(ww >= 980){
@ -181,7 +181,7 @@ jQuery(function($){
dimension = this.dimension()
scroll = $.camelCase(['scroll', dimension].join('-'))
actives = this.$parent && this.$parent.find('> .x_accordion-group > .x_in')
actives = this.$parent && this.$parent.find('> .accordion-group > .in')
if (actives && actives.length) {
hasData = actives.data('collapse')
@ -208,11 +208,11 @@ jQuery(function($){
var dimension = this.dimension()
this.$element
.removeClass('x_collapse')
.removeClass('collapse')
[dimension](size || 'auto')
[0].offsetWidth
this.$element[size !== null ? 'addClass' : 'removeClass']('x_collapse')
this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
return this
}
@ -231,15 +231,15 @@ jQuery(function($){
this.transitioning = 1
this.$element[method]('x_in')
this.$element[method]('in')
$.support.transition && this.$element.hasClass('x_collapse') ?
$.support.transition && this.$element.hasClass('collapse') ?
this.$element.one($.support.transition.end, complete) :
complete()
}
, toggle: function () {
this[this.$element.hasClass('x_in') ? 'hide' : 'show']()
this[this.$element.hasClass('in') ? 'hide' : 'show']()
}
}
@ -275,7 +275,7 @@ jQuery(function($){
|| e.preventDefault()
|| (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
, option = $(target).data('collapse') ? 'toggle' : $this.data()
$this[$(target).hasClass('x_in') ? 'addClass' : 'removeClass']('x_collapsed')
$this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
$(target).collapse(option)
})
})

44
layouts/bootstrap.layout/layout.html
View file

@ -5,11 +5,11 @@
<load target="bootstrap.layout.ie9fix.css" index="2" targetie="IE 9" />
<load target="../../common/js/respond.min.js" targetie="lt IE 9" />
<load target="bootstrap.layout.js" type="body" />
<div class="x_container">
<div class="container">
<p class="skip"><a href="#content">{$lang->skip_to_content}</a></p>
<header class="header">
<div class="x_row">
<h1 class="x_span6">
<div class="row">
<h1 class="span6">
<a href="{geturl('')}" id="siteTitle"><img src="siteTitle.png" alt="XpressEngine"></a>
</h1>
<!-- ACCOUNT -->
@ -17,31 +17,31 @@
<!-- /ACCOUNT -->
</div>
<!-- GNB -->
<nav class="gnb x_navbar x_navbar-inverse" id="gnb">
<div class="x_navbar-inner">
<div class="x_container">
<a class="x_btn x_btn-navbar" data-toggle="collapse" data-target=".x_nav-collapse">
<span class="x_icon-bar"></span>
<span class="x_icon-bar"></span>
<span class="x_icon-bar"></span>
<nav class="gnb navbar navbar-inverse" id="gnb">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="x_brand" href="{geturl('')}">HOME</a>
<div class="x_nav-collapse">
<ul class="x_nav">
<li loop="$GNB->list=>$key1,$val1" class="x_dropdown"|cond="!$val1['selected']" class="x_dropdown x_active"|cond="$val1['selected']">
<a href="{$val1['href']}" class="x_dropdown-toggle" target="_blank"|cond="$val1['open_window']=='Y'">{$val1['link']}</a>
<ul cond="$val1['list']" class="x_dropdown-menu">
<li loop="$val1['list']=>$key2,$val2" class="x_active"|cond="$val2['selected']"><a href="{$val2['href']}" target="_blank"|cond="$val2['open_window']=='Y'">{$val2['link']}</a></li>
<a class="brand" href="{geturl('')}">HOME</a>
<div class="nav-collapse">
<ul class="nav">
<li loop="$GNB->list=>$key1,$val1" class="dropdown"|cond="!$val1['selected']" class="dropdown active"|cond="$val1['selected']">
<a href="{$val1['href']}" class="dropdown-toggle" target="_blank"|cond="$val1['open_window']=='Y'">{$val1['link']}</a>
<ul cond="$val1['list']" class="dropdown-menu">
<li loop="$val1['list']=>$key2,$val2" class="active"|cond="$val2['selected']"><a href="{$val2['href']}" target="_blank"|cond="$val2['open_window']=='Y'">{$val2['link']}</a></li>
</ul>
</li>
</ul>
<!-- SEARCH -->
<form action="{getUrl()}" method="get" class="x_navbar-form x_pull-right">
<form action="{getUrl()}" method="get" class="navbar-form pull-right">
<input type="hidden" name="vid" value="{$vid}" />
<input type="hidden" name="mid" value="{$mid}" />
<input type="hidden" name="act" value="IS" />
<input type="text" name="is_keyword" value="{$is_keyword}" required placeholder="{$lang->cmd_search}" title="{$lang->cmd_search}" style="width:120px;height:18px;line-height:18px" />
<input type="submit" value="{$lang->cmd_search}" class="x_btn x_btn-inverse" />
<input type="submit" value="{$lang->cmd_search}" class="btn btn-inverse" />
</form>
<!-- /SEARCH -->
</div>
@ -54,10 +54,10 @@
<!-- LNB -->
<nav class="lnb" cond="$layout_info->LAYOUT_TYPE == 'SUB_PAGE'">
<h2 loop="$GNB->list=>$key1,$val1" cond="$val1['selected']"><a href="{$val1['href']}" target="_blank"|cond="$val1['open_window']=='Y'">{$val1['link']}</a></h2>
<ul loop="$GNB->list=>$key1,$val1" cond="$val1['selected'] && $val1['list']" class="x_nav x_nav-tabs x_nav-stacked">
<li loop="$val1['list']=>$key2,$val2" class="x_active"|cond="$val2['selected']"><a href="{$val2['href']}" target="_blank"|cond="$val2['open_window']=='Y'">{$val2['link']}</a>
<ul loop="$GNB->list=>$key1,$val1" cond="$val1['selected'] && $val1['list']" class="nav nav-tabs nav-stacked">
<li loop="$val1['list']=>$key2,$val2" class="active"|cond="$val2['selected']"><a href="{$val2['href']}" target="_blank"|cond="$val2['open_window']=='Y'">{$val2['link']}</a>
<ul cond="$val2['list']">
<li loop="$val2['list']=>$key3,$val3" class="x_active"|cond="$val3['selected']"><a href="{$val3['href']}" target="_blank"|cond="$val3['open_window']=='Y'">{$val3['link']}</a>
<li loop="$val2['list']=>$key3,$val3" class="active"|cond="$val3['selected']"><a href="{$val3['href']}" target="_blank"|cond="$val3['open_window']=='Y'">{$val3['link']}</a>
</li>
</ul>
</li>

4
widgets/login_info/skins/bootstrap.login/bootstrap.login.js vendored
View file

@ -31,8 +31,8 @@ jQuery(function($){
// Close
$account
.find('>#acField')
.append('<button type="button" class="x_close">&times;</button>')
.find('>.x_close').click(function(){
.append('<button type="button" class="close">&times;</button>')
.find('>.close').click(function(){
$(this).closest('#acField').slideUp(200, function(){
$acTog.eq(0).focus();
});

6
widgets/login_info/skins/bootstrap.login/login_form.html
View file

@ -2,8 +2,8 @@
<load target="login.xml" />
<load target="bootstrap.login.js" />
<form id="fo_login_widget" action="{getUrl('','act','procMemberLogin')}" method="post" ruleset="@login" class="account">
<a href="#acField" class="x_btn x_btn-link">{$lang->cmd_login}</a>
<fieldset class="x_well" id="acField">
<a href="#acField" class="btn btn-link">{$lang->cmd_login}</a>
<fieldset class="well" id="acField">
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{htmlspecialchars(getRequestUriByServerEnviroment())}" />
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
@ -19,7 +19,7 @@
<label for="keep_signed">{$lang->keep_signed}</label>
</p>
</div>
<input type="submit" class="x_btn x_btn-primary" value="{$lang->cmd_login}" />
<input type="submit" class="btn btn-primary" value="{$lang->cmd_login}" />
</div>
<p class="warning">{$lang->about_keep_warning}</p>
<ul class="help">