Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Better looking updater in admin section. #171

Merged
merged 2 commits into from
Sep 11, 2015
Merged

Better looking updater in admin section. #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a449028
Better looking updater in admin section.
raghunayyar Sep 6, 2015
7b14e31
Fixes container padding
raghunayyar Sep 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions css/updater.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
}

.updater-update {
padding: 1em 0.75em;
padding: 2px 20px 8px 20px;
background-color: rgba(240, 240, 240, 0.9);
max-width: 750px;
}
}
11 changes: 5 additions & 6 deletions templates/admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div ng-app="updater" ng-init="navigation='backup'" class="updater-admin">
<div class="section" ng-controller="updateCtrl" ng-init="hasUpdate=<?php p($isNewVersionAvailable) ?>;">
<h2><?php p($l->t('Updates')) ?></h2>
<p id="update-info" ng-show="hasUpdate"
<p id="update-info" ng-show="hasUpdate"
ng-init="newVersion='<?php p($_['version']) ?>'">
<?php print_unescaped($l->t('<strong>A new version is available: {{newVersion}}</strong>')) ?>
</p>
Expand Down Expand Up @@ -51,7 +51,7 @@
</button></p>
<p>
<label for="release-channel"><?php p($l->t('Update channel:')) ?></label>
<select id="release-channel" ng-change="updateChannel()"
<select id="release-channel" ng-change="updateChannel()"
ng-model="releaseChannel" ng-init="releaseChannel='<?php p($_['currentChannel']) ?>'">
<?php foreach ($_['channels'] as $channel => $channelTitle){ ?>
<option value="<?php p($channel) ?>">
Expand All @@ -64,15 +64,14 @@
<p>
<?php p($l->t('Please note update is possible only to a version that is greater than the one currently installed. If you upgraded from a less stable channel you will be able to upgrade from a more stable channel only after the version that is greater than you installed reaches it.')); ?>
</p>
</div>
<div class="section" ng-controller="backupCtrl">
<h2><?php p($l->t('Updater-Backups')) ?></h2>
<div ng-controller="backupCtrl">
<h3><?php p($l->t('Updater-Backups')) ?></h3>
<div class="updater-update">
<h3><?php p($l->t('Note')); ?></h3>
<p>
<?php print_unescaped($l->t('Here you can find backups of the core of your ownCloud <strong>(excluding your data)</strong> after starting an update to a newer version.')); ?>
</p>
<p>
<p>
<?php print_unescaped($l->t('<strong>Please always backup your data separately before updating!</strong>')); ?>
</p>
</div>
Expand Down