Merge branch 'master' of github.com:gnuboard/g4s

bbs/ckeditor/config.js

@@ -6,12 +6,75 @@
 CKEDITOR.on('dialogDefinition', function(ev) {
     var dialogName = ev.data.name;
     var dialogDefinition = ev.data.definition;
+    var dialog = dialogDefinition.dialog;
+    var editor = ev.editor;
+
     if (dialogName=='image') {
-        dialogDefinition.removeContents('Link');
-        dialogDefinition.removeContents('advanced');
+        // memo: dialogDefinition.onShow = ... throws JS error (C.preview not defined) 
+        /* 
+        // Get a reference to the 'Link Info' tab. 
+        var infoTab = dialogDefinition.getContents('info'); 
+        // Remove unnecessary widgets 
+        infoTab.remove( 'ratioLock' ); 
+        infoTab.remove( 'txtHeight' );          
+        infoTab.remove( 'txtWidth' );          
+        infoTab.remove( 'txtBorder'); 
+        infoTab.remove( 'txtHSpace'); 
+        infoTab.remove( 'txtVSpace'); 
+        infoTab.remove( 'cmbAlign' ); 
+        */
+        /*
+        dialogDefinition.onLoad = function(){ 
+            var dialog = CKEDITOR.dialog.getCurrent(); 
+            var elem = dialog.getContentElement('info','htmlPreview');     
+            elem.getElement().hide(); 
+            dialog.hidePage('Link'); 
+            dialog.hidePage('advanced'); 
+            dialog.hidePage('info'); // works now (CKEditor v3.6.4) 
+            this.selectPage('Upload'); 
+        }; 
+        */
+
+        dialogDefinition.onLoad = function(){ 
+            dialog.getContentElement('info', 'htmlPreview').getElement().hide();     
+            dialog.getContentElement('info', 'cmbAlign').getElement().hide();     
+            this.hidePage('Link');
+            this.hidePage('advanced');
+            this.selectPage('Upload'); 
+        }; 
+
+        dialogDefinition.onOk = function (e) {
+            var imageSrcUrl = e.sender.originalElement.$.src;
+            var imgHtml = CKEDITOR.dom.element.createFromHtml('<img src=' + imageSrcUrl + ' alt="" />');
+            editor.insertElement(imgHtml);
+
+            var uploadTab = dialogDefinition.getContents('Upload');
+            var uploadButton = uploadTab.get('uploadButton');
+            uploadButton['filebrowser']['onSelect'] = function(fileUrl, errorMessage) {
+                $("input.cke_dialog_ui_input_text").val(fileUrl);
+                $(".cke_dialog_ui_button_ok span").click();
+            }
+        };
+
+        /*
+        var uploadTab = dialogDefinition.getContents('Upload');
+        var uploadButton = uploadTab.get('uploadButton');
+        uploadButton['filebrowser']['onSelect'] = function(fileUrl, errorMessage) {
+            $("input.cke_dialog_ui_input_text").val(fileUrl);
+            $(".cke_dialog_ui_button_ok span").click();
+        }
+        */
     } else if (dialogName=='link') {
         dialogDefinition.removeContents('advanced');
+
+        dialogDefinition.onShow = function(){ 
+            dialog.getContentElement('info','anchorOptions').getElement().hide(); 
+            dialog.getContentElement('info','emailOptions').getElement().hide();
+            dialog.getContentElement('info','linkType').getElement().hide(); 
+            dialog.getContentElement('info','protocol').disable();
+        }; 
     }
+
     var infoTab = dialogDefinition.getContents('info');
     if (infoTab) {
         infoTab.remove('txtHSpace');
@@ -24,10 +87,6 @@ CKEDITOR.on('dialogDefinition', function(ev) {
 });
 
 CKEDITOR.editorConfig = function( config ) {
-	// Define changes to default configuration here. For example:
-	// config.language = 'fr';
-	// config.uiColor = '#AADC6E';
-
     config.language = "ko";
     config.toolbar = [
         ['Format','Font','FontSize'],

css/default.css

@@ -87,6 +87,8 @@ a:active {color:#000;text-decoration:underline}
 .gnb_1depth_over .gnb_sub_ul {left:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff}
 .gnb_1depth_over2 .gnb_sub_ul {right:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff}
 
+.gnb_empty {width:100%;height:35px;text-align:center;line-height:2.95em}
+
 /* 배포시에는 필요없는 부분 */
 #sirgle_title {height:100px;color:#fff;font-size:3em}
 #sirgle_title_span {display:block;position:relative;top:33px;left:0;margin:0 auto;width:980px}

css/mobile.css

@@ -83,6 +83,8 @@ pre {overflow-x:scroll;font-size:1.1em}
 #gnb li ul {display:none}
 #gnb li a {display:block;padding:1em 0;border-right:1px solid #e7f1ed;color:#000;text-align:center;text-decoration:none}
 
+.gnb_empty {float:none !important;width:100% !important;height:10em;text-align:center;line-height:10em}
+
 #ft {background:#484848}
 #ft h1 {width:0;height:0;font-size:0;line-height:0;overflow:hidden}
 

head.php

@@ -148,6 +148,7 @@ if ($config['cf_include_head']) {
             </ul>
         </li>
         <?}?>
+        <? if ($gi == 0) { ?><li class="gnb_empty">생성된 메뉴가 없습니다.</a><? } ?>
     </ul>
 </nav>
 

mobile/tail.php

@@ -17,6 +17,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         ?>
         <li><a href="<?=G4_BBS_URL?>/group.php?gr_id=<?=$row['gr_id']?>"><?=$row['gr_subject']?></a></li>
         <?}?>
+        <? if ($gi == 0) { ?><li class="gnb_empty">생성된 메뉴가 없습니다.</a><? } ?>
     </ul>
 </nav>