-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fc] Repository: plonetheme.barceloneta
Branch: refs/heads/master Date: 2016-01-24T22:52:43+01:00 Author: Coen van der Kamp (allcaps) <[email protected]> Commit: plone/plonetheme.barceloneta@a02d0e6 Follow Plone best practice on readme Files changed: M CHANGES.rst M README.rst Repository: plonetheme.barceloneta Branch: refs/heads/master Date: 2016-01-24T20:49:12-05:00 Author: Nathan Van Gheem (vangheem) <[email protected]> Commit: plone/plonetheme.barceloneta@16bec81 Merge pull request #79 from plone/allcaps-readme Follow Plone best practice on readme Files changed: M CHANGES.rst M README.rst
- Loading branch information
Showing
1 changed file
with
113 additions
and
38 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,55 +1,130 @@ | ||
Repository: mockup | ||
Repository: plonetheme.barceloneta | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2016-01-24T20:34:23-05:00 | ||
Author: nathan.vangheem () <[email protected]> | ||
Commit: https://github.com/plone/mockup/commit/f3d294f38b8cc5248eaf4ddfa6c5642ca2246466 | ||
Date: 2016-01-24T22:52:43+01:00 | ||
Author: Coen van der Kamp (allcaps) <[email protected]> | ||
Commit: https://github.com/plone/plonetheme.barceloneta/commit/a02d0e6fd5e1438e42244dd8724df7cf528f4df6 | ||
|
||
be able to use multiple importcss_file_filter files | ||
Follow Plone best practice on readme | ||
|
||
Files changed: | ||
M CHANGES.rst | ||
M mockup/patterns/tinymce/pattern.js | ||
M README.rst | ||
|
||
diff --git a/CHANGES.rst b/CHANGES.rst | ||
index bed7931..9f75a2d 100644 | ||
index 73c431b..195dff9 100644 | ||
--- a/CHANGES.rst | ||
+++ b/CHANGES.rst | ||
@@ -8,6 +8,9 @@ New: | ||
@@ -11,7 +11,8 @@ New: | ||
|
||
Fixes: | ||
|
||
+- be able to use multiple importcss_file_filter files | ||
+ [vangheem] | ||
+ | ||
- Calculate z-index for modals dynamically to always be on top | ||
[vangheem] | ||
|
||
diff --git a/mockup/patterns/tinymce/pattern.js b/mockup/patterns/tinymce/pattern.js | ||
index 707dee1..14e9dfe 100644 | ||
--- a/mockup/patterns/tinymce/pattern.js | ||
+++ b/mockup/patterns/tinymce/pattern.js | ||
@@ -398,6 +398,20 @@ define([ | ||
self.$el.hide(); | ||
} | ||
|
||
+ if(tinyOptions.importcss_file_filter && tinyOptions.importcss_file_filter.indexOf(',') !== -1){ | ||
+ // need a custom function to check now | ||
+ var files = tinyOptions.importcss_file_filter.split(','); | ||
+ | ||
+ tinyOptions.importcss_file_filter = function(value) { | ||
+ for(var i=0; i<files.length; i++){ | ||
+ if(value.indexOf(files[i]) !== -1){ | ||
+ return true; | ||
+ } | ||
+ } | ||
+ return false; | ||
+ }; | ||
+ } | ||
+ | ||
tinymce.init(tinyOptions); | ||
self.tiny = tinymce.get(self.tinyId); | ||
-- *add item here* | ||
+- Follow best practice for readme.rst | ||
+ [allcaps] | ||
|
||
|
||
1.6.16 (2016-01-08) | ||
diff --git a/README.rst b/README.rst | ||
index b2fb514..9657677 100644 | ||
--- a/README.rst | ||
+++ b/README.rst | ||
@@ -1,2 +1,26 @@ | ||
-Barceloneta, a theme for Plone 5 | ||
-================================ | ||
\ No newline at end of file | ||
+============ | ||
+ Barceloneta | ||
+============ | ||
+------------------------------ | ||
+ The default theme for Plone 5 | ||
+------------------------------ | ||
+ | ||
+`Latest version on PyPI <https://pypi.python.org/pypi/plonetheme.barceloneta>`_ | ||
+ | ||
+Documentation | ||
+============= | ||
+ | ||
+`Plonetheme.barceloneta documentation <http://docs.plone.org/adapt-and-extend/theming/barceloneta.html>`_ is part of the official Plone documentation. | ||
+ | ||
+Source Code and Contribution | ||
+============================ | ||
+ | ||
+Contributors | ||
+ please read the document `Process for Plone core's development <http://docs.plone.org/develop/coredev/docs/index.html>`_. | ||
+ Also consult the section about contribution in the `plone.api contributors documentation <http://docs.plone.org/develop/plone.api/docs/contribute/index.html>`_. | ||
+ | ||
+Source-Code | ||
+ at the `Plone code repository hosted at Github <https://github.com/plone/plonetheme.barceloneta>`_. | ||
+ | ||
+Issues | ||
+ Please use the `Issue-Tracker <https://github.com/plone/plonetheme.barceloneta/issues>`_ | ||
|
||
|
||
Repository: plonetheme.barceloneta | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2016-01-24T20:49:12-05:00 | ||
Author: Nathan Van Gheem (vangheem) <[email protected]> | ||
Commit: https://github.com/plone/plonetheme.barceloneta/commit/16bec817214e83c21e5de6e866661d71d817772f | ||
|
||
Merge pull request #79 from plone/allcaps-readme | ||
|
||
Follow Plone best practice on readme | ||
|
||
Files changed: | ||
M CHANGES.rst | ||
M README.rst | ||
|
||
diff --git a/CHANGES.rst b/CHANGES.rst | ||
index 73c431b..195dff9 100644 | ||
--- a/CHANGES.rst | ||
+++ b/CHANGES.rst | ||
@@ -11,7 +11,8 @@ New: | ||
|
||
Fixes: | ||
|
||
-- *add item here* | ||
+- Follow best practice for readme.rst | ||
+ [allcaps] | ||
|
||
|
||
1.6.16 (2016-01-08) | ||
diff --git a/README.rst b/README.rst | ||
index b2fb514..9657677 100644 | ||
--- a/README.rst | ||
+++ b/README.rst | ||
@@ -1,2 +1,26 @@ | ||
-Barceloneta, a theme for Plone 5 | ||
-================================ | ||
\ No newline at end of file | ||
+============ | ||
+ Barceloneta | ||
+============ | ||
+------------------------------ | ||
+ The default theme for Plone 5 | ||
+------------------------------ | ||
+ | ||
+`Latest version on PyPI <https://pypi.python.org/pypi/plonetheme.barceloneta>`_ | ||
+ | ||
+Documentation | ||
+============= | ||
+ | ||
+`Plonetheme.barceloneta documentation <http://docs.plone.org/adapt-and-extend/theming/barceloneta.html>`_ is part of the official Plone documentation. | ||
+ | ||
+Source Code and Contribution | ||
+============================ | ||
+ | ||
+Contributors | ||
+ please read the document `Process for Plone core's development <http://docs.plone.org/develop/coredev/docs/index.html>`_. | ||
+ Also consult the section about contribution in the `plone.api contributors documentation <http://docs.plone.org/develop/plone.api/docs/contribute/index.html>`_. | ||
+ | ||
+Source-Code | ||
+ at the `Plone code repository hosted at Github <https://github.com/plone/plonetheme.barceloneta>`_. | ||
+ | ||
+Issues | ||
+ Please use the `Issue-Tracker <https://github.com/plone/plonetheme.barceloneta/issues>`_ | ||
|
||
|