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

Issue 2444. File upload UI bugfix.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11447 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2012-09-24 02:07:55 +00:00
parent 9c37dd436a
commit d1fb60cc36
6 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/admin/tpl/css/admin.css
View file

@ -2,7 +2,7 @@
/* Reset */ /* Reset */
html{min-height:100%} html{min-height:100%}
body{margin:10px;-webkit-text-size-adjust:none} body{margin:10px;-webkit-text-size-adjust:none}
body>.x{min-width:300px} body>.x{min-width:300px;max-width:1240px}
@media all and (max-width:480px){ @media all and (max-width:480px){
body>.x{margin:0} body>.x{margin:0}
} }
@ -37,6 +37,8 @@ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-size:13px}
.x a.x_icon-question-sign, .x a.x_icon-question-sign,
.x button.x_icon-question-sign{cursor:help} .x button.x_icon-question-sign{cursor:help}
.x .x_nav-tabs>li>a{padding-top:4px;padding-bottom:4px} .x .x_nav-tabs>li>a{padding-top:4px;padding-bottom:4px}
.x .x_table{border-top:2px solid #ddd;border-bottom:1px solid #ddd}
.x .x_table>caption{text-align:left;padding:8px 0}
/* Image Sprite */ /* Image Sprite */
.x a[target="_blank"]:after, .x a[target="_blank"]:after,
.x>.body>.gnb>ul>li>a:before, .x>.body>.gnb>ul>li>a:before,
@ -76,7 +78,7 @@ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-size:13px}
.x>.header>.site>a{text-decoration:none;color:#666;font-family:Tahoma, Geneva, sans-serif} .x>.header>.site>a{text-decoration:none;color:#666;font-family:Tahoma, Geneva, sans-serif}
.x>.header>.site>a:hover, .x>.header>.site>a:hover,
.x>.header>.site>a:focus{text-decoration:underline} .x>.header>.site>a:focus{text-decoration:underline}
.x>.header>.account{float:right;position:relative;margin:20px 0 0 0} .x>.header>.account{float:right;position:relative;margin:13px 0 0 0}
.x>.header>.account>ul{list-style:none;margin:0;padding:0} .x>.header>.account>ul{list-style:none;margin:0;padding:0}
.x>.header>.account>ul>li{display:inline} .x>.header>.account>ul>li{display:inline}
.x>.header>.account>ul>li:before{content:"| ";color:#ddd} .x>.header>.account>ul>li:before{content:"| ";color:#ddd}

6
modules/admin/tpl/css/admin.min.css vendored
View file

@ -2,7 +2,7 @@
/* Reset */ /* Reset */
html{min-height:100%} html{min-height:100%}
body{margin:10px;-webkit-text-size-adjust:none} body{margin:10px;-webkit-text-size-adjust:none}
body>.x{min-width:300px} body>.x{min-width:300px;max-width:1240px}
@media all and (max-width:480px){ @media all and (max-width:480px){
body>.x{margin:0} body>.x{margin:0}
} }
@ -37,6 +37,8 @@ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-size:13px}
.x a.x_icon-question-sign, .x a.x_icon-question-sign,
.x button.x_icon-question-sign{cursor:help} .x button.x_icon-question-sign{cursor:help}
.x .x_nav-tabs>li>a{padding-top:4px;padding-bottom:4px} .x .x_nav-tabs>li>a{padding-top:4px;padding-bottom:4px}
.x .x_table{border-top:2px solid #ddd;border-bottom:1px solid #ddd}
.x .x_table>caption{text-align:left;padding:8px 0}
/* Image Sprite */ /* Image Sprite */
.x a[target="_blank"]:after, .x a[target="_blank"]:after,
.x>.body>.gnb>ul>li>a:before, .x>.body>.gnb>ul>li>a:before,
@ -76,7 +78,7 @@ body>.x,.x table,.x input,.x textarea,.x select,.x button{font-size:13px}
.x>.header>.site>a{text-decoration:none;color:#666;font-family:Tahoma, Geneva, sans-serif} .x>.header>.site>a{text-decoration:none;color:#666;font-family:Tahoma, Geneva, sans-serif}
.x>.header>.site>a:hover, .x>.header>.site>a:hover,
.x>.header>.site>a:focus{text-decoration:underline} .x>.header>.site>a:focus{text-decoration:underline}
.x>.header>.account{float:right;position:relative;margin:20px 0 0 0} .x>.header>.account{float:right;position:relative;margin:13px 0 0 0}
.x>.header>.account>ul{list-style:none;margin:0;padding:0} .x>.header>.account>ul{list-style:none;margin:0;padding:0}
.x>.header>.account>ul>li{display:inline} .x>.header>.account>ul>li{display:inline}
.x>.header>.account>ul>li:before{content:"| ";color:#ddd} .x>.header>.account>ul>li:before{content:"| ";color:#ddd}

7
modules/admin/tpl/js/admin.js
View file

@ -24,12 +24,11 @@ jQuery(function($){
}); });
*/ */
// Tab Navigation // Tab Navigation
var $tabbable = $('.x .x_tabbable'); $('.x .x_tab-content>.x_tab-pane:not(".x_active")').hide();
$tabbable.find('.x_tab-pane:not(".x_active")').hide(); $('.x .x_nav-tabs').find('>li>a').click(function(){
$tabbable.find('.x_nav-tabs>li>a').click(function(){
var $this = $(this); var $this = $(this);
$this.parent('li').addClass('x_active').siblings().removeClass('x_active'); $this.parent('li').addClass('x_active').siblings().removeClass('x_active');
$tabbable.find($this.attr('href')).addClass('x_active').show().siblings().removeClass('x_active').hide(); $this.closest('.x_nav-tabs').next('.x_tab-content').find($this.attr('href')).addClass('x_active').show().siblings().removeClass('x_active').hide();
return false; return false;
}); });
// GNB Height 100% // GNB Height 100%

7
modules/admin/tpl/js/admin.min.js vendored
View file

@ -24,12 +24,11 @@ jQuery(function($){
}); });
*/ */
// Tab Navigation // Tab Navigation
var $tabbable = $('.x .x_tabbable'); $('.x .x_tab-content>.x_tab-pane:not(".x_active")').hide();
$tabbable.find('.x_tab-pane:not(".x_active")').hide(); $('.x .x_nav-tabs').find('>li>a').click(function(){
$tabbable.find('.x_nav-tabs>li>a').click(function(){
var $this = $(this); var $this = $(this);
$this.parent('li').addClass('x_active').siblings().removeClass('x_active'); $this.parent('li').addClass('x_active').siblings().removeClass('x_active');
$tabbable.find($this.attr('href')).addClass('x_active').show().siblings().removeClass('x_active').hide(); $this.closest('.x_nav-tabs').next('.x_tab-content').find($this.attr('href')).addClass('x_active').show().siblings().removeClass('x_active').hide();
return false; return false;
}); });
// GNB Height 100% // GNB Height 100%

1
modules/menu/tpl/site_design.html
View file

@ -171,6 +171,7 @@
</div> </div>
<style> <style>
/* Site */ /* Site */
body>.x{max-width:none}
.x>.body>.content{margin-bottom:0} .x>.body>.content{margin-bottom:0}
#site{position:relative;overflow-x:auto;overflow-y:hidden;white-space:nowrap;margin-top:10px} #site{position:relative;overflow-x:auto;overflow-y:hidden;white-space:nowrap;margin-top:10px}
#site .btnBoth, #site .btnBoth,

29
modules/menu/tpl/sitemap.html
View file

@ -477,6 +477,7 @@
</div> </div>
<style> <style>
/* Site */ /* Site */
body>.x{max-width:none}
.x>.body>.content{margin-bottom:0} .x>.body>.content{margin-bottom:0}
#site{position:relative;overflow-x:auto;overflow-y:hidden;white-space:nowrap;margin-top:10px} #site{position:relative;overflow-x:auto;overflow-y:hidden;white-space:nowrap;margin-top:10px}
#site .btnBoth, #site .btnBoth,
@ -1194,22 +1195,22 @@ setTimeout(function(){
$('input[type="file"]').change(function(){ $('input[type="file"]').change(function(){
$(this).closest('form').submit(); $(this).closest('form').submit();
}); });
var $fileBtn = $('.fileTrigger, .fileRemover'); $('.fileRemover').click(function(){
$fileBtn.click(function(){ $(this).remove();
var $this = $(this); });
var $fileRemover = $this.parent('.btnBoth').children('.fileRemover'); function fileRemoverDisplay(){
setTimeout(function(){ setTimeout(function(){
var imgLength = $this.closest('form').find('>figure>img').length; // hasImage $('.fileRemover').each(function(){
if(imgLength){ var $this = $(this);
$fileRemover.show(); // Show remover if($this.closest('form').find('>figure>img').length){
} else { $this.show(); // Show remover
$fileRemover.hide(); // Hide remover } else {
} $this.hide(); // Hide remover
}
});
}, 1000); }, 1000);
}); }
$(window).load(function(){ $(window).load(fileRemoverDisplay);
$fileBtn.trigger('click');
});
// Theme(layout | skin) list toggle // Theme(layout | skin) list toggle
$('.theme .list').each(function(){ $('.theme .list').each(function(){
var $this = $(this); var $this = $(this);