From 5bf5fcda99a1e7780e2e137c996fcb31e360a5bc Mon Sep 17 00:00:00 2001 From: callison Date: Mon, 7 Mar 2011 09:09:28 +0700 Subject: [PATCH 1/3] Added Lliss' files --- pullquote.css | 375 +++++++++++++++++++++++++++++++++++++++++++++++++++-- pullquote.inc | 47 +++++++ pullquote.install | 19 +++ pullquote.module | 46 ++++--- 4 files changed, 459 insertions(+), 28 deletions(-) create mode 100644 pullquote.inc create mode 100644 pullquote.install diff --git a/pullquote.css b/pullquote.css index f5645a6..90c8405 100644 --- a/pullquote.css +++ b/pullquote.css @@ -1,3 +1,5 @@ +/* $Id: pullquote.css,v 1.1 2010/09/07 21:40:06 stuckagain Exp $ */ + /** * @file * Styles for pullquote module. @@ -8,26 +10,379 @@ } .pullquote-quote { + float: right; + margin: 0 0 0.4em 1em; +} + +.pullquote-quote.pullquote-left { + float: left; + margin: 0em 1em 0.4em 0em; +} + +/* Style 1 */ + +.pullquote-style1 { background: #E8E8E8; border: 1px solid #AAA; color: #333; - float: right; font: italic 1em Georgia, "Times New Roman", Times, serif; line-height: 1.7em; - margin: 1em 0 0.4em 1em; padding: 1em; width: 30%; } -.pullquote-quote .pullquote-left { - float: left; - margin-left: 0; - margin-right: 1em; -} -/* inserts quotation marks around pullquoted text */ -span.pullquote-quote:before { +.pullquote-style1:before { content: open-quote; } -span.pullquote-quote:after { +.pullquote-style1:after { content: close-quote; } + +/* Style 2 */ + +.pullquote-style2 { + background: #f5f5f5; + border-left: 0.8em solid #ccc; + font: italic 120% Georgia, "Times New Roman", Times, serif; + padding: 0.75em; + width: 30%; +} + +.pullquote-style2:first-letter { + font-size: 250%; + font-weight: bold; +} + +.pullquote-style2-author { + display:block; + text-align: right; + font-size:0.75em; + margin: 1em 0 0 0; + line-height: 1.2em; + font-style: normal; + font-weight: bold; +} + +/* Style 3 + +-----------------*/ + +.pullquote-style3 { + background: #ffffcc; + border: 5px double gold; + border-width: 5px 0; + color: #CC6600; + font: bold 150% Arial, Helvetica, sans-serif; + padding: 0.5em 0.75em; + width: 30%; +} + +.pullquote-style3-author { + display:block; + text-align: right; + font-size:0.65em; + margin: 1em 0 0 0; + line-height: 1.2em; + font-style: italic; +} + +/* Style 4 */ + +.pullquote-style4 { + background: #E8DFFF; + border-bottom: 0.8em solid #CBC3DF; + color: #666; + font: italic 120% "Trebuchet MS", "Lucida Grande", sans-serif; + padding: 0.5em 1em; + width: 30%; +} + +.pullquote-style4-author { + display:block; + color: #333; + text-align: right; + font-style: normal; + font-size:0.8em; + padding: 0; + font-weight: bold; +} + +/* Style 5 */ + +.pullquote-style5 { + background: #363F23; + border: 1px solid #86AF2B; + border-width: 3px 0; + color: #fff; + font: italic 140% Georgia, "Times New Roman", Times, serif; + padding: 0.5em 0.75em; + width: 30%; +} + +.pullquote-style5-author { + display:block; + text-align: right; + font-size:0.65em; + margin: 1em 0 0 0; + line-height: 1.2em; + font-style: normal; + font-weight: bold; +} + +/* Style 6 */ + +.pullquote-style6 { + border: 1px solid #504C6F; + border-width: 2px 10px 2px 10px; + color: #231D4F; + font: italic 120% Georgia, "Times New Roman", Times, serif; + line-height: 150%; + padding: .75em 0 0 .75em; + width: 30%; +} + +.pullquote-style6-author { + display:block; + text-align: right; + font-size:0.8em; + margin: 1em 0 0 0; + line-height: 1.2em; + font-style: normal; + padding: 0 1em 1em 1em; + font-weight: bold; +} + +/* Style 7 */ + +.pullquote-style7 { + background: #DFCAB5; + border: 10px solid #7F5B37; + border-width: 2px 0 0 10px; + color: #333; + font: italic 130% "Times New Roman", Times, serif; + line-height: 125%; + padding: 10px; + width: 30%; +} + +.pullquote-style7-author { + display:block; + text-align: right; + font-size:0.8em; + margin: 1em 0 0 0; + line-height: 1.2em; + font-weight: bold; + font-style: normal; +} + +/* Style 8 */ + +.pullquote-style8 { + border: solid #666; + border-width: 1px 0 1px 10px; + color: #303030; + font: italic 130% Arial, Helvetica, sans-serif; + line-height: 125%; + padding: 0 8px; + width: 30%; +} + +.pullquote-style8-author { + display:block; + text-align: right; + font-size:0.8em; + margin: 1em 0 0 0; + line-height: 1.2em; + font-weight: bold; + font-style: normal; + padding: 0 0 10px 0; +} + +/* Style 9 */ + +.pullquote-style9 { + border: solid #999; + border-width: 1px 0; + width: 33%; + background: #E8DFFF; + color: #333; + font: italic 110% "Trebuchet MS", "Lucida Grande", sans-serif; +} + +.pullquote-style9-author { + display:block; + background: #cbc3df; + color: #000; + font: bold 75% Verdana, Helvetica, sans-serif; + line-height: 150%; + padding: 0.4em 1em; + text-align: right; + margin: 0; +} + +/* Style 10 */ + +.pullquote-style10 { + border: 7px double #272B4F; + border-width: 0 5px; + font: italic 130% "Times New Roman", Times, serif; + padding: .25em .75em; + width: 30%; +} + +.pullquote-style10-author { + display:block; + color: #000; + font: bold 80% Arial, Helvetica, sans-serif; + line-height: 150%; + text-align: right; + border-top: 1px solid #272B4F; + padding: 0.5em 0; + margin: 1em 0 0 0; + font-weight: normal; +} + +/* Style 11 */ + +.pullquote-style11 { + border: 1px solid #aaa; + font: 0.8em Arial, Helvetica, sans-serif; + width: 33%; + background: #e8e8e8; + color: #333; +} + +.pullquote-style11-author { + text-align: right; + padding: 0 1em 0 0; + font: 0.9em Arial, Helvetica, sans-serif; + font-weight: bold; +} + +/* Style 12 */ + +.pullquote-style12 { + border: 1px solid #C2D1E6; + border-width: 8px 0; + color: #05254F; + font: italic 120% Georgia, "Times New Roman", Times, serif; + line-height: 150%; + padding: 0 1em; + width: 30%; +} + +.pullquote-style12-author { + padding: 0 0 1.5em 0; + display:block; + text-align: right; + font-size:0.65em; + margin: 0; + line-height: 1.2em; + font-weight: bold; + font-style: normal; +} + +/* Style 13 */ + +.pullquote-style13 { + background: #363F23; + color: #fff; + font: italic 140% Georgia, "Times New Roman", Times, serif; + padding: .5em .75em; + width: 30%; +} + +.pullquote-style13-author { + display:block; + border-bottom: 1px solid #86AF2B; + border-top: 1px solid #86AF2B; + font: bold 65% Arial, Helvetica, sans-serif; + padding: .3em .5em; + text-align: right; + margin: 0; +} + +/* Style 14 */ + +.pullquote-style14 { + font-size:1.4em; + padding: 20px 10px 10px 10px; + width: 30%; + border-left:4px solid #94ce18; + text-align: center; +} + +.pullquote-style14-author { + display:block; + text-align: right; + font-size:0.65em; + margin: 1em 0 0 0; + line-height: 1.2em; + font-weight: bold; +} + +/* Style 15 */ + +.pullquote-style15 { + background: #f5f5f5; + border-left: 0.8em solid #ccc; + border-right: 0.8em solid #ccc; + font: italic 120% Georgia, "Times New Roman", Times, serif; + padding: 0.75em; + width: 30%; +} + +.pullquote-style15-author { + color: #fff; + font: bold 75% Arial, Helvetica, sans-serif; + margin-top: 1em; + text-align: right; + background: #9c9c9c; + padding: .2em .4em; + width: 75%; + float: right; +} + +/* Style 16 */ + +.pullquote-style16 { + background: #e5e5e5; + border: 3px double #333; + font: italic 140% Georgia, "Times New Roman", Times, serif; + outline-style: double; + padding: .5em .75em; + width: 30%; +} + +.pullquote-style16-author { + border-top: 3px double #333; + font: bold 65% Arial, Helvetica, sans-serif; + padding: .3em .5em; + text-align: right; +} + +/* Style 17 */ + +.pullquote-style17 { + background: #EFDB00; + border: 1px solid #8F742C; + border-width: 1px 0; + padding: .5em .75em; + text-align: center; + width: 30%; + font: italic 150% Georgia, "Times New Roman", Times, serif; +} + +.pullquote-style17:before, .pullquote-style17:after { + color: #8F742C; + content: "~ ~ ~"; + font: 200% "Times New Roman", Times, serif; +} + +.pullquote-style17-author { + margin-bottom: .4em; + padding: .5em 0; + font: italic 100% Georgia, "Times New Roman", Times, serif; + color: #7F7733; + font-weight: bold; +} diff --git a/pullquote.inc b/pullquote.inc new file mode 100644 index 0000000..d9b5f6d --- /dev/null +++ b/pullquote.inc @@ -0,0 +1,47 @@ + 'radios', + '#title' => t('Choose Pullquote Style'), + '#default_value' => variable_get('pullquote_style', 1), + '#options' => array( + t('Style 1'), + t('Style 2'), + t('Style 3'), + t('Style 4'), + t('Style 5'), + t('Style 6'), + t('Style 7'), + t('Style 8'), + t('Style 9'), + t('Style 10'), + t('Style 11'), + t('Style 12'), + t('Style 13'), + t('Style 14'), + t('Style 15'), + t('Style 16'), + t('Style 17'), + t('Style 18'), + t('Style 19'), + t('Style 20'), + ), + ); + $form['submit'] = array( + '#type' => 'submit', + '#value' => t('Save'), + '#submit' => array('pullquote_save'), + ); + + return $form; +} + +function pullquote_save($form, $form_state, $form_id) { + dpm($form); + dpm($form_state); +} diff --git a/pullquote.install b/pullquote.install new file mode 100644 index 0000000..81c5fe4 --- /dev/null +++ b/pullquote.install @@ -0,0 +1,19 @@ + array( + 'style' => variable_get('pullquote_style', 1), + ), + ); + + // pass variables to javascript + drupal_add_js($pullquote_style, 'setting'); + } -/* - * Implementation of hook_help() - * See http://drupal.org/node/632280 +/** + * Implementation of hook_menu(). */ -function pullquote_help($path, $arg) { - $output = ''; - switch ($path) { - case 'admin/help#pullquote': - $output .= '

' . t('About') . '

'; - $output .= '

' . t('The Pullquote module duplicates text as a formatted pullquote.') . '

'; - $output .= '

' . t('Uses') . '

'; - $output .= '

' . t('Surround any text to be duplicated as a pull quote with a span that has the class \'pullquote\'. For example: <span class="pullquote">this is a test</span>') . '

'; - $output .= '

' . t('To display on the left of the body text instead, use the class \'pullquote-left\' in addition. For example: <span class="pullquote pullquote-left">this is a left test</span>)') . '

'; - $output .= '

For more information, see the online handbook entry for Pullquote module.

'; - } - return $output; +function pullquote_menu() { + $items = array(); + $items['admin/settings/pullquote'] = array( + 'title' => 'Pullquote Settings', + 'description' => 'Configure pullquote settings.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('pullquote_theme_settings'), + 'access arguments' => array('administer site configuration'), + 'file' => 'pullquote.inc', + ); + return $items; } -- 1.7.3.1.msysgit.0 From ffc2dbc6ea77e182aac79dbafd76e56b9827a21a Mon Sep 17 00:00:00 2001 From: callison Date: Mon, 7 Mar 2011 11:38:40 +0700 Subject: [PATCH 2/3] Issue #1082456 by callison, lliss: Added CSS Switcher feature. --- pullquote.css | 67 ++++++++++++++++++++++++++++------------------------- pullquote.js | 5 ++- pullquote.module | 65 +++++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 94 insertions(+), 43 deletions(-) diff --git a/pullquote.css b/pullquote.css index 90c8405..fd1751b 100644 --- a/pullquote.css +++ b/pullquote.css @@ -1,5 +1,3 @@ -/* $Id: pullquote.css,v 1.1 2010/09/07 21:40:06 stuckagain Exp $ */ - /** * @file * Styles for pullquote module. @@ -19,9 +17,14 @@ margin: 0em 1em 0.4em 0em; } -/* Style 1 */ +.pullquote_preview { + float: right; + width: 75%; +} -.pullquote-style1 { +/* Style 0 - Default */ + +.pullquote-style0 { background: #E8E8E8; border: 1px solid #AAA; color: #333; @@ -31,13 +34,39 @@ width: 30%; } -.pullquote-style1:before { +.pullquote-style0:before { content: open-quote; } -.pullquote-style1:after { +.pullquote-style0:after { content: close-quote; } +/* Style 1 */ + +.pullquote-style1 { + background: #EFDB00; + border: 1px solid #8F742C; + border-width: 1px 0; + padding: .5em .75em; + text-align: center; + width: 30%; + font: italic 150% Georgia, "Times New Roman", Times, serif; +} + +.pullquote-style1:before, .pullquote-style1:after { + color: #8F742C; + content: "~ ~ ~"; + font: 200% "Times New Roman", Times, serif; +} + +.pullquote-style1-author { + margin-bottom: .4em; + padding: .5em 0; + font: italic 100% Georgia, "Times New Roman", Times, serif; + color: #7F7733; + font-weight: bold; +} + /* Style 2 */ .pullquote-style2 { @@ -360,29 +389,3 @@ padding: .3em .5em; text-align: right; } - -/* Style 17 */ - -.pullquote-style17 { - background: #EFDB00; - border: 1px solid #8F742C; - border-width: 1px 0; - padding: .5em .75em; - text-align: center; - width: 30%; - font: italic 150% Georgia, "Times New Roman", Times, serif; -} - -.pullquote-style17:before, .pullquote-style17:after { - color: #8F742C; - content: "~ ~ ~"; - font: 200% "Times New Roman", Times, serif; -} - -.pullquote-style17-author { - margin-bottom: .4em; - padding: .5em 0; - font: italic 100% Georgia, "Times New Roman", Times, serif; - color: #7F7733; - font-weight: bold; -} diff --git a/pullquote.js b/pullquote.js index 6fbf343..c1267cf 100644 --- a/pullquote.js +++ b/pullquote.js @@ -6,10 +6,11 @@ Drupal.behaviors.pullquote = function (context) { if ($parent.length) { // Apply conditional pullquote container styling. $parent.addClass('pullquote-container'); - $text = $span.text(); + $style = Drupal.settings.pullquote_style; + $text = $span.text(); $span.clone() .prependTo($parent) - .replaceWith('' + $text + ''); + .replaceWith('' + $text + ''); } }); }; diff --git a/pullquote.module b/pullquote.module index d55ed96..9d02c7c 100644 --- a/pullquote.module +++ b/pullquote.module @@ -1,8 +1,8 @@ array( - 'style' => variable_get('pullquote_style', 1), - ), + 'pullquote_style' => variable_get('pullquote_style', 0), ); // pass variables to javascript drupal_add_js($pullquote_style, 'setting'); - } /** @@ -28,10 +25,60 @@ function pullquote_menu() { $items['admin/settings/pullquote'] = array( 'title' => 'Pullquote Settings', 'description' => 'Configure pullquote settings.', - 'page callback' => 'drupal_get_form', + 'page callback' => 'pullquote_settings_page', 'page arguments' => array('pullquote_theme_settings'), 'access arguments' => array('administer site configuration'), - 'file' => 'pullquote.inc', ); return $items; } + +function pullquote_settings_page() { + $content = ''; + $content .= "
Preview

"; + $content .= "Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas."; + $content .= " Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis. Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus"; + $content .= "

"; + $content .= drupal_get_form('pullquote_theme_settings'); + return $content; +} + +/** + * Form builder function for module settings. + */ +function pullquote_theme_settings() { + $form['pullquote_choose_style'] = array( + '#type' => 'select', + '#title' => t('Choose Pullquote Style'), + '#default_value' => variable_get('pullquote_style', 0), + '#options' => array( + t('Style 1'), + t('Style 2'), + t('Style 3'), + t('Style 4'), + t('Style 5'), + t('Style 6'), + t('Style 7'), + t('Style 8'), + t('Style 9'), + t('Style 10'), + t('Style 11'), + t('Style 12'), + t('Style 13'), + t('Style 14'), + t('Style 15'), + t('Style 16'), + t('Style 17'), + ), + ); + $form['submit'] = array( + '#type' => 'submit', + '#value' => t('Save Settings'), + '#submit' => array('pullquote_save'), + ); + + return $form; +} + +function pullquote_save($form, $form_state) { + variable_set('pullquote_style', $form_state['values']['pullquote_choose_style']); +} -- 1.7.3.1.msysgit.0 From 355762545e1e39149b2b2194fe628ddb5ed1e62f Mon Sep 17 00:00:00 2001 From: callison Date: Mon, 7 Mar 2011 11:46:23 +0700 Subject: [PATCH 3/3] Issue #1082456 by callison, lliss: Added CSS Switcher feature. --- pullquote.inc | 47 ----------------------------------------------- pullquote.install | 4 +--- 2 files changed, 1 insertions(+), 50 deletions(-) delete mode 100644 pullquote.inc diff --git a/pullquote.inc b/pullquote.inc deleted file mode 100644 index d9b5f6d..0000000 --- a/pullquote.inc +++ /dev/null @@ -1,47 +0,0 @@ - 'radios', - '#title' => t('Choose Pullquote Style'), - '#default_value' => variable_get('pullquote_style', 1), - '#options' => array( - t('Style 1'), - t('Style 2'), - t('Style 3'), - t('Style 4'), - t('Style 5'), - t('Style 6'), - t('Style 7'), - t('Style 8'), - t('Style 9'), - t('Style 10'), - t('Style 11'), - t('Style 12'), - t('Style 13'), - t('Style 14'), - t('Style 15'), - t('Style 16'), - t('Style 17'), - t('Style 18'), - t('Style 19'), - t('Style 20'), - ), - ); - $form['submit'] = array( - '#type' => 'submit', - '#value' => t('Save'), - '#submit' => array('pullquote_save'), - ); - - return $form; -} - -function pullquote_save($form, $form_state, $form_id) { - dpm($form); - dpm($form_state); -} diff --git a/pullquote.install b/pullquote.install index 81c5fe4..fef43a5 100644 --- a/pullquote.install +++ b/pullquote.install @@ -5,8 +5,7 @@ */ function pullquote_install() { // Sets variables. - variable_set('pullquote_style', 1); - variable_set('pullquote_custom_css', ''); + variable_set('pullquote_style', 0); } /** @@ -15,5 +14,4 @@ function pullquote_install() { function pullquote_uninstall() { // Delete variables. variable_del('pullquote_style'); - variable_del('pullquote_custom_css'); } -- 1.7.3.1.msysgit.0