Theming: Add preview and hide undo buttons #770
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@juliushaertl, thanks for your PR! By analyzing the annotation information on this pull request, we identified @schiessle, @LukasReschke and @nickvergessen to be potential reviewers |
5 tasks
juliushaertl
added
3. to review
|
OK, CI seems to be happy, please review. cc @jancborchardt @nextcloud/theming |
| public function getLogo() { | ||
| $logo = $this->config->getAppValue('theming', 'logoMime'); | ||
| $pathToLogo = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data/') . '/themedinstancelogo'; | ||
| if(!$logo || !file_exists($pathToLogo)) { |
There was a problem hiding this comment.
Can you use IRootFolder for that? @schiessle told me about some object store magic and so on that otherwise would not be compatible.
There was a problem hiding this comment.
Yes, always use the Nextcloud file system abstraction to make sure that it works with all underlying storages.
|
I like it 👍 @schiessle Mind taking a look at my remarks? Same as we had in the ThemingController itself |
|
I tested this and it works 👍 (only for translated slogans this doesn't work, because somehow the lib translation files aren't loaded -> but this is not caused by the code in here) |
|
As soon as the comments by @LukasReschke are addressed this can be merged. |
|
I've just pushed another commit. Please check if it is ok like this @LukasReschke @schiessle 😃 |
juliushaertl
force-pushed
the
theming-improvements
branch
from
5447965
to
232cd38
Compare
|
Hmm tests are failing, but I don't have any idea why: |
|
cc @icewind1991 any idea? 🚀 |
10 tasks
| @@ -32,3 +32,17 @@ | |||
| div#theming_settings_msg { | |||
| margin-left: 10px; | |||
| } | |||
|
|
|||
| #theming-preview { | |||
| width:230px; | |||
There was a problem hiding this comment.
Just a nitpick, but coding style here and below: Always a space after the : colon. ;)
juliushaertl
force-pushed
the
theming-improvements
branch
from
232cd38
to
5eb5d1b
Compare
rullzer
force-pushed
the
theming-improvements
branch
from
5eb5d1b
to
8e5eb01
Compare
|
any news here... @icewind1991 did you had a chance to look at the failing tests? |
juliushaertl
force-pushed
the
theming-improvements
branch
from
8e5eb01
to
cc9dac3
Compare
juliushaertl
added
2. developing
juliushaertl
force-pushed
the
theming-improvements
branch
from
cc9dac3
to
0e1b5d4
Compare
|
Ok, i've just rebased this to fix the conflicts with the new admin panel. Tests are still failing, but when I run "drone exec" locally everything works fine. Could there be an issue with the CI server? |
|
It's in
usually not, because it also doesn't do anything different 😕 Let me try it locally too. |
|
Works here too ... I restarted the job at the drone instance ... maybe it was a bad race condition due to load. |
|
I guess it's related to the loading order |
juliushaertl
force-pushed
the
theming-improvements
branch
from
0e1b5d4
to
91e8b33
Compare
| max-width: 20%; | ||
| max-height: 20%; | ||
| margin-top: 20px; | ||
| } |
juliushaertl
force-pushed
the
theming-improvements
branch
from
ba6698d
to
086b6ab
Compare
|
OK, I'll close this PR and try to split it up and resubmit. |
This was referenced Aug 23, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull requests adds the following to the theming app: