From 79b442d71a3071e506e05139efdc0b8e2414d41a Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 12 Dec 2018 17:55:24 +0800
Subject: [PATCH]  * adjust for task #5152.

---
 module/doc/view/x.create.html.php  |   5 +-
 module/todo/css/create.css         |   1 -
 module/todo/view/create.html.php   |   7 --
 module/todo/view/footer.html.php   |   4 -
 module/todo/view/x.create.html.php | 149 +++++++++++++++++++++++++++++
 5 files changed, 150 insertions(+), 16 deletions(-)
 create mode 100644 module/todo/view/x.create.html.php

diff --git a/module/doc/view/x.create.html.php b/module/doc/view/x.create.html.php
index 8284474f26..4473d3eaf4 100644
--- a/module/doc/view/x.create.html.php
+++ b/module/doc/view/x.create.html.php
@@ -13,13 +13,11 @@
 <?php include '../../common/view/header.lite.html.php';?>
 <?php include '../../common/view/ueditor.html.php';?>
 <?php include '../../common/view/markdown.html.php';?>
+<style>body{padding:0px;}</style>
 <?php js::set('holders', $lang->doc->placeholder);?>
 <?php js::set('type', 'doc');?>
 <div id="mainContent" class="main-content">
   <div class='center-block'>
-    <div class='main-header'>
-      <h2><?php echo $lang->doc->create;?></h2>
-    </div>
     <form class="load-indicator main-form form-ajax" id="dataform" method='post' enctype='multipart/form-data'>
       <table class='table table-form'> 
         <tbody>
@@ -90,7 +88,6 @@
   </div>
 </div>
 <script>
-$('body').addClass('body-modal');
 window.injectWithXXC = function(message)
 {
     $('#title').val(message.content);
diff --git a/module/todo/css/create.css b/module/todo/css/create.css
index d7b7e89962..2a9a6facd0 100644
--- a/module/todo/css/create.css
+++ b/module/todo/css/create.css
@@ -3,4 +3,3 @@
 #end_chosen .chosen-single{border-left: none;}
 .cycleConfig .checkbox-primary{float:left; width:100px;}
 .cycleConfig .tab-pane{padding:8px 0px;}
-.body-modal .btn-back{display:none;}
diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php
index 973e0ff09f..1e4310beba 100644
--- a/module/todo/view/create.html.php
+++ b/module/todo/view/create.html.php
@@ -10,11 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php if($this->app->viewType == 'xhtml'):?>
-<?php include '../../common/view/header.lite.html.php';?>
-<?php else:?>
 <?php include '../../common/view/header.html.php';?>
-<?php endif;?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('noTodo', $lang->todo->noTodo);?>
@@ -148,8 +144,5 @@
 var nowTime = '<?php echo $time?>';
 var today   = '<?php echo date('Y-m-d')?>';
 var start   = '<?php echo key($times)?>';
-<?php if($this->app->viewType == 'xhtml'):?>
-$('body').addClass('body-modal');
-<?php endif;?>
 </script>
 <?php include './footer.html.php';?>
diff --git a/module/todo/view/footer.html.php b/module/todo/view/footer.html.php
index ff60a8372c..f82d350974 100644
--- a/module/todo/view/footer.html.php
+++ b/module/todo/view/footer.html.php
@@ -1,6 +1,2 @@
 <?php js::set('account', $app->user->account)?>
-<?php if($this->app->viewType == 'xhtml'):?>
-<?php include '../../common/view/footer.lite.html.php';?>
-<?php else:?>
 <?php include '../../common/view/footer.html.php';?>
-<?php endif;?>
diff --git a/module/todo/view/x.create.html.php b/module/todo/view/x.create.html.php
new file mode 100644
index 0000000000..05aab6dd76
--- /dev/null
+++ b/module/todo/view/x.create.html.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * The create view of todo module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     todo
+ * @version     $Id: create.html.php 4728 2013-05-03 06:14:34Z chencongzhi520@gmail.com $
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include '../../common/view/header.lite.html.php';?>
+<?php include '../../common/view/datepicker.html.php';?>
+<?php include '../../common/view/kindeditor.html.php';?>
+<style>
+body{padding:0px;}
+</style>
+<?php js::set('noTodo', $lang->todo->noTodo);?>
+<div id='mainContent' class='main-content'>
+  <div class='center-block'>
+    <form method='post' target='hiddenwin' id='dataform'>
+      <table class='table table-form'> 
+        <tr>
+          <th class='w-80px'><?php echo $lang->todo->date;?></th>
+          <td class='w-300px'>
+            <div class='input-group'>
+              <?php echo html::input('date', $date, "class='form-control form-date'");?>
+              <span class='input-group-addon switchDate'>
+                <div class='checkbox-primary'>
+                  <input type='checkbox' id='switchDate' onclick='switchDateTodo(this);' />
+                  <label for='switchDate'><?php echo $lang->todo->periods['future'];?></label>
+                </div>
+              </span>
+              <span class='input-group-addon'>
+                <div class='checkbox-primary'>
+                  <input type='checkbox' id='cycle' name='cycle' value='1' />
+                  <label for='cycle'><?php echo $lang->todo->cycle;?></label>
+                </div>
+              </span>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr class='cycleConfig hidden'>
+          <th><?php echo $lang->todo->cycleConfig;?></th>
+          <td colspan='2'>
+            <ul class="nav nav-tabs">
+            <li class="active"><a data-tab data-type='day' href="#day"><?php echo $lang->todo->cycleDay;?></a></li>
+              <li><a data-tab data-type='week' href="#week"><?php echo $lang->todo->cycleWeek;?></a></li>
+              <li><a data-tab data-type='month' href="#month"><?php echo $lang->todo->cycleMonth;?></a></li>
+            </ul>
+            <div class="tab-content">
+              <div class="tab-pane active" id="day">
+                <div class='input-group w-150px'>
+                  <span class='input-group-addon'><?php echo $lang->todo->every;?></span>
+                  <?php echo html::input('config[day]', 1, "class='form-control'")?>
+                  <span class='input-group-addon'><?php echo $lang->todo->cycleDay;?></span>
+                </div>
+              </div>
+              <div class="tab-pane clearfix" id="week">
+                <?php echo html::checkbox('config[week]', $lang->todo->dayNames)?>
+              </div>
+              <div class="tab-pane clearfix" id="month">
+                <?php
+                $days = array();
+                for($i = 1; $i <= 10; $i ++) $days[$i] = $i;
+                echo html::checkbox('config[month]', $days);
+                $days = array();
+                for($i = 11; $i <= 20; $i ++) $days[$i] = $i;
+                echo html::checkbox('config[month]', $days);
+                $days = array();
+                for($i = 21; $i <= 31; $i ++) $days[$i] = $i;
+                echo html::checkbox('config[month]', $days);
+                ?>
+              </div>
+            </div>
+            <?php echo html::hidden('config[type]', 'day')?>
+            <div class='input-group' style='width:200px; padding-top:5px;'>
+            <?php printf($lang->todo->beforeDays, html::input('config[beforeDays]', 0, "class='form-control'"));?>
+            </div>
+          </td>
+        </tr>  
+        <tr class='cycleConfig hidden'>
+          <th><?php echo $lang->todo->deadline;?></th>
+          <td><?php echo html::input("config[end]", '', "class='form-control form-date'");?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->todo->type;?></th>
+          <td><?php echo html::select('type', $lang->todo->typeList, '', 'onchange="loadList(this.value);" class="form-control"');?></td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->todo->pri;?></th>
+          <td><?php echo html::select('pri', $lang->todo->priList, '', "class='form-control'");?></td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->todo->name;?></th>
+          <td colspan='2'>
+            <div id='nameBox' class='hidden'><?php echo html::input('name', '', "class='form-control' autocomplete='off'");?></div>
+            <div class='nameBox required'><?php echo html::input('name', '', "class='form-control' autocomplete='off'");?></div>
+          </td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->todo->desc;?></th>
+          <td colspan='2'><?php echo html::textarea('desc', '', "rows='8' class='form-control'");?></td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->todo->status;?></th>
+          <td><?php echo html::select('status', $lang->todo->statusList, '', "class='form-control chosen'");?></td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->todo->beginAndEnd;?></th>
+          <td>
+            <div class='input-group'>
+              <?php echo html::select('begin', $times, date('Y-m-d') != $date ? key($times) : $time, 'onchange=selectNext(); class="form-control chosen" style="width: 50%;"') . html::select('end', $times, '', 'class="form-control chosen" style="width: 50%; margin-left:-1px"');?>
+            </div>
+          </td>
+          <td>
+            <div class='checkbox-primary'>
+              <input type='checkbox' id='switchDate' onclick='switchDateFeature(this);' />
+              <label for='switchDate'><?php echo $lang->todo->lblDisableDate;?></label>
+            </div>
+          </td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->todo->private;?></th>
+          <td>
+            <div class='checkbox-primary'>
+              <input type='checkbox' name='private' id='private' value='1' />
+              <label for='private'></label>
+            </div>
+          </td>
+        </tr>  
+        <tr>
+          <td colspan='3' class='text-center form-actions'>
+            <?php echo html::submitButton();?>
+          </td>
+        </tr>
+      </table>
+    </form>
+  </div>
+</div>
+
+<?php js::set('account', $app->user->account)?>
+<script>
+var nowTime = '<?php echo $time?>';
+var today   = '<?php echo date('Y-m-d')?>';
+var start   = '<?php echo key($times)?>';
+</script>
+<?php include '../../common/view/footer.lite.html.php';?>