@@ -, +, @@ --- .../css/icons.less | 10 ++- .../css/images/commonIcons.png | Bin 1776 -> 1626 bytes .../css/images/commonIconsHover.png | Bin 0 -> 4242 bytes .../debian/changelog | 88 +++++++++++--------- .../debian/ucslint.overrides | 1 + .../resources/00delete.svg | 10 +++ .../resources/01edit.svg | 12 +++ .../resources/02add.svg | 12 +++ .../resources/03report.svg | 12 +++ .../resources/04up.svg | 10 +++ .../resources/05refresh.svg | 14 ++++ .../resources/06play.svg | 11 +++ .../resources/07pause.svg | 11 +++ .../resources/08shutdown.svg | 16 ++++ .../resources/09view.svg | 11 +++ .../resources/10stop.svg | 14 ++++ .../resources/Makefile | 21 +++++ 17 files changed, 211 insertions(+), 42 deletions(-) create mode 100644 branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/css/images/commonIconsHover.png create mode 100644 branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/00delete.svg create mode 100644 branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/01edit.svg create mode 100644 branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/02add.svg create mode 100644 branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/03report.svg create mode 100644 branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/04up.svg create mode 100644 branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/05refresh.svg create mode 100644 branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/06play.svg create mode 100644 branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/07pause.svg create mode 100644 branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/08shutdown.svg create mode 100644 branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/09view.svg create mode 100644 branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/10stop.svg create mode 100644 branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/Makefile --- a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/css/icons.less +++ a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/css/icons.less @@ -71,10 +71,14 @@ .umcIconPlay, .umcIconPause, .umcIconStop, +.umcIconShutdown, .umcIconView { background-image: url(images/commonIcons.png); width: 16px; height: 16px; + &:hover { + background-image: url(images/commonIconsHover.png); + } } .umcIconDelete { @@ -109,7 +113,7 @@ background-position: -112px 0px; } -.umcIconStop { +.umcIconShutdown { background-position: -128px 0px; } @@ -117,6 +121,10 @@ background-position: -144px 0px; } +.umcIconStop { + background-position: -160px 0px; +} + .umcIconLoading { background-image: url(images/loadingAnimation.gif); width: 20px; --- a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/debian/changelog +++ a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/debian/changelog @@ -1,3 +1,10 @@ +univention-management-console-frontend (2.0.256-1) unstable; urgency=low + + * Create new icons (Bug #31411) + * Add UVMM shutdown icon (Bug #21397) + + -- Philipp Hahn Tue, 21 May 2013 19:49:15 +0200 + univention-management-console-frontend (2.0.255-1) unstable; urgency=low * Bug #31293: fixed script tests/post.sh @@ -27,8 +34,7 @@ univention-management-console-frontend (2.0.251-1) unstable; urgency=low * Inside the "favorite" category, favorites can no longer be removed * GalleryPane no longer creates status icon divs for items which - dont't have a 'statusIconClass' - (Bug #29555) + dont't have a 'statusIconClass' (Bug #29555) -- Jascha Geerds Thu, 11 Apr 2013 11:44:25 +0200 @@ -744,7 +750,7 @@ univention-management-console-frontend (2.0.142-1) unstable; urgency=low univention-management-console-frontend (2.0.141-1) unstable; urgency=low - * fix double html encoding; Bug #28928 + * fix double html encoding; Bug #28928 -- Florian Best Fri, 26 Oct 2012 08:18:33 +0200 @@ -800,7 +806,7 @@ univention-management-console-frontend (2.0.134-1) unstable; urgency=low univention-management-console-frontend (2.0.133-1) unstable; urgency=low - * changed default behavior for using UNIX socket; Bug #28043 + * changed default behavior for using UNIX socket; Bug #28043 -- Florian Best Wed, 24 Oct 2012 10:29:24 +0200 @@ -808,7 +814,7 @@ univention-management-console-frontend (2.0.132-1) unstable; urgency=low * restrict access to UMC server to connections from localhost; Bug #28043 * added X-UA-Header for internet explorer to avoid compatibility mode; - Bug #28808 + Bug #28808 -- Florian Best Tue, 23 Oct 2012 17:34:44 +0200 @@ -1056,7 +1062,7 @@ univention-management-console-frontend (2.0.94-1) unstable; urgency=low univention-management-console-frontend (2.0.93-1) unstable; urgency=low - * display reload require dialog only once; Bug #24947 + * display reload require dialog only once; Bug #24947 -- Florian Best Wed, 10 Oct 2012 08:34:48 +0200 @@ -1478,7 +1484,7 @@ univention-management-console-frontend (2.0.31-1) unstable; urgency=low univention-management-console-frontend (2.0.30-1) unstable; urgency=low - * fixed ssl/validity check in umc/app.js Bug #27002 + * fixed ssl/validity check in umc/app.js Bug #27002 -- Felix Botner Fri, 07 Sep 2012 10:36:40 +0200 @@ -1956,7 +1962,7 @@ univention-management-console-frontend (1.0.365-1) unstable; urgency=low univention-management-console-frontend (1.0.364-1) unstable; urgency=low - * fixed actualisation of title in umc.dialog.alert() (Bug #26874) + * fixed actualisation of title in umc.dialog.alert() (Bug #26874) -- Florian Best Fri, 01 Jun 2012 08:41:14 +0200 @@ -2016,7 +2022,7 @@ univention-management-console-frontend (1.0.356-1) unstable; urgency=low univention-management-console-frontend (1.0.355-1) unstable; urgency=low - * map not to False in isFalse() (Bug #27055) + * map not to False in isFalse() (Bug #27055) -- Felix Botner Wed, 09 May 2012 12:06:57 +0200 @@ -2138,7 +2144,7 @@ univention-management-console-frontend (1.0.287-1) unstable; urgency=low univention-management-console-frontend (1.0.286-2) unstable; urgency=low - * added max-height css property for tracebacks in umc.css (Bug #26538) + * added max-height css property for tracebacks in umc.css (Bug #26538) -- Florian Best Mon, 02 Apr 2012 15:44:50 +0200 @@ -2211,7 +2217,7 @@ univention-management-console-frontend (1.0.277-1) unstable; urgency=low univention-management-console-frontend (1.0.276-1) unstable; urgency=low - * fixed LoginDialog for Internet Explorer compatibility mode (Bug #25020) + * fixed LoginDialog for Internet Explorer compatibility mode (Bug #25020) -- Florian Best Mon, 27 Feb 2012 17:18:33 +0100 @@ -2297,7 +2303,7 @@ univention-management-console-frontend (1.0.266-1) unstable; urgency=low univention-management-console-frontend (1.0.265-1) unstable; urgency=low - * fixed reference to umc.tools.umcpCommand in _SelectMixin; Bug #25020 + * fixed reference to umc.tools.umcpCommand in _SelectMixin; Bug #25020 -- Alexander Kläser Sat, 11 Feb 2012 15:18:18 +0100 @@ -2309,7 +2315,7 @@ univention-management-console-frontend (1.0.264-1) unstable; urgency=low univention-management-console-frontend (1.0.263-1) unstable; urgency=low - * fixed hash handling for login.html file; Bug #25020 + * fixed hash handling for login.html file; Bug #25020 -- Alexander Kläser Fri, 10 Feb 2012 19:25:33 +0100 @@ -2341,7 +2347,7 @@ univention-management-console-frontend (1.0.259-1) unstable; urgency=low univention-management-console-frontend (1.0.258-1) unstable; urgency=low - * check if modules are loaded before adding module related + * check if modules are loaded before adding module related notices (Bug #24999) -- Florian Best Wed, 08 Feb 2012 16:50:46 +0100 @@ -2435,7 +2441,7 @@ univention-management-console-frontend (1.0.247-1) unstable; urgency=low univention-management-console-frontend (1.0.246-1) unstable; urgency=low - * Grid: fixed padding of the last column in the grid footer (containing + * Grid: fixed padding of the last column in the grid footer (containing multi-actions) in order to prevent the last element to slip below the other elements (Bug #22881, Comment 14) @@ -2474,7 +2480,7 @@ univention-management-console-frontend (1.0.242-1) unstable; urgency=low univention-management-console-frontend (1.0.241-1) unstable; urgency=low * Form: respect for onValuesInitialized requests that have already be sent - * MultiInput: only cache results of values that are passed over as + * MultiInput: only cache results of values that are passed over as dojo.Deferred objects and reload JavaScript functions every time * umc.render: allow for onChange events (Bug #22461) @@ -2937,13 +2943,13 @@ univention-management-console-frontend (1.0.175-2) unstable; urgency=low univention-management-console-frontend (1.0.174-1) unstable; urgency=low - * fixed focus to default buttons in ConfirmDialogs (Bug #22881) + * fixed focus to default buttons in ConfirmDialogs (Bug #22881) -- Alexander Kläser Fri, 04 Nov 2011 02:06:26 +0100 univention-management-console-frontend (1.0.173-1) unstable; urgency=low - * fixed problem with Button labels positioned below the button (Bug #22881) + * fixed problem with Button labels positioned below the button (Bug #22881) -- Alexander Kläser Thu, 03 Nov 2011 23:51:17 +0000 @@ -3029,7 +3035,7 @@ univention-management-console-frontend (1.0.162-1) unstable; urgency=low univention-management-console-frontend (1.0.161-1) unstable; urgency=low - * umc.dialog: fixed default for unset confirm value (Bug #22881) + * umc.dialog: fixed default for unset confirm value (Bug #22881) -- Alexander Kläser Tue, 01 Nov 2011 10:27:33 +0100 @@ -3041,7 +3047,7 @@ univention-management-console-frontend (1.0.160-1) unstable; urgency=low univention-management-console-frontend (1.0.159-2) unstable; urgency=low - * version bump (Bug #22881) + * version bump (Bug #22881) -- Alexander Kläser Mon, 31 Oct 2011 23:38:20 +0100 @@ -3087,13 +3093,13 @@ univention-management-console-frontend (1.0.154-1) unstable; urgency=low univention-management-console-frontend (1.0.153-1) unstable; urgency=low - * MultiObjectSelect: changed order of buttons (Bug #22881) + * MultiObjectSelect: changed order of buttons (Bug #22881) -- Alexander Kläser Sun, 30 Oct 2011 23:14:16 +0100 univention-management-console-frontend (1.0.152-1) unstable; urgency=low - * fixed build problems in umc/helps.js (Bug #23656) + * fixed build problems in umc/helps.js (Bug #23656) -- Alexander Kläser Sun, 30 Oct 2011 22:53:43 +0100 @@ -3107,19 +3113,19 @@ univention-management-console-frontend (1.0.151-1) unstable; urgency=low univention-management-console-frontend (1.0.150-1) unstable; urgency=low - * added icons (Bug #22881) + * added icons (Bug #22881) -- Alexander Kläser Sun, 30 Oct 2011 22:11:38 +0100 univention-management-console-frontend (1.0.149-1) unstable; urgency=low * StandbyMixin: added property to control overlay opacity (Bug #22881) - + -- Alexander Kläser Sun, 30 Oct 2011 21:09:48 +0100 univention-management-console-frontend (1.0.148-1) unstable; urgency=low - * MultiObjectSelect: adjusted layout + * MultiObjectSelect: adjusted layout * MixedInput/umc.render.layout(): fixed sizeClass handling (Bug #22881) @@ -3133,7 +3139,7 @@ univention-management-console-frontend (1.0.147-1) unstable; urgency=low univention-management-console-frontend (1.0.146-1) unstable; urgency=low - * changed umc.tools.get/setStatus() to status() (Bug #22881) + * changed umc.tools.get/setStatus() to status() (Bug #22881) -- Alexander Kläser Sun, 30 Oct 2011 17:12:59 +0100 @@ -3393,7 +3399,7 @@ univention-management-console-frontend (1.0.109-2) unstable; urgency=low univention-management-console-frontend (1.0.109-1) unstable; urgency=low - * Grid: fixed getAllItems() (Bug #22461) + * Grid: fixed getAllItems() (Bug #22461) -- Alexander Kläser Thu, 20 Oct 2011 16:53:39 +0200 @@ -3554,21 +3560,21 @@ univention-management-console-frontend (1.0.89-1) unstable; urgency=low univention-management-console-frontend (1.0.88-1) unstable; urgency=low * fixed the UmcpModuleStore's onChange event - * fixed reloading error in Tree + * fixed reloading error in Tree (Bug #22881) -- Alexander Kläser Mon, 10 Oct 2011 18:39:32 +0200 univention-management-console-frontend (1.0.87-1) unstable; urgency=low - * fixed problems with choosing English language in the LoginDialog + * fixed problems with choosing English language in the LoginDialog (Bug #22881) -- Alexander Kläser Mon, 10 Oct 2011 16:27:18 +0200 univention-management-console-frontend (1.0.86-1) unstable; urgency=low - * _SelectMixin: added check to detect duplicates for dynamic values + * _SelectMixin: added check to detect duplicates for dynamic values (Bug #22881) -- Alexander Kläser Mon, 10 Oct 2011 11:46:17 +0200 @@ -3767,14 +3773,14 @@ univention-management-console-frontend (1.0.61-1) unstable; urgency=low univention-management-console-frontend (1.0.60-1) unstable; urgency=low - * fixed locale problem (dojo needs 'de-de' and the server 'de_DE') + * fixed locale problem (dojo needs 'de-de' and the server 'de_DE') (Bug #22881) -- Alexander Kläser Tue, 20 Sep 2011 16:34:32 +0200 univention-management-console-frontend (1.0.59-1) unstable; urgency=low - * DateBox: added isValid() function (Bug #23649) + * DateBox: added isValid() function (Bug #23649) -- Alexander Kläser Tue, 20 Sep 2011 15:16:22 +0200 @@ -4261,7 +4267,7 @@ univention-management-console-frontend (0.0.98-1) unstable; urgency=low univention-management-console-frontend (0.0.97-1) unstable; urgency=low - * bug fixes related to user preferences (Bug #22461) + * bug fixes related to user preferences (Bug #22461) -- Alexander Kläser Wed, 03 Aug 2011 12:01:21 +0200 @@ -4374,7 +4380,7 @@ univention-management-console-frontend (0.0.84-1) unstable; urgency=low univention-management-console-frontend (0.0.83-1) unstable; urgency=low - * fixed URL for icon images in umc.widgets.Grid + * fixed URL for icon images in umc.widgets.Grid * use TitlePanes to group fields in an form * changes suggested by jslint (Bug #22461) @@ -4438,7 +4444,7 @@ univention-management-console-frontend (0.0.76-1) unstable; urgency=low univention-management-console-frontend (0.0.75-1) unstable; urgency=low - * mix in all properties specified by the user for the grid column + * mix in all properties specified by the user for the grid column (Bug #22461) -- Alexander Kläser Thu, 14 Jul 2011 15:50:31 +0200 @@ -4464,14 +4470,14 @@ univention-management-console-frontend (0.0.73-1) unstable; urgency=low univention-management-console-frontend (0.0.72-1) unstable; urgency=low - * fixed problems with showing/hiding help text in umc.widgets.Page + * fixed problems with showing/hiding help text in umc.widgets.Page (Bug #22461) -- Alexander Kläser Thu, 07 Jul 2011 15:26:31 +0200 univention-management-console-frontend (0.0.71-1) unstable; urgency=low - * added time to automatically show login screen as soon as the session + * added time to automatically show login screen as soon as the session expires (Bug #22461) -- Alexander Kläser Wed, 06 Jul 2011 15:39:07 +0200 @@ -4526,7 +4532,7 @@ univention-management-console-frontend (0.0.64-1) unstable; urgency=low univention-management-console-frontend (0.0.63-1) unstable; urgency=low - * adaptations for MultiInput + * adaptations for MultiInput * added CSS tweak for CategoryPane and LabelPane for IE (Bug #22461) @@ -4724,7 +4730,7 @@ univention-management-console-frontend (0.0.36-1) unstable; urgency=low univention-management-console-frontend (0.0.35-1) unstable; urgency=low - * API changes for forms, added umc.widgets.SearchForm + * API changes for forms, added umc.widgets.SearchForm * layout for forms is now optional * extended umc.tools.cmpObjects() (Bug #22460) @@ -4772,7 +4778,7 @@ univention-management-console-frontend (0.0.30-1) unstable; urgency=low univention-management-console-frontend (0.0.29-1) unstable; urgency=low - * corrected status error messages, let web server communicate to the + * corrected status error messages, let web server communicate to the frontend all status numbers (Bug #22460) -- Alexander Kläser Thu, 09 Jun 2011 18:12:09 +0200 @@ -4968,7 +4974,7 @@ univention-management-console-frontend (0.0.7-1) unstable; urgency=low univention-management-console-frontend (0.0.6-1) unstable; urgency=low - * added build-dev target to Makefile for online development, fixed module + * added build-dev target to Makefile for online development, fixed module loading (Bug #22461) -- Alexander Kläser Fri, 27 May 2011 12:14:29 +0200 --- a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/debian/ucslint.overrides +++ a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/debian/ucslint.overrides @@ -12,3 +12,4 @@ 0010-2: tmp/dojox/flash/tests/buildFlashTest.sh 0009-2: tmp/dojo/tests/io/upload.cgi 0010-2: lessc +0010-2: resources/Makefile --- a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/00delete.svg +++ a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/00delete.svg @@ -0,0 +1,10 @@ + + + --- a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/01edit.svg +++ a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/01edit.svg @@ -0,0 +1,12 @@ + + + --- a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/02add.svg +++ a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/02add.svg @@ -0,0 +1,12 @@ + + + --- a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/03report.svg +++ a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/03report.svg @@ -0,0 +1,12 @@ + + + --- a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/04up.svg +++ a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/04up.svg @@ -0,0 +1,10 @@ + + + --- a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/05refresh.svg +++ a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/05refresh.svg @@ -0,0 +1,14 @@ + + + --- a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/06play.svg +++ a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/06play.svg @@ -0,0 +1,11 @@ + + + --- a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/07pause.svg +++ a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/07pause.svg @@ -0,0 +1,11 @@ + + + --- a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/08shutdown.svg +++ a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/08shutdown.svg @@ -0,0 +1,16 @@ + + + --- a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/09view.svg +++ a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/09view.svg @@ -0,0 +1,11 @@ + + + --- a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/10stop.svg +++ a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/10stop.svg @@ -0,0 +1,14 @@ + + + --- a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/Makefile +++ a/branches/ucs-3.1/ucs-3.1-2/management/univention-management-console-frontend/resources/Makefile @@ -0,0 +1,21 @@ +#!/usr/bin/make + +SVG := $(sort $(wildcard *.svg)) +PNG := commonIcons.png commonIconsHover.png + +.PHONY: all +all: $(PNG) + +commonIcons.png: $(SVG) + convert -background none -threshold 100% $^ +append $@ + +commonIconsHover.png: $(SVG) + convert -background none $^ +append $@ + +.PHONY: clean +clean:: + $(RM) $(PNG) + +.PHONY: install +install: $(PNG) + install -m644 -t ../css/images/ $^ --