Przeglądaj źródła

refactoring update web templates

Serghey Rodin 9 lat temu
rodzic
commit
ffec2e7e2d

+ 47 - 1
web/js/templates.js

@@ -94,7 +94,6 @@ App.Templates.html = {
                         </div>'],
         popup_rename: ['<div class="confirm-box rename warning">\
                             <div class="message">'+App.Constants.FM_RENAME+': <span class="title">"~!:FILENAME~!"</span></div>\
-                            <!-- div class="warning">'+App.Constants.FM_FILE+' <span class="title">"reading.txt"</span> '+App.Constants.FM_ALREADY_EXISTS+'</div -->\
                             <div class="warning warning-message"></div>\
                             <div class="actions">\
                                 <input type="text" id="rename-title" class="new-title"  value="~!:NEW_NAME~!" />\
@@ -109,6 +108,53 @@ App.Templates.html = {
                             </div>\
                         </div>'],
 
+        popup_chmod: ['<div class="confirm-box chmod warning">\
+                            <div class="message">'+App.Constants.FM_CHMOD+': <span class="title">"~!:FILENAME~!"</span></div>\
+                            <div class="warning warning-message"></div>\
+                            <div class="actions">\
+                                <ul>\
+                                    <li><label><input type="checkbox" name="read-by-owner" value="1" ~!:READ_BY_OWNER~! /> '+App.Constants.FM_READ_BY_OWNER+'</label></li>\
+                                    <li><label><input type="checkbox" name="write-by-owner" value="1" ~!:WRITE_BY_OWNER~! /> '+App.Constants.FM_WRITE_BY_OWNER+'</label></li>\
+                                    <li><label><input type="checkbox" name="execute-by-owner" value="1" ~!:EXECUTE_BY_OWNER~! /> '+App.Constants.FM_EXECUTE_BY_OWNER+'</label></li>\
+                                </ul><ul>\
+                                    <li><label><input type="checkbox" name="read-by-group" value="1" ~!:READ_BY_GROUP~! /> '+App.Constants.FM_READ_BY_GROUP+'</label></li>\
+                                    <li><label><input type="checkbox" name="write-by-group" value="1" ~!:WRITE_BY_GROUP~! /> '+App.Constants.FM_WRITE_BY_GROUP+'</label></li>\
+                                    <li><label><input type="checkbox" name="execute-by-group" value="1" ~!:EXECUTE_BY_GROUP~! /> '+App.Constants.FM_EXECUTE_BY_GROUP+'</label></li>\
+                                </ul><ul>\
+                                    <li><label><input type="checkbox" name="read-by-others" value="1" ~!:READ_BY_OTHERS~! /> '+App.Constants.FM_READ_BY_OTHERS+'</label></li>\
+                                    <li><label><input type="checkbox" name="write-by-others" value="1" ~!:WRITE_BY_OTHERS~! /> '+App.Constants.FM_WRITE_BY_OTHERS+'</label></li>\
+                                    <li><label><input type="checkbox" name="execute-by-others" value="1" ~!:EXECUTE_BY_OTHERS~! /> '+App.Constants.FM_EXECUTE_BY_OTHERS+'</label></li>\
+                                </ul>\
+                            </div>\
+                            <div class="controls">\
+                                <p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
+                                <p class="ok" onClick="FM.confirmChmod();">'+App.Constants.FM_OK+'</p>\
+                            </div>\
+                        </div>'],
+        popup_bulk_chmod: ['<div class="confirm-box chmod warning">\
+                            <div class="message">'+App.Constants.FM_CHMOD+' (~!:NUMBER_OF_ITEMS~!)</div>\
+                            <div class="warning warning-message"></div>\
+                            <div class="actions">\
+                                <ul>\
+                                    <li><label><input type="checkbox" name="read-by-owner" value="1" checked /> '+App.Constants.FM_READ_BY_OWNER+'</label></li>\
+                                    <li><label><input type="checkbox" name="write-by-owner" value="1" checked /> '+App.Constants.FM_WRITE_BY_OWNER+'</label></li>\
+                                    <li><label><input type="checkbox" name="execute-by-owner" value="1" checked /> '+App.Constants.FM_EXECUTE_BY_OWNER+'</label></li>\
+                                </ul><ul>\
+                                    <li><label><input type="checkbox" name="read-by-group" value="1" checked /> '+App.Constants.FM_READ_BY_GROUP+'</label></li>\
+                                    <li><label><input type="checkbox" name="write-by-group" value="1" checked /> '+App.Constants.FM_WRITE_BY_GROUP+'</label></li>\
+                                    <li><label><input type="checkbox" name="execute-by-group" value="1" checked /> '+App.Constants.FM_EXECUTE_BY_GROUP+'</label></li>\
+                                </ul><ul>\
+                                    <li><label><input type="checkbox" name="read-by-others" value="1" checked /> '+App.Constants.FM_READ_BY_OTHERS+'</label></li>\
+                                    <li><label><input type="checkbox" name="write-by-others" value="1" checked /> '+App.Constants.FM_WRITE_BY_OTHERS+'</label></li>\
+                                    <li><label><input type="checkbox" name="execute-by-others" value="1" checked /> '+App.Constants.FM_EXECUTE_BY_OTHERS+'</label></li>\
+                                </ul>\
+                            </div>\
+                            <div class="controls">\
+                                <p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
+                                <p class="ok" onClick="FM.confirmBulkChmod();">'+App.Constants.FM_OK+'</p>\
+                            </div>\
+                        </div>'],
+
         popup_pack: ['<div class="confirm-box pack warning">\
                             <div class="message">'+App.Constants.FM_PACK+' <span class="title">"~!:FILENAME~!"</span></div>\
                             <div class="actions">\

+ 354 - 15
web/templates/admin/add_cron.html

@@ -29,6 +29,328 @@
             $back = "location.href='".$back."'";
           }
         ?>
+
+                                <div class="vst-text step-top helper-container">
+                                    <div id="tabs"  class="cron-helper-tabs">
+                                      <ul>
+                                        <li><a href="#tabs-1"><?=__('Minutes')?></a></li>
+                                        <li><a href="#tabs-2"><?=__('Hourly')?></a></li>
+                                        <li><a href="#tabs-3"><?=__('Daily')?></a></li>
+                                        <li><a href="#tabs-4"><?=__('Weekly')?></a></li>
+                                        <li><a href="#tabs-5"><?=__('Monthly')?></a></li>
+                                      </ul>
+                                      <div id="tabs-1">
+                                        <form>
+                                            <input type="hidden" name="h_hour" value="*" />
+                                            <input type="hidden" name="h_day" value="*" />
+                                            <input type="hidden" name="h_month" value="*" />
+                                            <input type="hidden" name="h_wday" value="*" />
+                                            <p><span class="first"><?=__('Run Command')?>:</span>
+                                                <select name="h_min" class="vst-list">
+                                                    <option value="*"  selected="selected"><?=__('every minute')?></option>
+                                                    <option value="*/2"><?=__('every two minutes')?></option>
+                                                    <option value="*/5"><?=__('every')?> 5</option>
+                                                    <option value="*/10"><?=__('every')?> 10</option>
+                                                    <option value="*/15"><?=__('every')?> 15</option>
+                                                    <option value="*/30"><?=__('every')?> 30</option>
+                                                </select>
+                                            </p>
+                                            <p class="step-top">
+                                                <input type="submit" value="<?=__('Generate')?>" class="button">
+                                            </p>
+                                        </form>
+                                      </div>
+
+
+                                      <div id="tabs-2">
+                                        <form>
+                                            <input type="hidden" name="h_day" value="*" />
+                                            <input type="hidden" name="h_month" value="*" />
+                                            <input type="hidden" name="h_wday" value="*" />
+                                            <p><span class="first"><?=__('Run Command')?>:</span>
+                                                <select name="h_hour" class="vst-list">
+                                                    <option value="*" selected="selected"><?=__('every hour')?></option>
+                                                    <option value="*/2"><?=__('every two hours')?></option>
+                                                    <option value="*/6"><?=__('every')?> 6</option>
+                                                    <option value="*/12"><?=__('every')?> 12</option>
+                                                </select>
+                                            </p>
+
+                                            <p><span class="first"><?=__('Minute')?>:</span>
+                                                <select name="h_min" class="vst-list short">
+                                                    <option value="0" selected="selected">00</option>
+                                                    <option value="15">15</option>
+                                                    <option value="30">30</option>
+                                                    <option value="45">45</option>
+                                                </select>
+                                            </p>
+
+                                            <p class="step-top">
+                                                <input type="submit" value="<?=__('Generate')?>" class="button">
+                                            </p>
+                                        </form>
+                                      </div>
+
+
+                                      <div id="tabs-3">
+                                        <form>
+                                            <input type="hidden" name="h_month" value="*" />
+                                            <input type="hidden" name="h_wday" value="*" />
+                                            <p><span class="first"><?=__('Run Command')?>:</span>
+                                                <select name="h_day" class="vst-list">
+                                                    <option value="*" selected="selected"><?=__('every day')?></option>
+                                                    <option value="1-31/2"><?=__('every odd day')?></option>
+                                                    <option value="*/2"><?=__('every even day')?></option>
+                                                    <option value="*/3"><?=__('every')?> 3</option>
+                                                    <option value="*/5"><?=__('every')?> 5</option>
+                                                    <option value="*/10"><?=__('every')?> 10</option>
+                                                    <option value="*/15"><?=__('every')?> 15</option>
+                                                </select>
+                                            </p>
+
+                                            <p><span class="first"><?=__('Hour')?>:</span>
+                                                <select name="h_hour" class="vst-list short">
+                                                    <option value="0">00</option>
+                                                    <option value="1">01</option>
+                                                    <option value="2">02</option>
+                                                    <option value="3">03</option>
+                                                    <option value="4">04</option>
+                                                    <option value="5">05</option>
+                                                    <option value="6">06</option>
+                                                    <option value="7">07</option>
+                                                    <option value="8">08</option>
+                                                    <option value="9">09</option>
+                                                    <option value="10">10</option>
+                                                    <option value="11">11</option>
+                                                    <option value="12"  selected="selected">12</option>
+                                                    <option value="13">13</option>
+                                                    <option value="14">14</option>
+                                                    <option value="15">15</option>
+                                                    <option value="16">16</option>
+                                                    <option value="17">17</option>
+                                                    <option value="18">18</option>
+                                                    <option value="19">19</option>
+                                                    <option value="20">20</option>
+                                                    <option value="21">21</option>
+                                                    <option value="22">22</option>
+                                                    <option value="23">23</option>
+                                                </select>
+
+                                                <span><?=__('Minute')?>:</span>
+                                                <select name="h_min" class="vst-list  short">
+                                                    <option value="0" selected="selected">00</option>
+                                                    <option value="1">01</option>
+                                                    <option value="2">02</option>
+                                                    <option value="5">05</option>
+                                                    <option value="10">10</option>
+                                                    <option value="15">15</option>
+                                                    <option value="20">20</option>
+                                                    <option value="25">25</option>
+                                                    <option value="30">30</option>
+                                                    <option value="35">35</option>
+                                                    <option value="40">40</option>
+                                                    <option value="45">45</option>
+                                                    <option value="50">50</option>
+                                                    <option value="55">55</option>
+                                                </select>
+                                            </p>
+                                            <p class="step-top">
+                                                <input type="submit" value="<?=__('Generate')?>" class="button">
+                                            </p>
+                                        </form>
+                                      </div>
+
+
+                                      <div id="tabs-4">
+                                        <form>
+                                            <input type="hidden" name="h_month" value="*" />
+                                            <input type="hidden" name="h_day" value="*" />
+
+                                            <p><span class="first"><?=__('Run Command')?>:</span>
+                                                <select name="h_wday" class="vst-list">
+                                                    <option value="*" selected="selected"><?=__('every day')?></option>
+                                                    <option value="1,2,3,4,5"><?=__('weekdays (5 days)')?></option>
+                                                    <option value="0,6"><?=__('weekend (2 days)')?></option>
+                                                    <option value="1"><?=__('Monday')?></option>
+                                                    <option value="2"><?=__('Tuesday')?></option>
+                                                    <option value="3"><?=__('Wednesday')?></option>
+                                                    <option value="4"><?=__('Thursday')?></option>
+                                                    <option value="5"><?=__('Friday')?></option>
+                                                    <option value="6"><?=__('Saturday')?></option>
+                                                    <option value="0"><?=__('Sunday')?></option>
+                                                </select>
+                                            </p>
+
+                                            <p><span class="first"><?=__('Hour')?>:</span>
+                                                <select name="h_hour" class="vst-list short">
+                                                    <option value="0">00</option>
+                                                    <option value="1">01</option>
+                                                    <option value="2">02</option>
+                                                    <option value="3">03</option>
+                                                    <option value="4">04</option>
+                                                    <option value="5">05</option>
+                                                    <option value="6">06</option>
+                                                    <option value="7">07</option>
+                                                    <option value="8">08</option>
+                                                    <option value="9">09</option>
+                                                    <option value="10">10</option>
+                                                    <option value="11">11</option>
+                                                    <option value="12"  selected="selected">12</option>
+                                                    <option value="13">13</option>
+                                                    <option value="14">14</option>
+                                                    <option value="15">15</option>
+                                                    <option value="16">16</option>
+                                                    <option value="17">17</option>
+                                                    <option value="18">18</option>
+                                                    <option value="19">19</option>
+                                                    <option value="20">20</option>
+                                                    <option value="21">21</option>
+                                                    <option value="22">22</option>
+                                                    <option value="23">23</option>
+                                                </select>
+
+                                                <span><?=__('Minute')?>:</span>
+                                                <select name="h_min" class="vst-list short">
+                                                    <option value="0" selected="selected">00</option>
+                                                    <option value="1">01</option>
+                                                    <option value="2">02</option>
+                                                    <option value="5">05</option>
+                                                    <option value="10">10</option>
+                                                    <option value="15">15</option>
+                                                    <option value="20">20</option>
+                                                    <option value="25">25</option>
+                                                    <option value="30">30</option>
+                                                    <option value="35">35</option>
+                                                    <option value="40">40</option>
+                                                    <option value="45">45</option>
+                                                    <option value="50">50</option>
+                                                    <option value="55">55</option>
+                                                </select>
+                                            </p>
+
+                                            <p class="step-top">
+                                                <input type="submit" value="<?=__('Generate')?>" class="button">
+                                            </p>
+                                        </form>
+                                      </div>
+
+
+                                      <div id="tabs-5">
+                                        <form>
+                                            <input type="hidden" name="h_wday" value="*" />
+
+                                            <p><span class="first"><?=__('Run Command')?>:</span>
+                                                <select name="h_month" class="vst-list">
+                                                    <option value="*" selected="selected"><?=__('every month')?></option>
+                                                    <option value="1-11/2"><?=__('every odd month')?></option>
+                                                    <option value="*/2"><?=__('every even month')?></option>
+                                                    <option value="*/3"><?=__('every')?> 3</option>
+                                                    <option value="*/6"><?=__('every')?> 6</option>
+                                                    <option value="1"><?=__('Jan')?></option>
+                                                    <option value="2"><?=__('Feb')?></option>
+                                                    <option value="3"><?=__('Mar')?></option>
+                                                    <option value="4"><?=__('Apr')?></option>
+                                                    <option value="5"><?=__('May')?></option>
+                                                    <option value="6"><?=__('Jun')?></option>
+                                                    <option value="7"><?=__('Jul')?></option>
+                                                    <option value="8"><?=__('Aug')?></option>
+                                                    <option value="9"><?=__('Sep')?></option>
+                                                    <option value="10"><?=__('Oct')?></option>
+                                                    <option value="11"><?=__('Nov')?></option>
+                                                    <option value="12"><?=__('Dec')?></option>
+                                                </select>
+                                            </p>
+
+                                            <p><span class="first"><?=__('Date')?>:</span>
+                                                <select name="h_day" class="vst-list short">
+                                                    <option value="1" selected="selected">1</option>
+                                                    <option value="2">2</option>
+                                                    <option value="3">3</option>
+                                                    <option value="4">4</option>
+                                                    <option value="5">5</option>
+                                                    <option value="6">6</option>
+                                                    <option value="7">7</option>
+                                                    <option value="8">8</option>
+                                                    <option value="9">9</option>
+                                                    <option value="10">10</option>
+                                                    <option value="11">11</option>
+                                                    <option value="12">12</option>
+                                                    <option value="13">13</option>
+                                                    <option value="14">14</option>
+                                                    <option value="15">15</option>
+                                                    <option value="16">16</option>
+                                                    <option value="17">17</option>
+                                                    <option value="18">18</option>
+                                                    <option value="19">19</option>
+                                                    <option value="20">20</option>
+                                                    <option value="21">21</option>
+                                                    <option value="22">22</option>
+                                                    <option value="23">23</option>
+                                                    <option value="24">24</option>
+                                                    <option value="25">25</option>
+                                                    <option value="26">26</option>
+                                                    <option value="27">27</option>
+                                                    <option value="28">28</option>
+                                                    <option value="29">29</option>
+                                                    <option value="30">30</option>
+                                                    <option value="31">31</option>
+                                                </select>
+
+                                                <span><?=__('Hour')?>:</span>
+                                                <select name="h_hour" class="vst-list short">
+                                                    <option value="0">00</option>
+                                                    <option value="1">01</option>
+                                                    <option value="2">02</option>
+                                                    <option value="3">03</option>
+                                                    <option value="4">04</option>
+                                                    <option value="5">05</option>
+                                                    <option value="6">06</option>
+                                                    <option value="7">07</option>
+                                                    <option value="8">08</option>
+                                                    <option value="9">09</option>
+                                                    <option value="10">10</option>
+                                                    <option value="11">11</option>
+                                                    <option value="12"  selected="selected">12</option>
+                                                    <option value="13">13</option>
+                                                    <option value="14">14</option>
+                                                    <option value="15">15</option>
+                                                    <option value="16">16</option>
+                                                    <option value="17">17</option>
+                                                    <option value="18">18</option>
+                                                    <option value="19">19</option>
+                                                    <option value="20">20</option>
+                                                    <option value="21">21</option>
+                                                    <option value="22">22</option>
+                                                    <option value="23">23</option>
+                                                </select>
+
+                                                <span><?=__('Minute')?>:</span>
+                                                <select name="h_min" class="vst-list short">
+                                                    <option value="0" selected="selected">00</option>
+                                                    <option value="1">01</option>
+                                                    <option value="2">02</option>
+                                                    <option value="5">05</option>
+                                                    <option value="10">10</option>
+                                                    <option value="15">15</option>
+                                                    <option value="20">20</option>
+                                                    <option value="25">25</option>
+                                                    <option value="30">30</option>
+                                                    <option value="35">35</option>
+                                                    <option value="40">40</option>
+                                                    <option value="45">45</option>
+                                                    <option value="50">50</option>
+                                                    <option value="55">55</option>
+                                                </select>
+                                            </p>
+
+                                            <p class="step-top">
+                                                <input type="submit" value="<?=__('Generate')?>" class="button">
+                                            </p>
+                                        </form>
+                                      </div>
+                                    </div>
+                                </div>
+
         <form id="vstobjects" name="v_add_cron" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="ok" value="Add" />
@@ -42,63 +364,63 @@
                     <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text step-top">
-                                    <?php print __('Minute');?>
+                                <td class="vst-text input-label">
+                                    <?php print __('Command');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_min" <?php if (!empty($v_min)) echo "value=".htmlentities($v_min); ?>>
+                                    <input type="text" size="30" class="vst-input long" name="v_cmd" <?php if (!empty($v_cmd)) echo "value=".htmlentities($v_cmd).""; ?>>
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text input-label">
-                                    <?php print __('Hour');?>
+                                <td class="vst-text step-top">
+                                    <?php print __('Minute');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_hour" <?php if (!empty($v_hour)) echo "value=".htmlentities($v_hour); ?>>
+                                    <input type="text" size="20" class="vst-input short" name="v_min" <?php if (!empty($v_min)) echo "value=".htmlentities($v_min); ?>>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Day');?>
+                                    <?php print __('Hour');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_day" <?php if (!empty($v_day)) echo "value=".htmlentities($v_day); ?>>
+                                    <input type="text" size="20" class="vst-input short" name="v_hour" <?php if (!empty($v_hour)) echo "value=".htmlentities($v_hour); ?>>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Month');?>
+                                    <?php print __('Day');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_month" <?php if (!empty($v_month)) echo "value=".htmlentities($v_month); ?>>
+                                    <input type="text" size="20" class="vst-input short" name="v_day" <?php if (!empty($v_day)) echo "value=".htmlentities($v_day); ?>>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Day of week');?>
+                                    <?php print __('Month');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_wday" <?php if (!empty($v_wday)) echo "value=".htmlentities($v_wday); ?>>
+                                    <input type="text" size="20" class="vst-input short" name="v_month" <?php if (!empty($v_month)) echo "value=".htmlentities($v_month); ?>>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Command');?>
+                                    <?php print __('Day of week');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="30" class="vst-input long" name="v_cmd" <?php if (!empty($v_cmd)) echo "value=".htmlentities($v_cmd).""; ?>>
+                                    <input type="text" size="20" class="vst-input short" name="v_wday" <?php if (!empty($v_wday)) echo "value=".htmlentities($v_wday); ?>>
                                 </td>
                             </tr>
                         </table>
@@ -116,4 +438,21 @@
                 </tr>
             </table>
         </form>
-    </div>
+    </div>
+<script>
+  $(function() {
+    $( "#tabs" ).tabs();
+    $('.context-helper').click(function(){ $('#tabs').toggle(); $('.context-helper').toggle();  });
+    $('.context-helper-close').click(function(){ $('#tabs').toggle(); $('.context-helper').toggle(); });
+
+    $('.helper-container form').submit(function(){
+      $('#vstobjects input[name=v_min]').val($(this).find(':input[name=h_min]').val()).effect('highlight');
+      $('#vstobjects input[name=v_hour]').val($(this).find(':input[name=h_hour]').val()).effect('highlight');
+      $('#vstobjects input[name=v_day]').val($(this).find(':input[name=h_day]').val()).effect('highlight');
+      $('#vstobjects input[name=v_month]').val($(this).find(':input[name=h_month]').val()).effect('highlight');
+      $('#vstobjects input[name=v_wday]').val($(this).find(':input[name=h_wday]').val()).effect('highlight');
+
+      return false;
+    })
+  });
+</script>

+ 2 - 2
web/templates/admin/add_firewall_banlist.html

@@ -72,7 +72,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('IP address');?> <span class="optional">(<?php print __('CIDR format is supported');?>)</span>
+                                    <?php print __('IP address');?> <span class="optional">(<?php print __('CDIR format is supported');?>)</span>
                                 </td>
                             </tr>
                             <tr>
@@ -95,4 +95,4 @@
                 </tr>
             </table>
         </from>
-      </div>
+      </div>

+ 10 - 10
web/templates/admin/add_package.html

@@ -302,20 +302,20 @@
                             <tr>
                                 <td>
                                     <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".htmlentities($v_ns1); ?>>
-                                    <span class="remove-ns additional-control delete"><?= __('delete') ?></span>
+                                    <span class="remove-ns additional-control delete">delete</span>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
                                     <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".htmlentities($v_ns2); ?>>
-                                    <span class="remove-ns additional-control delete"><?= __('delete') ?></span>
+                                    <span class="remove-ns additional-control delete">delete</span>
                                 </td>
                             </tr>
                             <?  if($v_ns3)
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns3" value="'.htmlentities($v_ns3).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        <span class="remove-ns additional-control delete">delete</span>
                                     </td>
                                 </tr>';
 
@@ -323,7 +323,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns4" value="'.htmlentities($v_ns4).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        <span class="remove-ns additional-control delete">delete</span>
                                     </td>
                                 </tr>';
 
@@ -331,7 +331,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns5" value="'.htmlentities($v_ns5).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        <span class="remove-ns additional-control delete">delete</span>
                                     </td>
                                 </tr>';
 
@@ -339,7 +339,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns6" value="'.htmlentities($v_ns6).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        <span class="remove-ns additional-control delete">delete</span>
                                     </td>
                                 </tr>';
 
@@ -347,7 +347,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns7" value="'.htmlentities($v_ns7).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        <span class="remove-ns additional-control delete">delete</span>
                                     </td>
                                 </tr>';
 
@@ -355,13 +355,13 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns8" value="'.htmlentities($v_ns8).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        <span class="remove-ns additional-control delete">delete</span>
                                     </td>
                                 </tr>';
                             ?>
                                 <tr class="add-ns" <? if($v_ns8) echo 'style="display:none;"'; ?> >
                                     <td class="step-top-small">
-                                      <span class="add-ns-button additional-control add"><?= __('Add one more Name Server') ?></span>
+                                      <span class="add-ns-button additional-control add">Add one more Name Server</span>
                                     </td>
                                 </tr>
                         </table>
@@ -410,4 +410,4 @@
                 })
 
             });
-        </script>
+        </script>

+ 0 - 20
web/templates/admin/edit_backup_exclusions.html

@@ -55,16 +55,6 @@
                                     <textarea class="vst-textinput" name="v_web" placeholder="<?php echo __('WEB_EXCLUSIONS') ?>"><?php if (isset($v_web)) echo htmlentities($v_web); ?></textarea>
                                 </td>
                             </tr>
-                            <tr>
-                                <td class="vst-text input-label">
-                                    <?php print __('DNS Domains');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <textarea class="vst-textinput" name="v_dns" placeholder="<?php echo __('DNS_EXCLUSIONS') ?>"><?php if (isset($v_dns)) echo htmlentities($v_dns); ?></textarea>
-                                </td>
-                            </tr>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Mail Domains');?>
@@ -85,16 +75,6 @@
                                     <textarea class="vst-textinput" name="v_db" placeholder="<?php echo __('DB_EXCLUSIONS') ?>"><?php if (isset($v_db)) echo htmlentities($v_db); ?></textarea>
                                 </td>
                             </tr>
-                            <tr>
-                                <td class="vst-text input-label">
-                                    <?php print __('Cron Jobs');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <textarea size="20" class="vst-textinput" name="v_cron" placeholder="<?php echo __('CRON_EXCLUSIONS') ?>"><?php if (isset($v_cron)) echo htmlentities($v_cron); ?></textarea>
-                                </td>
-                            </tr>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('User Directories');?>

+ 369 - 14
web/templates/admin/edit_cron.html

@@ -29,6 +29,326 @@
           $back = "location.href='".$back."'";
         }
       ?>
+
+                                <div class="vst-text step-top helper-container">
+                                    <div id="tabs"  class="cron-helper-tabs">
+                                      <ul>      
+                                        <li><a href="#tabs-1"><?=__('Minutes')?></a></li>
+                                        <li><a href="#tabs-2"><?=__('Hourly')?></a></li>
+                                        <li><a href="#tabs-3"><?=__('Daily')?></a></li>
+                                        <li><a href="#tabs-4"><?=__('Weekly')?></a></li>
+                                        <li><a href="#tabs-5"><?=__('Monthly')?></a></li>
+                                      </ul>
+                                      <div id="tabs-1">
+                                        <form>
+                                            <input type="hidden" name="h_hour" value="*" />
+                                            <input type="hidden" name="h_day" value="*" />
+                                            <input type="hidden" name="h_month" value="*" />
+                                            <input type="hidden" name="h_wday" value="*" />
+                                            <p><span class="first"><?=__('Run Command')?>:</span>
+                                                <select name="h_min" class="vst-list">
+                                                    <option value="*"  selected="selected"><?=__('every minute')?></option>
+                                                    <option value="*/2"><?=__('every two minutes')?></option>
+                                                    <option value="*/5"><?=__('every')?> 5</option>
+                                                    <option value="*/10"><?=__('every')?> 10</option>
+                                                    <option value="*/15"><?=__('every')?> 15</option>
+                                                    <option value="*/30"><?=__('every')?> 30</option>
+                                                </select>
+                                            </p>
+                                            <p class="step-top">
+                                                <input type="submit" value="<?=__('Generate')?>" class="button">
+                                            </p>
+                                        </form>
+                                      </div>
+
+
+                                      <div id="tabs-2">
+                                        <form>
+                                            <input type="hidden" name="h_day" value="*" />
+                                            <input type="hidden" name="h_month" value="*" />
+                                            <input type="hidden" name="h_wday" value="*" />
+                                            <p><span class="first"><?=__('Run Command')?>:</span>
+                                                <select name="h_hour" class="vst-list">
+                                                    <option value="*" selected="selected"><?=__('every hour')?></option>
+                                                    <option value="*/2"><?=__('every two hours')?></option>
+                                                    <option value="*/6"><?=__('every')?> 6</option>
+                                                    <option value="*/12"><?=__('every')?> 12</option>
+                                                </select>
+                                            </p>
+
+                                            <p><span class="first"><?=__('Minute')?>:</span>
+                                                <select name="h_min" class="vst-list short">
+                                                    <option value="0" selected="selected">00</option>
+                                                    <option value="15">15</option>
+                                                    <option value="30">30</option>
+                                                    <option value="45">45</option>
+                                                </select>
+                                            </p>
+
+                                            <p class="step-top">
+                                                <input type="submit" value="<?=__('Generate')?>" class="button">
+                                            </p>
+                                        </form>
+                                      </div>
+
+
+                                      <div id="tabs-3">
+                                        <form>
+                                            <input type="hidden" name="h_month" value="*" />
+                                            <input type="hidden" name="h_wday" value="*" />
+                                            <p><span class="first"><?=__('Run Command')?>:</span>
+                                                <select name="h_day" class="vst-list">
+                                                    <option value="*" selected="selected"><?=__('every day')?></option>
+                                                    <option value="1-31/2"><?=__('every odd day')?></option>
+                                                    <option value="*/2"><?=__('every even day')?></option>
+                                                    <option value="*/3"><?=__('every')?> 3</option>
+                                                    <option value="*/5"><?=__('every')?> 5</option>
+                                                    <option value="*/10"><?=__('every')?> 10</option>
+                                                    <option value="*/15"><?=__('every')?> 15</option>
+                                                </select>
+                                            </p>
+
+                                            <p><span class="first"><?=__('Hour')?>:</span>
+                                                <select name="h_hour" class="vst-list short">
+                                                    <option value="0">00</option>
+                                                    <option value="1">01</option>
+                                                    <option value="2">02</option>
+                                                    <option value="3">03</option>
+                                                    <option value="4">04</option>
+                                                    <option value="5">05</option>
+                                                    <option value="6">06</option>
+                                                    <option value="7">07</option>
+                                                    <option value="8">08</option>
+                                                    <option value="9">09</option>
+                                                    <option value="10">10</option>
+                                                    <option value="11">11</option>
+                                                    <option value="12"  selected="selected">12</option>
+                                                    <option value="13">13</option>
+                                                    <option value="14">14</option>
+                                                    <option value="15">15</option>
+                                                    <option value="16">16</option>
+                                                    <option value="17">17</option>
+                                                    <option value="18">18</option>
+                                                    <option value="19">19</option>
+                                                    <option value="20">20</option>
+                                                    <option value="21">21</option>
+                                                    <option value="22">22</option>
+                                                    <option value="23">23</option>
+                                                </select>
+
+                                                <span><?=__('Minute')?>:</span>
+                                                <select name="h_min" class="vst-list  short">
+                                                    <option value="0" selected="selected">00</option>
+                                                    <option value="1">01</option>
+                                                    <option value="2">02</option>
+                                                    <option value="5">05</option>
+                                                    <option value="10">10</option>
+                                                    <option value="15">15</option>
+                                                    <option value="20">20</option>
+                                                    <option value="25">25</option>
+                                                    <option value="30">30</option>
+                                                    <option value="35">35</option>
+                                                    <option value="40">40</option>
+                                                    <option value="45">45</option>
+                                                    <option value="50">50</option>
+                                                    <option value="55">55</option>
+                                                </select>
+                                            </p>
+                                            <p class="step-top">
+                                                <input type="submit" value="<?=__('Generate')?>" class="button">
+                                            </p>
+                                        </form>
+                                      </div>
+
+                                      <div id="tabs-4">
+                                        <form>
+                                            <input type="hidden" name="h_month" value="*" />
+                                            <input type="hidden" name="h_day" value="*" />
+
+                                            <p><span class="first"><?=__('Run Command')?>:</span>
+                                                <select name="h_wday" class="vst-list">
+                                                    <option value="*" selected="selected"><?=__('every day')?></option>
+                                                    <option value="1,2,3,4,5"><?=__('weekdays (5 days)')?></option>
+                                                    <option value="0,6"><?=__('weekend (2 days)')?></option>
+                                                    <option value="1"><?=__('Monday')?></option>
+                                                    <option value="2"><?=__('Tuesday')?></option>
+                                                    <option value="3"><?=__('Wednesday')?></option>
+                                                    <option value="4"><?=__('Thursday')?></option>
+                                                    <option value="5"><?=__('Friday')?></option>
+                                                    <option value="6"><?=__('Saturday')?></option>
+                                                    <option value="0"><?=__('Sunday')?></option>
+                                                </select>
+                                            </p>
+
+                                            <p><span class="first"><?=__('Hour')?>:</span>
+                                                <select name="h_hour" class="vst-list short">
+                                                    <option value="0">00</option>
+                                                    <option value="1">01</option>
+                                                    <option value="2">02</option>
+                                                    <option value="3">03</option>
+                                                    <option value="4">04</option>
+                                                    <option value="5">05</option>
+                                                    <option value="6">06</option>
+                                                    <option value="7">07</option>
+                                                    <option value="8">08</option>
+                                                    <option value="9">09</option>
+                                                    <option value="10">10</option>
+                                                    <option value="11">11</option>
+                                                    <option value="12"  selected="selected">12</option>
+                                                    <option value="13">13</option>
+                                                    <option value="14">14</option>
+                                                    <option value="15">15</option>
+                                                    <option value="16">16</option>
+                                                    <option value="17">17</option>
+                                                    <option value="18">18</option>
+                                                    <option value="19">19</option>
+                                                    <option value="20">20</option>
+                                                    <option value="21">21</option>
+                                                    <option value="22">22</option>
+                                                    <option value="23">23</option>
+                                                </select>
+                                                <span><?=__('Minute')?>:</span>
+                                                <select name="h_min" class="vst-list short">
+                                                    <option value="0" selected="selected">00</option>
+                                                    <option value="1">01</option>
+                                                    <option value="2">02</option>
+                                                    <option value="5">05</option>
+                                                    <option value="10">10</option>
+                                                    <option value="15">15</option>
+                                                    <option value="20">20</option>
+                                                    <option value="25">25</option>
+                                                    <option value="30">30</option>
+                                                    <option value="35">35</option>
+                                                    <option value="40">40</option>
+                                                    <option value="45">45</option>
+                                                    <option value="50">50</option>
+                                                    <option value="55">55</option>
+                                                </select>
+                                            </p>
+
+                                            <p class="step-top">
+                                                <input type="submit" value="<?=__('Generate')?>" class="button">
+                                            </p>
+                                        </form>
+                                      </div>
+
+                                      
+                                      <div id="tabs-5">
+                                        <form>
+                                            <input type="hidden" name="h_wday" value="*" />
+
+                                            <p><span class="first"><?=__('Run Command')?>:</span>
+                                                <select name="h_month" class="vst-list">
+                                                    <option value="*" selected="selected"><?=__('every month')?></option>
+                                                    <option value="1-11/2"><?=__('every odd month')?></option>
+                                                    <option value="*/2"><?=__('every even month')?></option>
+                                                    <option value="*/3"><?=__('every')?> 3</option>
+                                                    <option value="*/6"><?=__('every')?> 6</option>
+                                                    <option value="1"><?=__('Jan')?></option>
+                                                    <option value="2"><?=__('Feb')?></option>
+                                                    <option value="3"><?=__('Mar')?></option>
+                                                    <option value="4"><?=__('Apr')?></option>
+                                                    <option value="5"><?=__('May')?></option>
+                                                    <option value="6"><?=__('Jun')?></option>
+                                                    <option value="7"><?=__('Jul')?></option>
+                                                    <option value="8"><?=__('Aug')?></option>
+                                                    <option value="9"><?=__('Sep')?></option>
+                                                    <option value="10"><?=__('Oct')?></option>
+                                                    <option value="11"><?=__('Nov')?></option>
+                                                    <option value="12"><?=__('Dec')?></option>
+                                                </select>
+                                            </p>
+
+                                            <p><span class="first"><?=__('Date')?>:</span>
+                                                <select name="h_day" class="vst-list short">
+                                                    <option value="1" selected="selected">1</option>
+                                                    <option value="2">2</option>
+                                                    <option value="3">3</option>
+                                                    <option value="4">4</option>
+                                                    <option value="5">5</option>
+                                                    <option value="6">6</option>
+                                                    <option value="7">7</option>
+                                                    <option value="8">8</option>
+                                                    <option value="9">9</option>
+                                                    <option value="10">10</option>
+                                                    <option value="11">11</option>
+                                                    <option value="12">12</option>
+                                                    <option value="13">13</option>
+                                                    <option value="14">14</option>
+                                                    <option value="15">15</option>
+                                                    <option value="16">16</option>
+                                                    <option value="17">17</option>
+                                                    <option value="18">18</option>
+                                                    <option value="19">19</option>
+                                                    <option value="20">20</option>
+                                                    <option value="21">21</option>
+                                                    <option value="22">22</option>
+                                                    <option value="23">23</option>
+                                                    <option value="24">24</option>
+                                                    <option value="25">25</option>
+                                                    <option value="26">26</option>
+                                                    <option value="27">27</option>
+                                                    <option value="28">28</option>
+                                                    <option value="29">29</option>
+                                                    <option value="30">30</option>
+                                                    <option value="31">31</option>
+                                                </select>
+
+                                                <span><?=__('Hour')?>:</span>
+                                                <select name="h_hour" class="vst-list short">
+                                                    <option value="0">00</option>
+                                                    <option value="1">01</option>
+                                                    <option value="2">02</option>
+                                                    <option value="3">03</option>
+                                                    <option value="4">04</option>
+                                                    <option value="5">05</option>
+                                                    <option value="6">06</option>
+                                                    <option value="7">07</option>
+                                                    <option value="8">08</option>
+                                                    <option value="9">09</option>
+                                                    <option value="10">10</option>
+                                                    <option value="11">11</option>
+                                                    <option value="12"  selected="selected">12</option>
+                                                    <option value="13">13</option>
+                                                    <option value="14">14</option>
+                                                    <option value="15">15</option>
+                                                    <option value="16">16</option>
+                                                    <option value="17">17</option>
+                                                    <option value="18">18</option>
+                                                    <option value="19">19</option>
+                                                    <option value="20">20</option>
+                                                    <option value="21">21</option>
+                                                    <option value="22">22</option>
+                                                    <option value="23">23</option>
+                                                </select>
+
+                                                <span><?=__('Minute')?>:</span>
+                                                <select name="h_min" class="vst-list short">
+                                                    <option value="0" selected="selected">00</option>
+                                                    <option value="1">01</option>
+                                                    <option value="2">02</option>
+                                                    <option value="5">05</option>
+                                                    <option value="10">10</option>
+                                                    <option value="15">15</option>
+                                                    <option value="20">20</option>
+                                                    <option value="25">25</option>
+                                                    <option value="30">30</option>
+                                                    <option value="35">35</option>
+                                                    <option value="40">40</option>
+                                                    <option value="45">45</option>
+                                                    <option value="50">50</option>
+                                                    <option value="55">55</option>
+                                                </select>
+                                            </p>
+                                            <p class="step-top">
+                                                <input type="submit" value="<?=__('Generate')?>" class="button">
+                                            </p>
+                                        </form>
+                                      </div>
+                                    </div>
+                                </div>
+
+
         <form id="vstobjects" name="v_edit_cron" method="post"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
@@ -47,64 +367,66 @@
                     </td>
                     <td class="data-dotted">
                         <table class="data-col2" width="600px">
+
                             <tr>
-                                <td class="vst-text step-top">
-                                    <?php print __('Minute');?>
+                                <td class="vst-text input-label">
+                                    <?php print __('Command');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_min" <?php if (isset($v_min)) echo "value=".htmlentities($v_min); ?>>
+                                    <input type="text" size="20" class="vst-input long" name="v_cmd" <?php if (isset($v_cmd)) echo "value='".htmlentities($v_cmd)."'"; ?>>
                                 </td>
                             </tr>
+
                             <tr>
-                                <td class="vst-text input-label">
-                                    <?php print __('Hour');?>
+                                <td class="vst-text step-top">
+                                    <?php print __('Minute');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_hour" <?php if (isset($v_hour)) echo "value=".htmlentities($v_hour); ?>>
+                                    <input type="text" size="20" class="vst-input short" name="v_min" <?php if (isset($v_min)) echo "value=".htmlentities($v_min); ?>>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Day');?>
+                                    <?php print __('Hour');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_day" <?php if (isset($v_day)) echo "value=".htmlentities($v_day); ?>>
+                                    <input type="text" size="20" class="vst-input short" name="v_hour" <?php if (isset($v_hour)) echo "value=".htmlentities($v_hour); ?>>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Month');?>
+                                    <?php print __('Day');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_month" <?php if (isset($v_month)) echo "value=".htmlentities($v_month); ?>>
+                                    <input type="text" size="20" class="vst-input short" name="v_day" <?php if (isset($v_day)) echo "value=".htmlentities($v_day); ?>>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Day of week');?>
+                                    <?php print __('Month');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input" name="v_wday" <?php if (isset($v_wday)) echo "value=".htmlentities($v_wday); ?>>
+                                    <input type="text" size="20" class="vst-input short" name="v_month" <?php if (isset($v_month)) echo "value=".htmlentities($v_month); ?>>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Command');?>
+                                    <?php print __('Day of week');?>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input type="text" size="20" class="vst-input long" name="v_cmd" <?php if (isset($v_cmd)) echo "value='".htmlentities($v_cmd)."'"; ?>>
+                                    <input type="text" size="20" class="vst-input short" name="v_wday" <?php if (isset($v_wday)) echo "value=".htmlentities($v_wday); ?>>
                                 </td>
                             </tr>
                         </table>
@@ -123,3 +445,36 @@
             </table>
         </form>
     </div>
+
+
+<script>
+  $(function() {
+    $( "#tabs" ).tabs();
+    $('.context-helper').click(function(){ $('#tabs').toggle(); $('.context-helper').toggle();  });
+    $('.context-helper-close').click(function(){ $('#tabs').toggle(); $('.context-helper').toggle(); });
+                            
+    $('.helper-container form').submit(function(){
+      $('#vstobjects input[name=v_min]').val($(this).find(':input[name=h_min]').val()).effect('highlight');
+      $('#vstobjects input[name=v_hour]').val($(this).find(':input[name=h_hour]').val()).effect('highlight');
+      $('#vstobjects input[name=v_day]').val($(this).find(':input[name=h_day]').val()).effect('highlight');
+      $('#vstobjects input[name=v_month]').val($(this).find(':input[name=h_month]').val()).effect('highlight');
+      $('#vstobjects input[name=v_wday]').val($(this).find(':input[name=h_wday]').val()).effect('highlight');
+                                
+      return false;
+    })
+
+   /*
+    TODO:
++        1 css
++        2 hover all buttons
++        3 button
++        4 blink form on Generation
++        5 close button
++        6 translation
+        7 user version
+        8 edit cron /user
+        9 russian cron html
+   */
+
+  });
+</script>

+ 11 - 11
web/templates/admin/edit_package.html

@@ -42,7 +42,7 @@
                                     <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?php echo $v_status ?>"><b><?= __($v_status) ?></b></td></tr>
+                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
                         </table>
                     </td>
                     <td class="data-dotted">
@@ -305,13 +305,13 @@
                             <tr>
                                 <td>
                                     <input type="text" size="20" class="vst-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".htmlentities($v_ns1); ?>>
-                                    <span class="remove-ns additional-control delete"><?= __('delete') ?></span>
+                                    <span class="remove-ns additional-control delete">delete</span>
                                 </td>
                             </tr>
                             <tr>
                                 <td>
                                     <input type="text" size="20" class="vst-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".htmlentities($v_ns2); ?>>
-                                    <span class="remove-ns additional-control delete"><?= __('delete') ?></span>
+                                    <span class="remove-ns additional-control delete">delete</span>
                                 </td>
                             </tr>
 
@@ -319,7 +319,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns3" value="'.htmlentities($v_ns3).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        <span class="remove-ns additional-control delete">delete</span>
                                     </td>
                                 </tr>';
 
@@ -327,7 +327,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns4" value="'.htmlentities($v_ns4).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        <span class="remove-ns additional-control delete">delete</span>
                                     </td>
                                 </tr>';
 
@@ -335,7 +335,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns5" value="'.htmlentities($v_ns5).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        <span class="remove-ns additional-control delete">delete</span>
                                     </td>
                                 </tr>';
 
@@ -343,7 +343,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns6" value="'.htmlentities($v_ns6).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        <span class="remove-ns additional-control delete">delete</span>
                                     </td>
                                 </tr>';
 
@@ -351,7 +351,7 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns7" value="'.htmlentities($v_ns7).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        <span class="remove-ns additional-control delete">delete</span>
                                     </td>
                                 </tr>';
 
@@ -359,14 +359,14 @@
                                   echo '<tr>
                                     <td>
                                         <input type="text" size="20" class="vst-input" name="v_ns8" value="'.htmlentities($v_ns8).'">
-                                        <span class="remove-ns additional-control delete">'.__('delete').'</span>
+                                        <span class="remove-ns additional-control delete">delete</span>
                                     </td>
                                 </tr>';
                                 ?>
 
                                 <tr class="add-ns" <? if($v_ns8) echo 'style="display:none;"'; ?> >
                                     <td class="step-top-small">
-                                      <span class="add-ns-button additional-control add"><?= __('Add one more Name Server') ?></span>
+                                      <span class="add-ns-button additional-control add">Add one more Name Server</span>
                                     </td>
                                 </tr>
 
@@ -416,4 +416,4 @@
                 })
 
             });
-    </script>
+    </script>

+ 4 - 4
web/templates/admin/list_backup_detail.html

@@ -16,11 +16,11 @@
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td>
-                <form action="/bulk/restore/" method="post">
+                <form action="/bulk/restore/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
                 <input type="hidden" name="backup" value="<?=htmlentities($_GET['backup']); ?>">
                 <div class="l-select">
-                  <select name="action" id="">
+                  <select name="action">
                     <option value=""><?=__('apply to selected')?></option>
                     <option value="restore"><?php print __('restore') ?></option>
                   </select>
@@ -52,6 +52,7 @@
         $web = explode(',',$data[$backup]['WEB']);
         foreach ($web as $key) {
           if (!empty($key)) {
+            ++$i;
       ?>
 
       <div class="l-unit">
@@ -335,7 +336,6 @@
       <!-- /.l-separator -->
       <? }} ?>
 
-
       <div class="l-unit">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
@@ -397,4 +397,4 @@
           </div>
         </div>
       </div>
-    </div>
+    </div>

+ 0 - 6
web/templates/admin/list_backup_exclusions.html

@@ -49,8 +49,6 @@
       <div class="l-unit">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <!--input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="check" value="check<?php echo $i ?>">
-            <label for="check<?php echo $i ?>" class="check-label"></label -->
           </div>
           <!-- l-unit-toolbar__col -->
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
@@ -73,10 +71,6 @@
         <div class="l-unit__col l-unit__col--left clearfix"></div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
-          <!-- div class="l-unit__name separate">
-            <?=$key?>
-          </div -->
-
           <div class="l-unit__stats">
             <table>
               <tr>

+ 1 - 1
web/templates/admin/list_dns_rec.html

@@ -99,7 +99,7 @@ v_unit_id="<?=$key?>" v_section="dns_rec">
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__suspended""><?=__('suspended')?></div>
-          <div class="text-center jump-top">
+          <div class="text-center jump-small-top">
             <i class="l-icon-star"></i>
           </div>
         </div>

+ 3 - 3
web/templates/admin/list_firewall.html

@@ -87,7 +87,7 @@ sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$k
               <div class="actions-panel__col actions-panel__<?=$spnd_action?> shortcut-s" key-action="js">
                 <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
                   <?=__($spnd_action)?> <i class="do_<?=$spnd_action?>"></i>
-                  <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action ?>/firewall/?rule=<?=$data[$key]['RULE']?>&token=<?=$_SESSION['token']?>" />
+                  <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action ?>/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>" />
                   <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
                     <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
                   </div>
@@ -97,9 +97,9 @@ sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$k
               <div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
                 <a id="delete_link_<?=$i?>" class="data-controls do_delete">
                   <?=__('delete')?> <i class="do_delete"></i>
-                  <input type="hidden" name="delete_url" value="/delete/firewall/?rule=<?=$data[$key]['RULE']?>&token=<?=$_SESSION['token']?>" />
+                  <input type="hidden" name="delete_url" value="/delete/firewall/?rule=<?=$key?>&token=<?=$_SESSION['token']?>" />
                   <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
-                    <p class="confirmation"><?=__('DELETE_RULE_CONFIRMATION',$data[$key]['RULE'])?></p>
+                    <p class="confirmation"><?=__('DELETE_RULE_CONFIRMATION', $key)?></p>
                   </div>
                 </a>
                 <span class="shortcut delete">&nbsp;Del</span>

+ 1 - 1
web/templates/admin/list_mail.html

@@ -78,7 +78,7 @@
           } else {
             $status = 'active';
             $spnd_action = 'suspend' ;
-            $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
+            $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
           }
           if (empty($data[$key]['CATCHALL'])) {
             $data[$key]['CATCHALL'] = '/dev/null';

+ 1 - 1
web/templates/admin/list_mail_acc.html

@@ -36,7 +36,7 @@
                 <form action="/bulk/mail/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
                 <div class="l-select">
-                  <select name="" id="">
+                  <select name="action" id="">
                     <option value=""><?=__('apply to selected')?></option>
                     <option value="suspend"><?=__('suspend')?></option>
                     <option value="unsuspend"><?=__('unsuspend')?></option>

+ 0 - 4
web/templates/admin/list_stats.html

@@ -74,9 +74,6 @@
           <div class="l-unit__date">
             <?=translate_date($key)?>
           </div>
-          <div class="text-center">
-            <i class="l-icon-star"></i>
-          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -85,7 +82,6 @@
           </div>
 
 
-
           <div class="l-unit__stats">
             <table>
 

+ 11 - 4
web/templates/admin/list_user.html

@@ -108,7 +108,16 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
                           Ok: function() {
                             $( this ).dialog( "close" );
                           },
-                        }
+                        },
+                        create:function () {
+                            $(this).closest(".ui-dialog")
+                                .find(".ui-button:first")
+                                .addClass("submit");
+                            $(this).closest(".ui-dialog")
+                                .find(".ui-button")
+                                .eq(1) // the first button
+                                .addClass("cancel");
+                            }
                       });
                     });
                   </script>
@@ -153,12 +162,10 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?__('suspended')?></div>
-
+          <div class="l-unit__suspended""><?=__('suspended')?></div>
           <div class="text-center">
             <i class="l-icon-star"></i>
           </div>
-
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">

+ 2 - 0
web/templates/file_manager/tab_menu.php

@@ -12,6 +12,8 @@
 <div class="download button small" onClick="FM.setTabActive(FM['TAB_<?php echo $pre_tab ?>']);FM.downloadFiles()" title="<?=__('DOWNLOAD')?>"></div>
 <div class="rename button" onClick="FM.setTabActive(FM['TAB_<?php echo $pre_tab ?>']);FM.renameItems()"><?=__('RENAME')?></div>
 <div class="rename button small" onClick="FM.setTabActive(FM['TAB_<?php echo $pre_tab ?>']);FM.renameItems()"title="<?=__('RENAME')?>"></div>
+<div class="rights button" onClick="FM.setTabActive(FM['TAB_<?php echo $pre_tab ?>']);FM.chmodItems()"><?=__('RIGHTS')?></div>
+<div class="rights button small" onClick="FM.setTabActive(FM['TAB_<?php echo $pre_tab ?>']);FM.chmodItems()"title="<?=__('RIGHTS')?>"></div>
 <div class="copy button" onClick="FM.setTabActive(FM['TAB_<?php echo $pre_tab ?>']);FM.copyItems()"><?=__('COPY')?></div>
 <div class="copy button small" onClick="FM.setTabActive(FM['TAB_<?php echo $pre_tab ?>']);FM.copyItems()" title="<?=__('COPY')?>"></div>
 <div class="archive button" onClick="FM.setTabActive(FM['TAB_<?php echo $pre_tab ?>']);FM.packItem()"><?=__('ARCHIVE')?></div>

+ 12 - 1
web/templates/footer.html

@@ -4,6 +4,13 @@
         lastScrollTop = 0;
 
         $(document).ready(function() {
+            var isMobile = false; //initiate as false
+            // device detection
+            if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|Android|Silk|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(navigator.userAgent) 
+                || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(navigator.userAgent.substr(0,4))){
+                 isMobile = true;
+                $('body').addClass('mobile');
+            }
 
             hover_menu();
             $(window).scroll(function(){hover_menu()});
@@ -587,7 +594,7 @@
         <div class="close"></div>
       </div>
       <ul>
-        <li><span class="key">n</span><?=__('Add New object')?></li>
+        <li><span class="key">a</span><?=__('Add New object')?></li>
         <li><span class="key">Ctrl + Enter</span><?=__('Save Form')?></li>
         <li><span class="key">Ctrl + Backspace</span><?=__('Cancel saving form')?></li>
 
@@ -606,6 +613,10 @@
         <li class="step-top"><span class="key bigger">&larr;</span><?=__('Move backward through top menu')?></li>
         <li><span class="key bigger">&rarr;</span><?=__('Move forward through top menu')?></li>
         <li><span class="key">Enter</span><?=__('Enter focused element')?></li>
+
+        <li class="step-top"><span class="key bigger">&uarr;</span><?=__('Move up through elements list')?></li>
+        <li><span class="key bigger">&darr;</span><?=__('Move down through elements list')?></li>
+
       </ul>
 
     </div>

+ 1 - 1
web/templates/user/list_dns_rec.html

@@ -97,7 +97,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__suspended""><?__('suspended')?></div>
-          <div class="text-center jump-top">
+          <div class="text-center jump-small-top">
             <i class="l-icon-star"></i>
           </div>
         </div>

+ 1 - 1
web/templates/user/list_mail_acc.html

@@ -36,7 +36,7 @@
                 <form action="/bulk/mail/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
                 <div class="l-select">
-                  <select name="" id="">
+                  <select name="action" id="">
                     <option value=""><?=__('apply to selected')?></option>
                     <option value="delete"><?=__('delete')?></option>
                   </select>

+ 9 - 0
web/templates/user/list_user.html

@@ -106,6 +106,15 @@ sort-disk="<?=$data[$key]['U_DISK']?>" sort-star="<?if($_SESSION['favourites']['
                           Ok: function() {
                             $( this ).dialog( "close" );
                           },
+                        },
+                        create:function () {
+                          $(this).closest(".ui-dialog")
+                            .find(".ui-button:first")
+                            .addClass("submit");
+                          $(this).closest(".ui-dialog")
+                            .find(".ui-button")
+                            .eq(1) // the first button
+                            .addClass("cancel");
                         }
                       });
                     });