Browse Source

merge AriaNg commit(https://github.com/mayswind/AriaNg/commit/0dcda2b8c0777367f807b77a66d388640a911765)

MaysWind 3 years ago
parent
commit
aec7249684
2 changed files with 5 additions and 10 deletions
  1. 4 8
      app/views/new.html
  2. 1 2
      app/views/settings-ariang.html

+ 4 - 8
app/views/new.html

@@ -21,8 +21,7 @@
                             <li><a class="pointer-cursor" ng-click="openTorrent()" translate>Open Torrent File</a></li>
                             <li><a class="pointer-cursor" ng-click="openMetalink()" translate>Open Metalink File</a></li>
                         </ul>
-                    </div>
-                    <div class="btn-group">
+                    </div><div class="btn-group">
                         <button type="submit" class="btn btn-sm"
                                 ng-class="{'btn-default': !isNewTaskValid(), 'btn-success': isNewTaskValid()}"
                                 ng-disabled="!isNewTaskValid()" translate>Download Now
@@ -207,16 +206,13 @@
                         <div class="settings-table-title new-task-filter-title">
                             <div class="row">
                                 <div class="col-sm-12">
-                                    <span translate>Filters</span><span>:&nbsp;</span>
-                                    <div class="checkbox checkbox-inline checkbox-primary">
+                                    <span translate>Filters</span><span>:&nbsp;</span><div class="checkbox checkbox-inline checkbox-primary">
                                         <input id="optionFilterGlobal" type="checkbox" ng-model="context.optionFilter['global']"/>
                                         <label for="optionFilterGlobal" translate>Global</label>
-                                    </div>
-                                    <div class="checkbox checkbox-inline checkbox-primary">
+                                    </div><div class="checkbox checkbox-inline checkbox-primary">
                                         <input id="optionFilterHttp" type="checkbox" ng-model="context.optionFilter['http']"/>
                                         <label for="optionFilterHttp" translate>Http</label>
-                                    </div>
-                                    <div class="checkbox checkbox-inline checkbox-primary">
+                                    </div><div class="checkbox checkbox-inline checkbox-primary">
                                         <input id="optionFilterBittorrent" type="checkbox" ng-model="context.optionFilter['bittorrent']"/>
                                         <label for="optionFilterBittorrent" translate>BitTorrent</label>
                                     </div>

+ 1 - 2
app/views/settings-ariang.html

@@ -7,8 +7,7 @@
             <li class="nav-tab-title-rpcname" ng-repeat="setting in context.rpcSettings" ng-class="{'active': isCurrentRpcTab($index)}">
                 <a class="pointer-cursor" ng-click="changeRpcTab($index)">
                     <span class="nav-tab-rpcname" ng-bind="'RPC' + (setting.rpcAlias || setting.rpcHost ? ' (' + (setting.rpcAlias ? setting.rpcAlias : setting.rpcHost + ':' + setting.rpcPort) + ')' : '')" title="{{(setting.rpcAlias ? setting.rpcAlias : setting.rpcHost + ':' + setting.rpcPort)}}">RPC</span>
-                </a>
-                <a class="pointer-cursor nav-tab-close" ng-if="!setting.isDefault" title="{{'Delete RPC Setting' | translate}}">
+                </a><a class="pointer-cursor nav-tab-close" ng-if="!setting.isDefault" title="{{'Delete RPC Setting' | translate}}">
                     <i class="fa fa-times" ng-click="removeRpcSetting(setting)"></i>
                 </a>
             </li>