Merge branch 'dev' into dev-tab-feat

src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml

@@ -35,7 +35,7 @@
         <li data-pwCommand="selectionCut">Cut selection</li>
         <li data-pwCommand="selectionCopy">Copy selection</li>
         <li data-pwCommand="clipboardPaste">Clipboard paste</li>
-        <li data-pwTool="insertimg">Insert image</li>
+        <!--<li data-pwTool="insertimg">Insert image</li>-->
         <li data-pwCommand="imageRotate">Rotate image</li>
 
         <li class="paintweb_toolSeparator">&#160;</li>
@@ -44,7 +44,7 @@
         .paintweb_tool_toolID and a generic class name .paintweb_tool. In this 
         case the class names will be .paintweb_tool_insertimg and 
         .paintweb_tool.  -->
-        <li data-pwTool="text">Text</li>
+        <!--<li data-pwTool="text">Text</li>-->
         <li data-pwTool="rectangle">Rectangle</li>
 
         <li class="paintweb_toolSeparator">&#160;</li>
@@ -63,16 +63,20 @@
         <!--<li data-pwTool="eraser">Eraser</li>-->
         <li data-pwCommand="imageClear">Clear image</li>
         <li data-pwCommand="imageSave">Save image</li>
-      </ul>
 
-      <div class="paintweb_strokeFillStyles">
+        <li class="paintweb_strokeFillStyles">
-        <p class="paintweb_opt_fillStyle">Fill <span
+          <p class="paintweb_opt_fillStyle">Fill
-          data-pwColorInput="fillStyle">&#160;</span>
+            <span data-pwColorInput="fillStyle">&#160;</span>
           </p>
-        <p class="paintweb_opt_strokeStyle">Stroke <span
+          <p class="paintweb_opt_strokeStyle">Stroke
-          data-pwColorInput="strokeStyle">&#160;</span>
+            <span data-pwColorInput="strokeStyle">&#160;</span>
           </p>
-      </div>
+        </li>
+
+
+      </ul>
+
+
     </div>
 
     <!-- Note that all tool/command elements will have an anchor elements as the
@@ -81,63 +85,65 @@
     accessibility. -->
 
     <!-- .paintweb_main_line -->
+<!-- FIXME : line 툴 사용시
     <div data-pwTab="line" data-pwTabHide="true">
 
-      <!-- Elements with data-pwConfig will have class names like 
+      &lt;!&ndash; Elements with data-pwConfig will have class names like
       paintweb_cfg_configVariable. In this case the class name will be 
-      .paintweb_cfg_line_lineWidth. -->
+      .paintweb_cfg_line_lineWidth. &ndash;&gt;
       <p class="paintweb_opt_lineWidth"><label>Line width <input 
         data-pwConfig="line.lineWidth" type="number" min="1" value="1" 
         /></label></p>
 
-      <!-- .paintweb_cfg_line_miterLimit (dot becomes underscore) -->
+      &lt;!&ndash; .paintweb_cfg_line_miterLimit (dot becomes underscore) &ndash;&gt;
       <p class="paintweb_opt_miterLimit"><label>Miter limit <input  
         data-pwConfig="line.miterLimit" type="number" min="1" value="10" 
         /></label></p>
 
-      <!-- .paintweb_cfg_line_lineCap -->
+      &lt;!&ndash; .paintweb_cfg_line_lineCap &ndash;&gt;
       <div data-pwConfig="line.lineCap">
         <p>Line cap</p>
 
-        <!-- Elements with data-pwConfigValue will have the class name based on  
+        &lt;!&ndash; Elements with data-pwConfigValue will have the class name based on
         the configuration property name and value. In this case the class name 
-        will be .paintweb_lineCap_butt -->
+        will be .paintweb_lineCap_butt &ndash;&gt;
         <div data-pwConfigValue="butt">Butt</div>
 
-        <!-- .paintweb_lineCap_square -->
+        &lt;!&ndash; .paintweb_lineCap_square &ndash;&gt;
         <div data-pwConfigValue="square">Square</div>
-        <!-- .paintweb_lineCap_round -->
+        &lt;!&ndash; .paintweb_lineCap_round &ndash;&gt;
         <div data-pwConfigValue="round">Round</div>
       </div>
 
-      <!-- .paintweb_cfg_line_lineJoin -->
+      &lt;!&ndash; .paintweb_cfg_line_lineJoin &ndash;&gt;
       <div data-pwConfig="line.lineJoin">
         <p>Line join</p>
 
-        <!-- .paintweb_lineJoin_miter -->
+        &lt;!&ndash; .paintweb_lineJoin_miter &ndash;&gt;
         <div data-pwConfigValue="miter">Miter</div>
-        <!-- .paintweb_lineJoin_round -->
+        &lt;!&ndash; .paintweb_lineJoin_round &ndash;&gt;
         <div data-pwConfigValue="round">Round</div>
-        <!-- .paintweb_lineJoin_bevel -->
+        &lt;!&ndash; .paintweb_lineJoin_bevel &ndash;&gt;
         <div data-pwConfigValue="bevel">Bevel</div>
       </div>
 
-      <!-- .paintweb_cfg_shapeType -->
+      &lt;!&ndash; .paintweb_cfg_shapeType &ndash;&gt;
       <div data-pwConfig="shapeType">
         <p>Shape type</p>
 
-        <!-- .paintweb_shapeType_both -->
+        &lt;!&ndash; .paintweb_shapeType_both &ndash;&gt;
         <div data-pwConfigValue="both">Both</div>
-        <!-- .paintweb_shapeType_fill -->
+        &lt;!&ndash; .paintweb_shapeType_fill &ndash;&gt;
         <div data-pwConfigValue="fill">Fill</div>
-        <!-- .paintweb_shapeType_stroke -->
+        &lt;!&ndash; .paintweb_shapeType_stroke &ndash;&gt;
         <div data-pwConfigValue="stroke">Stroke</div>
       </div>
 
-      <!-- erm *cough* elements with data-pwConfigValue will be considered icons 
+      &lt;!&ndash; erm *cough* elements with data-pwConfigValue will be considered icons
       (class name .paintweb_icon is added). They will also have an anchor 
-      element appended.  -->
+      element appended.  &ndash;&gt;
     </div>
+-->
 
     <!-- .paintweb_main_selection -->
     <div data-pwTab="selection" data-pwTabHide="true">
@@ -160,6 +166,7 @@
     </div>
 
     <!-- .paintweb_main_text -->
+<!-- FIXME : text 툴 사용시
     <div data-pwTab="text" data-pwTabHide="true" class="paintweb_tab02">
       <p class="paintweb_opt_fontFamily">
         <label for="fontFamily">Font family:</label>
@@ -181,8 +188,10 @@
         <div data-pwConfigButton="text.right">Right</div>
       </div>
     </div>
+-->
 
     <!-- .paintweb_main_shadow -->
+<!-- FIXME : shadow 툴 사용시
     <div data-pwTab="shadow">
       <p class="paintweb_opt_shadowEnable"><label><input 
         data-pwConfig="shadow.enable" type="checkbox" value="1" /> Draw 
@@ -211,6 +220,7 @@
         </label>
       </p>
     </div>
+-->
 
    <!-- <p data-pwCommand="about">About</p>-->
 

src/main/webapp/resources/3rd-party/paintweb/interfaces/default/style.css

@@ -144,6 +144,9 @@
   background: #fff;
   color: #000
 }
+.paintweb_main_main{
+  display: flex;
+}
 
 .paintweb_tools {
   border-left: 1px solid #d6d6d6;
@@ -151,8 +154,6 @@
   list-style: none;
   margin: 0;
   padding: 0;
-  /*width: 416px;*/
-  width:100%;
   display: flex;
   border:0px solid blue;
 }
@@ -195,6 +196,7 @@
   white-space: nowrap
 }
 
+.paintweb_strokeFillStyles:hover, .paintweb_strokeFillStyles:focus,
 .paintweb_tool:hover, .paintweb_tool:focus,
 .paintweb_command:hover, .paintweb_command:focus,
 .paintweb_icon:hover, .paintweb_icon:focus { background: #fff }
@@ -735,40 +737,34 @@
 .paintweb_strokeFillStyles {
   /*background: url("images/toolbar-colors.png") no-repeat;*/
   /*font-size: 0.9em;*/
-  height: 67px;
+
   /*left: 297px;*/
-  right: 337px;
+  /*right: 337px;
-  position: absolute;
+  height: 67px;
-  top: -8px;
+  position: absolute;*/
-  width: 69px
+
+  width: 40px
 }
 
 .paintweb_opt_fillStyle {
-  height: 51px;
+  margin: 0 0 0 4px;
-  margin: 2px 0 0 13px;
   padding: 0
 }
 
 .paintweb_opt_strokeStyle {
-  margin: 0;
+  margin: -10px 0 0 14px;
-  padding: 0 11px 0 0;
+  padding: 0 0 0 0;
   text-align: right
 }
 
 .paintweb_fillStyle {
   height: 18px;
-  left: 23px;
-  position: absolute;
-  top: 20px;
   width: 18px;
 }
 
 .paintweb_strokeStyle {
-  bottom: 18px;
   height: 18px;
-  position: absolute;
+  width: 18px;
-  right: 15px;
-  width: 18px
 }
 
 .paintweb_floatingPanel_colormixer .paintweb_tabsList {

src/main/webapp/resources/3rd-party/paintweb/paintweb-config.json

@@ -214,7 +214,7 @@
    */
   /*FIXME: 항목수정*/
   /*"tools": ["bcurve", "cbucket", "cpicker", "ellipse", "eraser", "hand", "insertimg", "line", "pencil", "polygon", "rectangle", "selection", "text"],*/
-  "tools": ["hand", "insertimg", "rectangle", "selection", "text"],
+  "tools": ["hand", "rectangle", "selection"],
 
 
   /**