OSDN Git Service

管理機能用旧スライドパネル削除。
authornaoki hirata <naoki@magic3.org>
Sat, 5 Apr 2014 11:33:34 +0000 (20:33 +0900)
committernaoki hirata <naoki@magic3.org>
Sat, 5 Apr 2014 11:33:34 +0000 (20:33 +0900)
images/system/area_open32.png [new file with mode: 0644]
images/system/reload32.png [new file with mode: 0644]
scripts/m3/admin.css
scripts/m3admin1.6.9.js

diff --git a/images/system/area_open32.png b/images/system/area_open32.png
new file mode 100644 (file)
index 0000000..3ec9f00
Binary files /dev/null and b/images/system/area_open32.png differ
diff --git a/images/system/reload32.png b/images/system/reload32.png
new file mode 100644 (file)
index 0000000..787083e
Binary files /dev/null and b/images/system/reload32.png differ
index de409f3..fa2bfed 100644 (file)
  * @version    SVN: $Id$
  * @link       http://www.magic3.org
  */
-#m3slidemenubar {
-       font: 12px "Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif;
-       color:#000;
-}
-#m3slidemenubar ul {
-       list-style: none;
-       margin:0;
-       padding:0;
-}
-#m3slidemenubar a {
-       text-decoration:none;
-       outline:none;
-}
-#m3slidemenubarpanel{
-       position:fixed;
-       left:0;
-       width:100%;
-       height:80px;
-       background:#65a0bd url(images/bg.png) repeat-x left top;
-       padding:10px;
-       overflow:hidden;
-       display:none;
-       z-index:2147483647;
-}
-#m3slidemenubarpanel.top{
-       top:0;
-       border-bottom:1px solid #666;
-}
-#m3slidemenubarpanel.bottom {
-       bottom:0;
-       border-top:1px solid #666;
-}
-#m3slidemenubar ul.menubarbuttons {
-       float:left;
-}
-#m3slidemenubar ul.menubarbuttons li {
-       float:left;
-       display:inline;
-       width:70px;
-       height:70px;
-       margin-right:10px;
-       padding:5px;
-       text-align:center;
-       border:1px solid #666;
-       border-radius: 5px;
-       -moz-border-radius: 5px;
-       -webkit-border-radius: 5px;
-       background:transparent url(images/buttun-bg.png) repeat-x top left;
-}
-#m3slidemenubar ul.menubarbuttons li a {
-       color:#FFF;
-}
-#m3slidemenubar ul.menubarbuttons li a:hover {
-       color:#999999;
-}
-#m3slidemenubar ul.menubarbuttons li a img {
-       display:block;
-       margin:0 auto;
-}
-#slidetrigger {
-       position:fixed;
-       left:auto;
-       left:5px;
-       padding:5px;
-       width:60px;
-       height:20px;
-       background-color:#000;
-       text-align:center;
-       font-size:14px;
-       border-top:none;
-       border-left:1px solid #666;
-       border-right:1px solid #666;
-       border-bottom:1px solid #666;
-       z-index:2147483647;
-}
-#slidetrigger.top {
-       top:0;
-       border-bottom-right-radius: 5px;
-       -moz-border-radius-bottomright: 5px;
-       -webkit-border-bottom-right-radius: 5px;
-       border-bottom-left-radius: 5px;
-       -moz-border-radius-bottomleft: 5px;
-       -webkit-border-bottom-left-radius: 5px;
-}
-#slidetrigger.bottom {
-       bottom:0;
-       border-top-right-radius: 5px;
-       -moz-border-radius-topright: 5px;
-       -webkit-border-top-right-radius: 5px;
-       border-top-left-radius: 5px;
-       -moz-border-radius-topleft: 5px;
-       -webkit-border-top-left-radius: 5px;
-}
-#slidetrigger a {
-       font-size:14px;
-       color:#FFF;
-}
-#slidetrigger a:hover {
-       color:#CCC;
-}
-#slidetrigger a.m3open {
-       display:inline;
-}
-#slidetrigger a.m3close {
-       display:none;
-}
-
 /*.m3_widget.m3_widget_sortable { cursor: url(../../images/system/cursor/context.cur), auto; }*/
 .m3_widget.m3_widget_contextmenu { cursor: url(../../images/system/cursor/context.cur), auto; }
 
index ae6091d..f4a80d1 100644 (file)
@@ -471,80 +471,30 @@ function m3SetHelp()
     if (jQuery().tooltip) $('[rel=m3help]').tooltip({ placement: 'top'});
 }
 /**
- * 画面操作用スライド開閉メニューバー
+ * ファイル選択ボタンを設定
+ *
+ * @return なし
  */
-$.fn.m3SlideMenubar = function(givenOpts){
-       opts = $.extend({
-               position: 'top',                        // panel position 'top' or 'bottom'
-               height: '80px',                         // set the height of the panel
-               speed: 'normal',                        // 'slow', 'normal', 'fast', or number in milliseconds
-               touchPanel: true,                       // mouse click operation than mouse hover
-               openBtn: '.m3open',                     // open button id or class inside 'slidetrigger' div
-               closeBtn: '.m3close',                   // close button id or class inside 'slidetrigger' div
-               slideTrigger: '#slidetrigger'   // trigger id or class
-       }, givenOpts);
-
-       // refers to the selector 'm3SlideMenubar'
-       var $this = $(this);
-
-       // vars needed to pass args to animate method
-       var containerpadding;
-       var aniOpenArgs = {};
-       var aniCloseArgs = {};
-
-       // add appropriate class names based on position
-       if (opts.position == 'top') {
-               $this.addClass('top');
-               $(opts.slideTrigger).addClass('top');
-               containerpadding = 'top';
-       } else {
-               $this.addClass('bottom');
-               $(opts.slideTrigger).addClass('bottom');
-               containerpadding = 'padding-bottom';
-       };
-
-       // set panel's height
-       $this.css('height', opts.height);
-
-       // remove the 'px' from the height string so we can calculate the container padding
-       var newpadding = opts.height.replace("px","");
-       newpadding = parseInt(opts.height) + 21;
-
-       aniOpenArgs[containerpadding] = newpadding;
-       aniCloseArgs[containerpadding] = 0;
-
-       if (opts.touchPanel){
-               // slide panel in and container down
-               $(opts.openBtn).click(function(){
-                       $this.slideDown(opts.speed);
-                       $(opts.slideTrigger).animate(aniOpenArgs, opts.speed);
-                       $(opts.openBtn).css({'display':'none'});
-                       $(opts.closeBtn).css({'display':'inline'});
-                       return false;
-               });
-               // slide panel out and container up
-               $(opts.closeBtn).click(function(){
-                       $this.slideUp(opts.speed);
-                       $(opts.slideTrigger).animate(aniCloseArgs, opts.speed);
-                       $(opts.openBtn).css({'display':'inline'});
-                       $(opts.closeBtn).css({'display':'none'});
-                       return false;
-               });
-       } else {
-               // slide panel in and container down
-               $(opts.openBtn).mouseover(function(){
-                       $this.slideDown(opts.speed);
-                       $(opts.slideTrigger).slideUp(opts.speed);
-                       return false;
-               });
-               // slide panel out and container up
-               $this.hover(function(){},function(){
-                       $this.slideUp(opts.speed);
-                       $(opts.slideTrigger).slideDown(opts.speed);
-                       return false;
-               });
-       }
-};
+function m3SetFileSelectButton()
+{
+       $('.btn-file :file').on('fileselect', function(event, numFiles, label){
+               var input = $(this).parents('.input-group').find(':text'),
+                       log = numFiles > 1 ? numFiles + ' files selected' : label;
+               
+               if (input.length){
+                       input.val(log);
+               } else {
+                       if (log) alert(log);
+               }
+       });
+       
+       $(document).on('change', '.btn-file :file', function(){
+           var input = $(this),
+               numFiles = input.get(0).files ? input.get(0).files.length : 1,
+               label = input.val().replace(/\\/g, '/').replace(/.*\//, '');
+           input.trigger('fileselect', [numFiles, label]);
+       });
+}
 /*
  * 初期処理
  */