diff --git a/README.md b/README.md index d6da2e7f..9cdaba19 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,11 @@ [YunoHost](https://yunohost.org) administration web interface (JS client for the API). -This client is a part of the YunoHost projet, and can not be installed directly. Please visit YunoHost website for [installation instructions](https://yunohost.org/install). +This client is a part of the YunoHost project, and can not be installed directly. Please visit the YunoHost website for [installation instructions](https://yunohost.org/install). ## Bug tracker -Please report issues on the [YunoHost Bugtracker](https://github.com/YunoHost/issues). +Please report issues on the [YunoHost bugtracker](https://github.com/YunoHost/issues). ## Translate @@ -14,9 +14,9 @@ Please report issues on the [YunoHost Bugtracker](https://github.com/YunoHost/is ## Contributing -Feel free to improve the plugin and send us a pull request. +Feel free to improve the plugin and send a pull request. -We use `gulp` to compile Less files and minify the JavaScript. Assuming [nodejs](http://nodejs.org/) is installed, you can install dependencies and run a build with: +`gulp` is used to compile Less files and minify the JavaScript. Assuming [nodejs](http://nodejs.org/) is installed, you can install dependencies and run a build with: ```sh cd src @@ -24,12 +24,12 @@ npm install npm run build ``` -Alternatively you can run `npm run build-dev` which improves building speed by bypassing compression tasks. +Alternatively you can run `npm run build-dev`, which improves building speed by bypassing compression tasks. On a YunoHost instance, the web admin files are located at `/usr/share/yunohost/admin`. **Note:** The `.ms` - moustache - files are cached by the browser. You have to -reach them manually some times you modify them. (e.g. go to +reach them manually, and sometimes you modify them. (e.g. go to https://example.com/yunohost/admin/views/domain/domain_list.ms) ## Dependencies @@ -38,4 +38,4 @@ https://example.com/yunohost/admin/views/domain/domain_list.ms) * Font-Awesome 4.5.0 * Handlebars 1.3.0 * Sammy 0.7.6 -* Jquery-Cookie 2.1.0 +* JS-cookie 2.1.0 diff --git a/debian/changelog b/debian/changelog index 064cb642..ff487df3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +yunohost-admin (3.7.0) testing; urgency=low + + - [enh] Add UI for groups and permissions (YunoHost-admin#257) + - [mod] Rework migration system to have independent migrations (YunoHost-admin#258) + - [enh] Quite a lot of messages improvements, string cleaning, language rework... (YunoHost-admin/10ea04a, YunoHost-admin#265) + - [i18n] Improved translations for Catalan, Occitan, French, Esperanto, Arabic, German, Spanish, Norwegian Bokmål, Portuguese + - [fix] Inline buttons responsiveness on migration screen (YunoHost-admin#259) + + Thanks to all contributors <3 ! (accross all repo: Yunohost, Moulinette, SSOwat, Yunohost-admin) : advocatux, Aksel K., Aleks, Allan N., amirale qt, Armin P., Bram, ButterflyOfFire, Carles S. A., chema o. r., decentral1se, Emmanuel V., Etienne M., Filip B., Geoff M., htsr, Jibec, Josué, Julien J., Kayou, liberodark, ljf, lucaskev, Lukas D., madtibo, Martin D., Mélanie C., nr 458 h, pitfd, ppr, Quentí, sidddy, troll, tufek yamero, xaloc33, yalh76 + + -- Alexandre Aubin Thu, 31 Oct 2019 19:00:00 +0000 + yunohost-admin (3.6.5) stable; urgency=low - [fix] Stupid / buggy error handling for postinstall (2187657) diff --git a/src/bower.json b/src/bower.json index 0d0e89f5..1928e289 100644 --- a/src/bower.json +++ b/src/bower.json @@ -5,7 +5,7 @@ "private": true, "dependencies": { "bootstrap": "3.3.6", - "font-awesome": "4.5.0", + "fork-awesome": "1.1.7", "handlebars-helper-intl": "1.1.2", "handlebars": "4.0.11", "sammy": "0.7.6", diff --git a/src/css/style.less b/src/css/style.less index 5bc11ee1..21b27fa8 100644 --- a/src/css/style.less +++ b/src/css/style.less @@ -25,7 +25,7 @@ /* * FontAwesome */ -@import "../bower_components/font-awesome/less/font-awesome.less"; +@import "../bower_components/fork-awesome/less/fork-awesome.less"; // Fixes @@ -101,6 +101,10 @@ button { color: transparent; } +.label { + border-radius: 1px; +} + /* * The top heading of the doc * @@ -221,15 +225,15 @@ button { * Page footer * */ -.page-footer { +#page-footer { .clearfix; .make-row(12); margin: 20px 0; padding-top: 20px; + margin-top: 40px; border-top: 1px solid #eee; color: #999; font-size: 0.9em; - text-align: right; a { color: #666; &:hover, @@ -237,6 +241,41 @@ button { } } +#page-footer-links { + text-align: left; + float: left; + + a { + display: inline-block; + } + + a::before { + content: "•"; + display: inline-block; + vertical-align: top; + padding: 0 0.5em 0 0.25em; + } + a:first-child:before {content: none;} +} + +#yunohost-version { + text-align: right; + float: right; +} + +@media screen and (max-width: @screen-xs-min) { + #yunohost-version { + text-align: center; + float: none; + } + #page-footer-links { + text-align: center; + float: none; + } +} + + + /* * The pop up dialog * @@ -558,6 +597,10 @@ input[type='radio'].nice-radio { border-radius: 5px; } +.messages div:not(:first-child) .progress { + display: none; +} + .messages .progress-bar-striped { background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.4) 50%, rgba(255, 255, 255, 0.5) 75%, transparent 75%, transparent); } @@ -659,6 +702,62 @@ input[type='radio'].nice-radio { } +/** Groups View **/ +#view-groups { + .panel-heading a { + text-decoration: none; + &.group-delete { + float:right; + color:lighten(@label-danger-bg, 20%); + :hover { + color:@label-danger-bg; + } + } + } + .panel-body { + h3 { + margin-top:0; + } + button.dropdown-toggle { + line-height: 15.666px; + top: -1.666px; + } + .dropdown-menu { + max-height: 200px; + overflow-y: auto; + } + .label-removable { + // The following match properties from regular btn's + display:inline-block; + font-size:14px; + color:#333; + background-color:#f8f8f8; + border: #ccc 1px solid; + font-weight: normal; + margin-bottom:0; + position: relative; + top: -1.666px; + height: 29.666px; + vertical-align: middle; + padding: 6px 12px; + + margin-right:7px; // Spacing between labels + + > a { + margin-left:6px; + padding-left:6px; + border-left: #ccc 1px solid; + color:lighten(@label-info-bg,20); + + text-decoration: none; + } + > a:hover { + color:@label-info-bg; + } + } + } +} + /** Flash messages **/ #flashMessage { max-height: 120px; diff --git a/src/gulpfile.js b/src/gulpfile.js index 5875faf9..e5f183e8 100644 --- a/src/gulpfile.js +++ b/src/gulpfile.js @@ -71,7 +71,7 @@ gulp.task('js-lint', function() { // Fonts gulp.task('fonts', function() { return gulp.src([ - 'bower_components/font-awesome/fonts/*', + 'bower_components/fork-awesome/fonts/*', 'bower_components/source-code-pro/EOT/*.eot', 'bower_components/source-code-pro/OTF/*.otf', 'bower_components/source-code-pro/TTF/*.ttf', diff --git a/src/index.html b/src/index.html index 4d032f17..377f1727 100644 --- a/src/index.html +++ b/src/index.html @@ -60,8 +60,13 @@ -