Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #458 from sylus/master

Upstream Updates from Panopoly (Thanks @populist)
  • Loading branch information...
commit b560dd2bf9cf01edc2546531c1ad28204548d8f2 2 parents ab895f4 + 15abedd
@sylus sylus authored
View
8 drupal-org.make
@@ -9,13 +9,13 @@ core = 7.x
projects[panopoly_core][version] = 1.x-dev
projects[panopoly_core][subdir] = panopoly
projects[panopoly_core][download][type] = git
-projects[panopoly_core][download][revision] = 884e817
+projects[panopoly_core][download][revision] = 7bd8f47
projects[panopoly_core][download][branch] = 7.x-1.x
projects[panopoly_images][version] = 1.x-dev
projects[panopoly_images][subdir] = panopoly
projects[panopoly_images][download][type] = git
-projects[panopoly_images][download][revision] = eaf7a75
+projects[panopoly_images][download][revision] = 4791604
projects[panopoly_images][download][branch] = 7.x-1.x
projects[panopoly_theme][version] = 1.x-dev
@@ -33,13 +33,13 @@ projects[panopoly_magic][download][branch] = 7.x-1.x
projects[panopoly_widgets][version] = 1.x-dev
projects[panopoly_widgets][subdir] = panopoly
projects[panopoly_widgets][download][type] = git
-projects[panopoly_widgets][download][revision] = ec86618
+projects[panopoly_widgets][download][revision] = a963a6f
projects[panopoly_widgets][download][branch] = 7.x-1.x
projects[panopoly_admin][version] = 1.x-dev
projects[panopoly_admin][subdir] = panopoly
projects[panopoly_admin][download][type] = git
-projects[panopoly_admin][download][revision] = b5c3e49
+projects[panopoly_admin][download][revision] = 4677fe1
projects[panopoly_admin][download][branch] = 7.x-1.x
projects[panopoly_admin][patch][6478508] = http://drupal.org/files/remove_admin_modules-6478508-05.patch
View
9 modules/custom/wetkit_demo/README.md
@@ -3,22 +3,17 @@ WetKit Demo
Demo content and functionality to help show the power of WetKit
Customizations
-* This App is based on and often pulls upstream from Panopoly Demo @ drupal.org/project/panopoly_demo
-* The latest upstream sync has been checked against commit: 7e742ab (Not Fully Merged)
+* This App was initially based and can sometimes pull upstream from Panopoly Demo @ drupal.org/project/panopoly_demo
* Panopoly Demo is the creation of a prolific drupaler with the handle Populist @ drupal.org/user/58600
-Key features (Panopoly Demo)
+Key features
* Demonstration homepage
* Demonstration content
* Demonstration Views/Panels Integration
* Demonstration pane and region styles
-
-Key Features (WetKit Demo)
* Addition of Context Layouts for Non Panels
* Addition of Strongarm Variables for i18n and WetKit Page Other
* Modification of CTOOLS plugin to include strongarm + context
* Addition of WetKit Homepage Content Panel Page
* hook_menu_alter for front/demo
* Addition of Translation .po files
-* Change of Namespace to WetKit
-* Local Apps Support
View
28 modules/custom/wetkit_images/README.md
@@ -2,27 +2,9 @@ WetKit Images
===============
Provides common image styles and helps make them responsive!
-Important
-* This App is based on and often pulls upstream from Panopoly Images @ drupal.org/project/panopoly_images
-* The latest upstream sync has been checked against commit: 008b68f (Verified)
-* Panopoly Core is the creation of a prolific drupaler with the handle Populist @ drupal.org/user/58600
+Customizations
+* This App extends Panopoly Images @ drupal.org/project/panopoly_images
+* Panopoly Images is the creation of a prolific drupaler with the handle Populist @ drupal.org/user/58600
-Key Features (Panopoly Images)
-* Several image style presets of various sizes
-* Integration with Media.module for style presets
-* Responsive CSS logic for image styles
-
-Key Features Image Styles (Panopoly Images)
-* Featured - Integrated with the featured view mode provided by Panopoly Theme
-* Full - Provides images at full width
-* Half - Provides images at half width
-* Quarter - Provides images at quarter width
-* Spotlight - Integrated with the spotlight entity provided by Panopoly Widgets
-* Square - Provides images cropped to a square ratios
-* Thumbnail - Provides a small thumbnail of the image, suitable for previewing
-
-Key Features (WetKit Core)
-* Addition of new image style: Slider
-* Addition of Translation .po files
-* Change of Namespace to WetKit
-* Local Apps Support
+Key Features
+* Custom Image Styles for WetKit
View
2  modules/custom/wetkit_language/README.md
@@ -2,7 +2,7 @@ WetKit Languages
===============
Integrates multilingual support via Internationalization
-Key Features (WetKit Languages)
+Key Features
* Default Internationalization Configuration
* Language Switcher
* Local Apps Support
View
9 modules/custom/wetkit_pages/README.md
@@ -3,16 +3,13 @@ WetKit Pages
Helps create and manage pages that can be Panelized!
Customizations
-* This App is based on and often pulls upstream from Panopoly Pages @ drupal.org/project/panopoly_pages
-* The latest upstream sync has been checked against commit: cb63437 (Not Fully Merged)
+* This App was initially based and can sometimes pull upstream from Panopoly Pages @ drupal.org/project/panopoly_pages
* Panopoly Demo is the creation of a prolific drupaler with the handle Populist @ drupal.org/user/58600
-Key Features (Panopoly Pages)
+Key Features
* Creation of a "Content Page" content type for basic page management
* Creation of a "Landing Page" workflow for landing page creation
* Panelizer integration for all view modes of the "Content Page"
-
-Key Features (WetKit Demo)
* Addition of Translation .po files
* Change of Namespace to WetKit
-* Local Apps Support
+
View
6 modules/custom/wetkit_search/README.md
@@ -3,8 +3,7 @@ WetKit Search
Indexes and searches site content making it available to both Solr and DB search indexes
Customizations
-* This App is based on and often pulls upstream from Panopoly Search @ drupal.org/project/panopoly_search
-* The latest upstream sync has been checked against commit: 1690a0c (Verified)
+* This App was initially based and can sometimes pull upstream from Panopoly Search @ drupal.org/project/panopoly_search
* Panopoly Search is the creation of a prolific drupaler with the handle Populist @ drupal.org/user/58600
Key Features (Panopoly Search)
@@ -12,6 +11,5 @@ Key Features (Panopoly Search)
* Integration with Search API for database searching
* Integration with and Panelization of Facet API module
* Panelizer search pages for DB and Solr results
-
-Key Features (WetKit Search)
* Addition and Integration of Custom Search
+* Addition and Integration of Search404
View
10 modules/custom/wetkit_widgets/README.md
@@ -0,0 +1,10 @@
+WetKit Widgets
+================
+Allows the creation and reuse of fielded entities to add common types of content to your WetKit pages!
+
+Customizations
+* This App extends Panopoly WYSIWYG @ drupal.org/project/panopoly_wysiwyg
+* Panopoly WYSIWYG is the creation of a prolific drupaler with the handle Populist @ drupal.org/user/58600
+
+Key Features
+* Tabbed Interface Custom Formatter
View
18 modules/custom/wetkit_widgets/README.txt
@@ -1,18 +0,0 @@
-Panopoly Widgets
-================
-Allows the creation and reuse of fielded entities to add common types of content to your Panopoly pages!
-
-Key Features
-* Integration with Link module to provide a list of links
-* Provides the ability to provide an uploaded file
-* Provides the ability to provide an uploaded image
-* Provides the ability to provide a WYSIWYG authored block of text
-* Integration with Simple GMap module to provide a map
-* Integration with Tablefield module to provide a table
-* Integration with Media module to provide an embedded video
-* Provides a custom entity to create a rotating spotlight
-* Integration with Menu Block to provide a submenu
-* Provides a customizable view to add a generic list of content
-* Provides a customizable view to add a generic piece of content
-* Inclusion of default content for Panopoly Widgets
-* UX/UI Improvements for naming and positioning of Chaos Tools plugins
View
12 modules/custom/wetkit_wysiwyg/README.md
@@ -3,19 +3,17 @@ WetKit WYSIWYG
Integrates a WYSIWYG into WetKit
Customizations
-* This App is based on and often pulls upstream from Panopoly WYSIWYG @ drupal.org/project/panopoly_wysiwyg
+* This App was initially based and can sometimes pull upstream from Panopoly WYSIWYG @ drupal.org/project/panopoly_wysiwyg
* The latest upstream sync has been checked against commit: 5bf6584 (Verified)
* Panopoly WYSIWYG is the creation of a prolific drupaler with the handle Populist @ drupal.org/user/58600
-* Integration of Linkit module for adding WYSIWYG Links
-Key Features (Panopoly WYSIWYG)
+Key Features
* The best TinyMCE WYSIWYG in Drupal
* Addition of Kitchen Sink and Spellcheck Plugins
* A good MarkitUp Editor for Drupal
* Switching WYSIWYG + HTML text formats
-
-Key Features (WetKit Demo)
+* Integration of Linkit module for adding WYSIWYG Link
* Addition of classes to wysiwyg filter
* Addition of Translation .po files
-* Change of Namespace to WetKit
-* Local Apps Support
+* Addition of French Language Support
+* Integration of an Accessibility Checker for TinyMCE
View
17 modules/custom/wetkit_wysiwyg/wetkit_wysiwyg.features.filter.inc
@@ -62,13 +62,11 @@ function wetkit_wysiwyg_filter_default_formats() {
br,em,i,strong,cite,code,blockquote,ul,ol,li,dl,dt,dd,
span[style],p[style],
h1,h2,h3,h4,h5,h6,
- img[!src|title|alt|style|width|height|class],
+ img[!src|title|alt|style|width|height|class|hspace|vspace],
@[style]',
'allow_comments' => '1',
'nofollow_policy' => 'disabled',
- 'nofollow_domains' => array(
- 0 => 'openacademy.local',
- ),
+ 'nofollow_domains' => array(),
'style_color' => array(
'color' => 'color',
'background' => 0,
@@ -155,9 +153,9 @@ function wetkit_wysiwyg_filter_default_formats() {
'z-index' => 0,
),
'style_layout' => array(
+ 'float' => 'float',
'clear' => 0,
'display' => 0,
- 'float' => 1,
'position' => 0,
'visibility' => 0,
),
@@ -188,6 +186,7 @@ function wetkit_wysiwyg_filter_default_formats() {
2 => 'tabs-content-pad',
3 => 'wysiwyg-break',
4 => 'wb*',
+ 6 => 'panopoly-*',
),
'rule_valid_ids' => array(),
'rule_style_urls' => array(),
@@ -231,7 +230,7 @@ function wetkit_wysiwyg_filter_default_formats() {
br,em,i,strong,cite,code,blockquote,ul,ol,li,dl,dt,dd,
span[style],p[style],
h1,h2,h3,h4,h5,h6,
- img[!src|title|alt|style|width|height|class],
+ img[!src|title|alt|style|width|height|class|hspace|vspace],
@[style]',
'allow_comments' => '1',
'nofollow_policy' => 'disabled',
@@ -322,9 +321,9 @@ function wetkit_wysiwyg_filter_default_formats() {
'z-index' => 0,
),
'style_layout' => array(
+ 'float' => 'float',
'clear' => 0,
'display' => 0,
- 'float' => 1,
'position' => 0,
'visibility' => 0,
),
@@ -355,7 +354,9 @@ function wetkit_wysiwyg_filter_default_formats() {
4 => 'tabs-content-pad',
6 => 'wb*',
8 => 'wet-boew-*',
- 9 => 'wysiwyg-break',
+ 10 => 'wysiwyg-break',
+ 12 => 'panopoly-*',
+
),
'rule_valid_ids' => array(),
'rule_style_urls' => array(),
View
5 modules/custom/wetkit_wysiwyg/wetkit_wysiwyg.make
@@ -6,11 +6,10 @@ core = 7.x
; The WYSIWYG Module Family
projects[wysiwyg][subdir] = contrib
-projects[wysiwyg][version] = 2.x-dev
+projects[wysiwyg][version] = 2.2
projects[wysiwyg][patch][1489096] = http://drupal.org/files/wysiwyg-table-format.patch
-projects[wysiwyg][patch][356480] = http://drupal.org/files/lazy_wysiwyg-356480-150.patch
projects[wysiwyg][download][type] = git
-projects[wysiwyg][download][revision] = d17bf11
+projects[wysiwyg][download][revision] = 41693f1
projects[wysiwyg][download][branch] = 7.x-2.x
projects[wysiwyg_filter][version] = 1.6-rc2
Please sign in to comment.
Something went wrong with that request. Please try again.