q3aql/webui-aria2
q3aql/webui-aria2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #306 from ziahamza/master

Browse Source 
[Release] Update hosted version
This commit is contained in:
hamza zia 2017-02-12 01:17:54 -08:00 committed by GitHub
commit 9b9cace18b
8 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
.DS_STORE .DS_STORE
.idea .idea
.git .git
debug.log

6
Dockerfile
View File

@ -5,7 +5,7 @@ RUN groupadd -r dummy && useradd -r -g dummy dummy -u 1000
# webui + aria2 # webui + aria2
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y aria2 busybox curl \ && apt-get install -y aria2 busybox curl unzip \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
ADD . /webui-aria2 ADD . /webui-aria2
@ -19,8 +19,8 @@ RUN GITHUB_REPO="https://github.com/tianon/gosu" \
# goreman supervisor install latest # goreman supervisor install latest
RUN GITHUB_REPO="https://github.com/mattn/goreman" \ RUN GITHUB_REPO="https://github.com/mattn/goreman" \
&& LATEST=`curl -s $GITHUB_REPO"/releases/latest" | grep -Eo "v[0-9]*.[0-9]*.[0-9]*"` \ && LATEST=`curl -s $GITHUB_REPO"/releases/latest" | grep -Eo "v[0-9]*.[0-9]*.[0-9]*"` \
&& curl -L $GITHUB_REPO"/releases/download/"$LATEST"/goreman_linux_amd64.tar.gz" > goreman.tar.gz \ && curl -L $GITHUB_REPO"/releases/download/"$LATEST"/goreman_linux_amd64.zip" > goreman.zip \
&& tar -xvzf goreman.tar.gz && mv /goreman_linux_amd64/goreman /usr/local/bin/goreman && rm -R goreman* && unzip goreman.zip && mv /goreman /usr/local/bin/goreman && rm -R goreman*
# goreman setup # goreman setup
RUN echo "web: gosu dummy /bin/busybox httpd -f -p 8080 -h /webui-aria2\nbackend: gosu dummy /usr/bin/aria2c --enable-rpc --rpc-listen-all --dir=/data" > Procfile RUN echo "web: gosu dummy /bin/busybox httpd -f -p 8080 -h /webui-aria2\nbackend: gosu dummy /usr/bin/aria2c --enable-rpc --rpc-listen-all --dir=/data" > Procfile

2
configuration.js
View File

@ -38,7 +38,7 @@ angular
]) ])
.constant('$downloadProps', [ // Similar to starred Quick Access properties but for adding new downloads. .constant('$downloadProps', [ // Similar to starred Quick Access properties but for adding new downloads.
// go to Advance Download Options when adding a new download to view the list of possible options // go to Advance Download Options when adding a new download to view the list of possible options
'http-user', 'http-passwd', 'pause', 'dir', 'max-connection-per-server' 'header', 'http-user', 'http-passwd', 'pause', 'dir', 'max-connection-per-server'
]) ])
.constant('$globalTimeout', 1000) // interval to update the individual downloads .constant('$globalTimeout', 1000) // interval to update the individual downloads
; ;

40
index.html
View File

@ -412,8 +412,9 @@
<li ng-repeat="prop in properties" class="form-group"> <li ng-repeat="prop in properties" class="form-group">
<label title="{{prop.desc}}" style="width: 100%;">{{prop.name}}</label> <label title="{{prop.desc}}" style="width: 100%;">{{prop.name}}</label>
<div class="form-group"> <div class="form-group">
<select style="width: 100%;" ng-show="prop.options.length" class="form-control" ng-options="opt for opt in prop.options" ng-model="prop.val"></select> <select style="width: 100%;" ng-show="prop.options.length && !prop.multiline" class="form-control" ng-options="opt for opt in prop.options" ng-model="prop.val"></select>
<input style="width: 100%;" ng-show="!prop.options.length" type="text" class="form-control input-large" ng-model="prop.val"/> <input style="width: 100%;" ng-show="!prop.options.length && !prop.multiline" type="text" class="form-control input-large" ng-model="prop.val"/>
<textarea style="width: 100%;" ng-show="prop.multiline" ng-model="prop.val"></textarea>
</div> </div>
</li> </li>
<li> <li>
@ -827,9 +828,10 @@
<label class="col-sm-3 control-label">{{name}}</label> <label class="col-sm-3 control-label">{{name}}</label>
<div class="col-sm-9 controls"> <div class="col-sm-9 controls">
<select class="form-control" ng-show="set.options.length" ng-options="opt for opt in set.options" ng-model="set.val"> <select class="form-control" ng-show="set.options.length && !set.multiline" ng-options="opt for opt in set.options" ng-model="set.val">
</select> </select>
<input ng-show="!set.options.length" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/> <input ng-show="!set.options.length && !set.multiline" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
<textarea ng-show="set.multiline" ng-model="set.val"></textarea>
</div> </div>
<br /> <br />
</div> </div>
@ -847,9 +849,10 @@
<label class="col-sm-3 control-label">{{name}}</label> <label class="col-sm-3 control-label">{{name}}</label>
<div class="col-sm-9 controls"> <div class="col-sm-9 controls">
<select class="form-control" ng-show="set.options.length" ng-options="opt for opt in set.options" ng-model="set.val"> <select class="form-control" ng-show="set.options.length && !set.multiline" ng-options="opt for opt in set.options" ng-model="set.val">
</select> </select>
<input ng-show="!set.options.length" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/> <input ng-show="!set.options.length && !set.multiline" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
<textarea ng-show="set.multiline" ng-model="set.val"></textarea>
</div> </div>
<br /> <br />
</div> </div>
@ -895,9 +898,10 @@
<label class="col-sm-3 control-label">{{name}}</label> <label class="col-sm-3 control-label">{{name}}</label>
<div class="col-sm-9 controls"> <div class="col-sm-9 controls">
<select class="form-control" ng-show="set.options.length" ng-options="opt for opt in set.options" ng-model="set.val"> <select class="form-control" ng-show="set.options.length && !set.multiline" ng-options="opt for opt in set.options" ng-model="set.val">
</select> </select>
<input ng-show="!set.options.length" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/> <input ng-show="!set.options.length && !set.multiline" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
<textarea ng-show="set.multiline" ng-model="set.val"></textarea>
</div> </div>
<br /> <br />
</div> </div>
@ -915,9 +919,10 @@
<label class="col-sm-3 control-label">{{name}}</label> <label class="col-sm-3 control-label">{{name}}</label>
<div class="col-sm-9 controls"> <div class="col-sm-9 controls">
<select class="form-control" ng-show="set.options.length" ng-options="opt for opt in set.options" ng-model="set.val"> <select class="form-control" ng-show="set.options.length && !set.multiline" ng-options="opt for opt in set.options" ng-model="set.val">
</select> </select>
<input ng-show="!set.options.length" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/> <input ng-show="!set.options.length && !set.multiline" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
<textarea ng-show="set.multiline" ng-model="set.val"></textarea>
</div> </div>
<br /> <br />
</div> </div>
@ -962,9 +967,10 @@
<label class="col-sm-3 control-label">{{name}}</label> <label class="col-sm-3 control-label">{{name}}</label>
<div class="col-sm-9 controls"> <div class="col-sm-9 controls">
<select class="form-control" ng-show="set.options.length" ng-options="opt for opt in set.options" ng-model="set.val"> <select class="form-control" ng-show="set.options.length && !set.multiline" ng-options="opt for opt in set.options" ng-model="set.val">
</select> </select>
<input ng-show="!set.options.length" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/> <input ng-show="!set.options.length && !set.multiline" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
<textarea ng-show="set.multiline" ng-model="set.val"></textarea>
</div> </div>
<br /> <br />
</div> </div>
@ -982,9 +988,10 @@
<label class="col-sm-3 control-label">{{name}}</label> <label class="col-sm-3 control-label">{{name}}</label>
<div class="col-sm-9 controls"> <div class="col-sm-9 controls">
<select class="form-control" ng-show="set.options.length" ng-options="opt for opt in set.options" ng-model="set.val"> <select class="form-control" ng-show="set.options.length && !set.multiline" ng-options="opt for opt in set.options" ng-model="set.val">
</select> </select>
<input ng-show="!set.options.length" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/> <input ng-show="!set.options.length && !set.multiline" type="text" class="form-control input-xxlarge modal-form-input-verylarge" ng-model="set.val"/>
<textarea ng-show="set.multiline" ng-model="set.val"></textarea>
</div> </div>
<br /> <br />
</div> </div>
@ -1044,9 +1051,10 @@
<label class="col-sm-3 control-label">{{name}}</label> <label class="col-sm-3 control-label">{{name}}</label>
<div class="col-sm-9 controls"> <div class="col-sm-9 controls">
<select class="form-control" ng-show="set.options.length" ng-options="opt for opt in set.options" ng-model="set.val"> <select class="form-control" ng-show="set.options.length && !set.multiline" ng-options="opt for opt in set.options" ng-model="set.val">
</select> </select>
<input ng-show="!set.options.length" type="text" class="form-control input-xlarge" ng-model="set.val"/> <input ng-show="!set.options.length && !set.multiline" type="text" class="form-control input-xlarge" ng-model="set.val"/>
<textarea ng-show="set.multiline" ng-model="set.val"></textarea>
<div class="checkbox" ng-show="set.starred != undefined"> <div class="checkbox" ng-show="set.starred != undefined">
<label> <label>
<input type="checkbox" ng-model="set.starred"/> <input type="checkbox" ng-model="set.starred"/>

2
js/ctrls/modal.js
View File

@ -37,7 +37,7 @@ angular
open: function(cb) { open: function(cb) {
var self = this; var self = this;
this.uris = ""; this.uris = "";
this.downloadSettingsCollapsed = true; this.downloadSettingsCollapsed = false;
this.advancedSettingsCollapsed = true; this.advancedSettingsCollapsed = true;
this.settings = {}; this.settings = {};
this.fsettings = _.cloneDeep(fsettings); this.fsettings = _.cloneDeep(fsettings);

1
js/ctrls/props.js
View File

@ -70,6 +70,7 @@ angular.module('webui.ctrls.props', [
nprop = nprop || {}; nprop = nprop || {};
nprop.name = prop.name; nprop.name = prop.name;
nprop.options = prop.options; nprop.options = prop.options;
nprop.multiline = prop.multiline;
if (nprop._val == nprop.val || nprop.val == prop.val) { if (nprop._val == nprop.val || nprop.val == prop.val) {
nprop._val = prop.val; nprop._val = prop.val;
nprop.val = prop.val; nprop.val = prop.val;

3
js/services/settings/settings.js
View File

@ -271,7 +271,8 @@ angular.module('webui.services.settings', [])
"header": { "header": {
val: '', val: '',
desc: "Append HEADER to HTTP request header." desc: "Append HEADER to HTTP request header.",
multiline: true,
}, },
"http-accept-gzip": { "http-accept-gzip": {

4
js/translate/it_IT.js
View File

@ -44,8 +44,8 @@ translations.it_IT = {
// starred properties // starred properties
'Quick Access Settings': 'Accesso rapido', 'Quick Access Settings': 'Accesso rapido',
'Save settings': 'Salva impostazioni', 'Save settings': 'Salva impostazioni',
'Currently no download in line to display, use the': 'Attualmente non c\'è nessun download da mostrare, usa il', 'Currently no download in line to display, use the': 'Attualmente non c\'è nessun download da mostrare, usa il pulsante ',
'download button to start downloading files!': 'pulsante Aggiungi per cominciare a scaricare!', 'download button to start downloading files!': 'dowload per cominciare a scaricare!',
'Peers': 'Peers', 'Peers': 'Peers',
'More Info': 'Altre informazioni', 'More Info': 'Altre informazioni',
'Remove': 'Rimuovi', 'Remove': 'Rimuovi',