Commit Graph

165 Commits

Author SHA1 Message Date
Lukas Reschke 099234cf12
Add function to request SVG or regular fallback image
Fixes https://github.com/nextcloud/server/issues/4647

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-08 14:51:55 +02:00
Julius Härtl 510f7cf1b6
Fix tests for theming backgroundColor
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-05-08 10:16:30 +02:00
Julius Haertl 4199a56912
Theming app: Add plain background color option
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-05-08 10:16:29 +02:00
Morris Jobke ac04fb8277 Fix invalid theming URLs
* logo and background image had the cache buster applied twice:
  background-image: url(http://192.168.99.100/server/core/img/logo.svg?v=0?v=0);

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-05 00:37:32 -03:00
Julius Härtl 7c69c117e2
Delete theming images when logo/background is reset to default
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-30 11:04:55 -03:00
Julius Härtl 6e215a0874
Code cleanup and preview for undo actions
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-29 00:40:15 -03:00
Julius Härtl b436e43d68
Make sure that ThemingDefaults uses the correct default values from \OC_Defaults
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-29 00:40:15 -03:00
Julius Härtl 6b8341ce4b
Use generated SCSS for theming preview
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-29 00:40:15 -03:00
Joas Schilling bedd500884
Logo and background URLs must be relative
They are used way to often for such a change

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 11:43:06 +02:00
Julius Härtl bc1efdf2e1
Fix theming tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-04-25 11:39:49 +02:00
Julius Haertl 68a63ad3f3
Implement scss variable injection by OC_Defaults
Signed-off-by: Julius Haertl <jus@bitgrid.net>

Add Scss variables to example theme and theming app

Signed-off-by: Julius Haertl <jus@bitgrid.net>

Use SCSSCacher to build theming css

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Update theming.scss

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Code cleanup

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Inject SCSSCacher for easier testing

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix typehint

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Generate absolute URLs

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Fix tests to always use absolute urls for theming images

Signed-off-by: Julius Härtl <jus@bitgrid.net>

MailheaderColor -> ColorPrimary

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-25 11:39:45 +02:00
Joas Schilling 8c703c954d
Fix theming tests
Trying to configure method "shouldReplaceIcons" which cannot be configured
because it does not exist, has not been specified, is final, or is static

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 13:10:34 +02:00
Morris Jobke d83c8e0271
ThemingDefaults append cacheBusterCounter to logo URL by default
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-09 21:43:09 -05:00
Morris Jobke 5b4adf66e5
Move OC_Defaults to OCP\Defaults
* currently there are two ways to access default values:
  OCP\Defaults or OC_Defaults (which is extended by
  OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
  it hard to work on theme values
* this extended the public interface with the missing
  methods and uses them everywhere to only rely on the
  public interface

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-09 21:43:01 -05:00
Lukas Reschke 281ad406e8
Add support for theming
Add support for theming in generated emails and simplify API

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-07 12:03:47 -05:00
Jan-Christoph Borchardt 9a75714c22
rename confusing getMailHeaderColor to getColorPrimary, ref #3491
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-03-29 18:23:23 +02:00
Joas Schilling b3556456b6
Don't use private api
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 11:32:29 +01:00
Joas Schilling e8750f618b
Correctly escape the footer description from theming
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 09:11:41 +01:00
Julius Haertl b2cbe3530d
Use ::class in tests and correct import
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-16 15:13:39 +01:00
Julius Haertl 88a0ef7d4a
Add tests for theming migration step
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-16 15:13:38 +01:00
Julius Haertl 60d77ceccb
Add repair step to move existing theming images
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-16 15:13:38 +01:00
Julius Haertl 6a9d5d60dc
Move theming images to AppData
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-16 15:13:38 +01:00
blizzz 64e9a1aec0 Merge pull request #3176 from nextcloud/default-value-datadir
Add proper default value for datadir
2017-01-30 13:01:24 +01:00
Morris Jobke e09bba5e36 Merge pull request #3151 from nextcloud/navigation-icons
add icons to navigation of personal & admin settings
2017-01-24 10:56:31 -06:00
Morris Jobke a4ad8af6e3
Add proper default value for datadir
* better safe than sorry
* fixes #3091

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-19 19:49:41 -06:00
Morris Jobke 8565011b8d Merge pull request #3144 from nextcloud/use-data-download-response
Use DataDownloadResponse
2017-01-19 15:36:31 -06:00
Joas Schilling 17a7eaabcd
Add the icons for shipped apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-19 10:42:22 +01:00
Morris Jobke 3798f842c0
theme app navigation menu highlight color
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-18 21:42:50 -06:00
Lukas Reschke be3ec7ffb7
Use DataDownloadResponse
1. As documented
2. No need to show this inline, downloading has security advantages

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-18 17:00:09 +01:00
Björn Schießle d10be51d40 Merge pull request #2588 from nextcloud/theming-check-empty
Check if image files for theming are empty
2016-12-09 15:57:44 +01:00
Julius Haertl 5fbadee95f
Check if image files for theming are empty
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-09 12:54:03 +01:00
Julius Haertl 366f14d7db
Add fallback to FILTER_LANCZOS for icon resizing
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-09 11:53:27 +01:00
Julius Haertl fd6670ae72
Fix transparency of icons
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-04 13:38:37 +01:00
Julius Haertl f423bdcb81
Fix background border radius
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-04 13:38:36 +01:00
Julius Haertl 797e761492
Move sizing to renderAppIcon method
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-04 13:38:29 +01:00
Julius Haertl 6c4664bc82
Workaround for PHP bug when calling imagescale
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-22 12:12:59 +01:00
Morris Jobke faee255ff4 Merge pull request #840 from nextcloud/theming-icon-endpoint
Add dynamic icon creation
2016-11-18 15:35:34 +01:00
Robin Appelman 8b9ad46ba3 Merge pull request #768 from nextcloud/s3-objectstore
Add S3 objectstore backend
2016-11-18 14:55:07 +01:00
Julius Haertl 2ab4d1e0a3
Use IAppManager instead of OC_App
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 11:07:44 +01:00
Julius Haertl d409fe1c52
Error handling and tests if file was not found
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:25 +01:00
Julius Haertl 78de213b85
Sanitize input and small fixes
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:25 +01:00
Julius Haertl 3a400f92d1
Replace null return with NotFoundException
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:25 +01:00
Julius Haertl cc8b1d3829
Fix icon-folder css
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:24 +01:00
Julius Haertl 43097eabee
Fix svg resizing and remove deprecated method call
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:24 +01:00
Julius Haertl 2e8dd21815
Improve caching
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:24 +01:00
Julius Haertl 492d0b9f9b
Caching for icon files using AppData
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:24 +01:00
Julius Haertl 9e28a3ba12
Theming: Code cleanup and cache buster for mime icons
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:24 +01:00
Julius Haertl 237034818d
Check if dynamic icons can be used
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:24 +01:00
Julius Haertl af8976ab03
Add IconBuilder class to encapsulate icon generation
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:24 +01:00
Julius Haertl b466628bfd
Improve unit tests for image generation
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:23 +01:00
Julius Haertl ac7f852ed9
Theming: Add IconController tests
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:23 +01:00
Julius Haertl 4945592a86
Fix IconController after rebase
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:23 +01:00
Julius Haertl 6c7ebb1204
Theming: Add icon caching
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:23 +01:00
Julius Haertl d1fcfe8e7d
Theming: Add colorized icon css from icons.css
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:23 +01:00
Julius Haertl c7adcb85ae
Theming: Fix default parameters in icon routes
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:23 +01:00
Julius Haertl 64510bd87a
Theming: Add PHPdoc and icon fallback to theming logo
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:22 +01:00
Julius Haertl 2d65b8c600
Theming: Add favicon-touch and fix icon creation with non svg images
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:22 +01:00
Julius Haertl b3eab7db01
Theming: Add dynamic icon and favicon endpoints
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:22 +01:00
Robin Appelman eb21dc2bd3
fix theming images when using primary storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-16 15:30:36 +01:00
Julius Haertl 520f2f6221
Revert "Fix #1782"
This reverts commit bc5268bdc8.

Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-16 13:52:51 +01:00
John Molakvoæ bc5268bdc8
Fix #1782
Fix checkbox left margin glitch
Fix tests
fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-02 15:07:24 +01:00
Jan-Christoph Borchardt cbd9fb3c5c also fix log in button confirm arrow when theming, fix #1615
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-10-25 14:24:24 +02:00
Jan-Christoph Borchardt 551cffd1b8 remove slight transparency of primary action button, ref #1615
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-10-25 13:16:13 +02:00
Joas Schilling 67408c3f63
Add image URLs and tests 2016-09-06 08:55:22 +02:00
Joas Schilling 1d834bd49e
Add theming information to capabilities for the client 2016-09-05 14:27:19 +02:00
Julius Haertl d43c9b9e79
Theming: fix primary button for bright colors 2016-08-29 19:07:27 +02:00
iamfool e13cd289cb Update Admin.php 2016-08-28 18:02:45 -07:00
Lukas Reschke 683f0e7f77
Use temporary file as cache 2016-08-27 21:38:41 +02:00
Lukas Reschke 73bc108451
Increase theming performance
1. Set proper caching headers (`Pragma: cache`)
2. Resize image proportionally to a max size of 1920px
3. Store images with progressive mode

This resizes a previous 2.8 MB picture to 300kb and makes it rendering going down from 11 seconds to less than 1 here. And future requests won't have to download the file newly.
2016-08-27 21:02:08 +02:00
Roeland Jago Douma 53725d4d15 Merge pull request #771 from nextcloud/theming-fixes
Theming: Fix missing color usage
2016-08-26 15:02:21 +02:00
Julius Haertl d95aec2ed2
Theming: Add preview for login screen 2016-08-26 12:08:12 +02:00
Julius Haertl 218e2f7850
Theming: Adjust jquery ui elements 2016-08-26 12:07:52 +02:00
Julius Haertl 2b0ed6c27a
Theming: colorize primary buttons 2016-08-26 12:07:52 +02:00
Roeland Jago Douma 044d7c3bb7 Merge pull request #1026 from nextcloud/theming-extend-defaults
Theming: Add logo and background to ThemingDefaults
2016-08-26 11:53:24 +02:00
Roeland Jago Douma 60974de97b
Require a ThemingDefaults class again 2016-08-24 13:22:44 +02:00
Joas Schilling c7c53aefb2
Use the lazy root to make tests pass 🙈 2016-08-24 09:52:05 +02:00
Julius Haertl 80fe499707
Theming: Add logo and background to ThemingDefaults 2016-08-24 00:40:22 +02:00
Arthur Schiwon a065fee3ff
fixes registering of theming settings where server return OC_Defaults instead of ThemingDefaults 2016-08-22 12:02:06 +02:00
Lukas Reschke 8a7a0f3287
Add unit tests 2016-08-15 16:25:34 +02:00
Arthur Schiwon 0c15081279
rename remaining occurences of OCA/Theming/Template 2016-08-12 16:00:39 +02:00
Bjoern Schiessle 18fd8ff70c
rename "Tenmplate" to "ThemingDefaults" to make the auto loader happy" 2016-08-12 15:32:28 +02:00
Lukas Reschke 8261ccce1b
Merge branch 'master' into implement_712 2016-08-11 19:37:17 +02:00
Arthur Schiwon 36c1b7eb31
adjust Theming app 2016-08-11 17:29:58 +02:00
Julius Haertl 5f4e88ef6c
Theming: Add OCA.Theming Js for app interaction 2016-08-10 13:39:21 +02:00
Julius Haertl ef17f8b3ba
Add css classes to allow app developers using the theming colors 2016-08-09 22:54:25 +02:00
Morris Jobke dbf3ca5baf Merge pull request #682 from nextcloud/fix-theming-logo
fix missing semicolon to fix themed logo on log in page
2016-08-01 19:50:42 +02:00
Jan-Christoph Borchardt ad5e98c81a fix missing semicolon to fix themed logo on log in page 2016-08-01 09:57:05 +02:00
Joas Schilling 13c19e5286
Validate the input of the theming options 2016-08-01 09:37:12 +02:00
Joas Schilling 5306b4feba
Fix tests 2016-07-28 17:49:08 +02:00
Joas Schilling ba558664cf
Use the methods on the Response object 2016-07-28 17:49:08 +02:00
Joas Schilling 7efadf7b6b
Move classes to PSR-4 2016-07-28 17:49:08 +02:00
Bjoern Schiessle 14ca7c9cdc
fix background id selector for the first run wizard 2016-07-28 16:32:39 +02:00
Bjoern Schiessle be365b4975
re-use background color from theme in the firstrunwizard 2016-07-28 12:16:39 +02:00
Bjoern Schiessle 583f86d90a
apply theme to the firstrunwizard 2016-07-28 12:15:33 +02:00
Julius Haertl cc457cd665
Theming: Generate colorized radio buttons dynamically 2016-07-27 20:00:23 +02:00
Julius Haertl 7ff19e342e
Theming: Colorize radio buttons and append new styles on preview 2016-07-27 20:00:23 +02:00
Julius Haertl acd1172998
Theming: Clean up css generation and fix tests 2016-07-27 19:54:54 +02:00
Julius Haertl d07f04e4f7
Theming: Colorize checkboxes depending on luminance 2016-07-27 19:45:57 +02:00
Julius Haertl 9ebe0c8d64
Colorize checkboxes depending on theming color 2016-07-27 19:45:57 +02:00
Joas Schilling cc5ddcf537 Merge pull request #525 from nextcloud/fix-theme-logo-position
Fix theme logo position and shape
2016-07-26 10:46:13 +02:00