Serghey Rodin 10 лет назад
Родитель
Сommit
cd437282b2

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

@@ -148,7 +148,7 @@
                             <?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?> 
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Backend Template') . " <span class='optional''> / " . strtoupper($_SESSION['WEB_BACKEND']) . "</span>";?>
+                                    <?php print __('Backend Template') . " <span class='optional'>" . strtoupper($_SESSION['WEB_BACKEND']) . "</span>";?>
                                 </td>
                             </tr>
                             <tr>

+ 29 - 0
web/templates/admin/list_web.html

@@ -99,6 +99,11 @@
                             $ftp_user = str_replace(':', ', ', $ftp_user);
                         }
 
+                        $backend_support='no';
+                        if (!empty($data[$key]['BACKEND'])) {
+                            $backend_support='yes';
+                        }
+
                         $proxy_support='no';
                         if (!empty($data[$key]['PROXY'])) {
                             $proxy_support='yes';
@@ -203,6 +208,7 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
                   </div>
                 </td>
                 <td>
+                  <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?> 
                   <? if($proxy_support == 'no'){ ?>
                     <div class="l-unit__stat-cols clearfix disabled last"><?=__('Proxy Support')?></div>
                   <? } else {?>
@@ -213,6 +219,19 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
                       </div>
                     </div>
                   <? } ?>
+                  <? } ?>
+                  <?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?> 
+                  <? if($backend_support == 'no'){ ?>
+                    <div class="l-unit__stat-cols clearfix disabled last"><?=__('Backend Support')?></div>
+                  <? } else {?>
+                    <div class="l-unit__stat-cols clearfix last">
+                      <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Backend Support')?>:</div>
+                      <div class="l-unit__stat-col l-unit__stat-col--right">
+                        <b><?=__($backend_support)?></b>
+                      </div>
+                    </div>
+                  <? } ?>
+                  <? } ?>
                 </td>
               </tr>
               <tr>
@@ -230,12 +249,22 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
                   <? } ?>
                 </td>
                 <td>
+                  <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?> 
                   <div class="l-unit__stat-cols clearfix last">
                     <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Proxy Template')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right">
                       <b><?=$data[$key]['PROXY']?></b>
                     </div>
                   </div>
+                  <? } ?>
+                  <?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?> 
+                  <div class="l-unit__stat-cols clearfix last">
+                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Backend Template')?>:</div>
+                    <div class="l-unit__stat-col l-unit__stat-col--right">
+                      <b><?=$data[$key]['BACKEND']?></b>
+                    </div>
+                  </div>
+                  <? } ?>
                 </td>
               </tr>
               <tr>

+ 0 - 45
web/templates/user/edit_web.html

@@ -124,27 +124,6 @@
                                     <textarea size="20" class="vst-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo htmlentities($v_aliases);  ?></textarea>
                                 </td>
                             </tr>
-                            <tr>
-                                <td class="vst-text input-label">
-                                    <?php print __('Web Template');?>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <select class="vst-list" name="v_template">
-                                        <?php
-                                            foreach ($templates as $key => $value) {
-                                                echo "\t\t\t\t<option value=\"".htmlentities($value)."\"";
-                                                $svalue = "'".$value."'";
-                                                if ((!empty($v_template)) && ( $value == $v_template ) || ($svalue == $v_template)){
-                                                    echo ' selected' ;
-                                                }
-                                                echo ">".htmlentities($value)."</option>\n";
-                                            }
-                                        ?> 
-                                    </select>
-                                </td>
-                            </tr>
                             <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?> 
                             <tr>
                                 <td class="vst-text step-top">
@@ -154,30 +133,6 @@
                             <tr>
                                 <td class="step-left">
                                     <table style="display:<?php if (empty($v_proxy)) { echo 'none';} else {echo 'block';}?> ;" id="proxytable">
-                                        <tr>
-                                            <td class="vst-text input-label">
-                                                <?php print __('Proxy Template');?>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <select class="vst-list" name="v_proxy_template">
-                                                    <?php
-                                                        foreach ($proxy_templates as $key => $value) {
-                                                            echo "\t\t\t\t<option value=\"".htmlentities($value)."\"";
-                                                            $svalue = "'".$value."'";
-                                                            if ((!empty($v_proxy_template)) && ( $value == $v_proxy_template ) || ($svalue == $v_proxy_template)){
-                                                                echo ' selected' ;
-                                                            }
-                                                            if ((empty($v_proxy_template)) && ($value == 'default')){
-                                                                echo ' selected' ;
-                                                            }
-                                                            echo ">".htmlentities($value)."</option>\n";
-                                                        }
-                                                    ?> 
-                                                </select>
-                                            </td>
-                                        </tr>
                                         <tr>
                                             <td class="vst-text input-label">
                                                 <?php print __('Proxy Extensions');?>

+ 29 - 0
web/templates/user/list_web.html

@@ -101,6 +101,11 @@
                             $ftp_user = str_replace(':', ', ', $ftp_user);
                         }
 
+                        $backend_support='no';
+                        if (!empty($data[$key]['BACKEND'])) {
+                            $backend_support='yes';
+                        }
+
                         $proxy_support='no';
                         if (!empty($data[$key]['PROXY'])) {
                             $proxy_support='yes';
@@ -207,6 +212,7 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
                   </div>
                 </td>
                 <td>
+                  <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>.
                   <? if($proxy_support == 'no'){ ?>
                     <div class="l-unit__stat-cols clearfix disabled last"><?=__('Proxy Support')?></div>
                   <? } else {?>
@@ -217,6 +223,19 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
                       </div>
                     </div>
                   <? } ?>
+                  <? } ?>
+                  <?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>.
+                  <? if($backend_support == 'no'){ ?>
+                    <div class="l-unit__stat-cols clearfix disabled last"><?=__('Backend Support')?></div>
+                  <? } else {?>
+                    <div class="l-unit__stat-cols clearfix last">
+                      <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Backend Support')?>:</div>
+                      <div class="l-unit__stat-col l-unit__stat-col--right">
+                        <b><?=__($backend_support)?></b>
+                      </div>
+                    </div>
+                  <? } ?>
+                  <? } ?>
                 </td>
               </tr>
               <tr>
@@ -234,12 +253,22 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
                   <? } ?>
                 </td>
                 <td>
+                  <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>.
                   <div class="l-unit__stat-cols clearfix last">
                     <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Proxy Template')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right">
                       <b><?=$data[$key]['PROXY']?></b>
                     </div>
                   </div>
+                  <? } ?>
+                  <?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>.
+                  <div class="l-unit__stat-cols clearfix last">
+                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Backend Template')?>:</div>
+                    <div class="l-unit__stat-col l-unit__stat-col--right">
+                      <b><?=$data[$key]['BACKEND']?></b>
+                    </div>
+                  </div>
+                  <? } ?>
                 </td>
               </tr>
               <tr>