haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrated the update process into the notification area

Browse Source
This commit is contained in:
Kenneth Skovhede
2015-12-03 22:46:30 +01:00
parent 81abefe0f5
commit f9dc7779fa
3 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Server/webroot/ngax/styles/styles2.css
+4
View File
@@ -549,6 +549,10 @@ ul.notification {
color: black;
}
.notification .buttons {
padding-top: 6px;
}
.notification .button {
padding: 2px 10px;
}
Duplicati/Server/webroot/ngax/templates/about.html
+2 -2
View File
@@ -12,10 +12,10 @@
<div>&nbsp;</div>
<div>You are currently running {{appName}} {{sysinfo.ServerVersionName || 'unknown'}}</div>
<div ng-show="state.updatedVersion != null &amp;&amp; !state.updateReady">
<div ng-show="state.updatedVersion != null &amp;&amp; !state.updateReady &amp;&amp; state.updaterState == 'Waiting'">
Update <a href ng-click="doShowUpdateChangelog()">{{state.updatedVersion}}</a> is available, <a href ng-click="doStartUpdateDownload()">download now</a>
</div>
<div ng-show="state.updatedVersion != null &amp;&amp; state.updateReady">
<div ng-show="state.updatedVersion != null &amp;&amp; state.updateReady &amp;&amp; state.updaterState == 'Waiting'">
Update <a href ng-click="doShowUpdateChangelog()">{{state.updatedVersion}}</a> is installed, <a href ng-click="doStartUpdateActivate()">activate now</a>
</div>
Duplicati/Server/webroot/ngax/templates/notificationarea.html
+20 -7
View File
@@ -34,23 +34,36 @@
<li ng-repeat="item in Notifications track by item.ID" ng-show="$index < 4" class="{{item.Type.toLowerCase()}}">
<div class="title">{{item.Title}}</div>
<div class="content">
<div class="message">{{item.Message}}</div>
<div ng-if="item.Action != 'update:new'" class="message">{{item.Message}}</div>
<div ng-show="item.DownloadLink != null">
<div>If the backup file was not downloaded automatically,</div>
<div>
<a href="{{item.DownloadLink}}" target="_blank">right click and choose &quot;Save as ...&quot;</a>
</div>
</div>
<div class="buttons">
<a href ng-click="doDismiss(item.ID)" class="button dismiss">Dismiss</a>
<div ng-if="item.Action != 'update:new'" class="buttons">
<a href ng-show="item.Action == 'backup:show-log'" ng-click="doShowLog(item.BackupID)" class="button showlog">Show</a>
<a href ng-show="item.Action == 'update:new'" ng-click="doInstallUpdate()" class="button installupdate">Install</a>
<a href ng-show="item.Action == 'update:new'" ng-click="doShowUpdate()" class="button showupdate">Show</a>
<a href ng-show="item.Action.indexOf('bug-report:created:') == 0 &amp;&amp; item.DownloadLink == null" ng-click="doDownloadBugreport(item)" class="button downloadbugreport">Download</a>
</div>
<div ng-if="item.Action == 'update:new'">
<div class="message">New backup found: {{item.Message}}</div>
<progress-bar ng-show="state.updaterState == 'Downloading'" ng-text="'Downloading update...'" ng-progress="state.updateDownloadProgress"></progress-bar>
<div class="buttons">
<a href ng-click="doDismiss(item.ID)" class="button dismiss">Dismiss</a>
<a href ng-show="!state.updateReady &amp;&amp; state.updaterState == 'Waiting'" ng-click="doInstallUpdate(item.ID)" class="button installupdate">Install</a>
<a href ng-show="state.updateReady &amp;&amp; state.updaterState == 'Waiting'" ng-click="doActivateUpdate(item.ID)" class="button installupdate">Activate</a>
<a href ng-show="state.updaterState == 'Downloading'" class="button" ng-disabled="true" ng-click="">Downloading ...</a>
<a href ng-show="state.updaterState == 'Checking'" class="button" ng-disabled="true" ng-click="">Downloading ...</a>
<a href ng-click="doShowUpdate()" class="button showupdate">Show</a>
</div>
</div>
</div>
</li>
</ul>