diff --git a/modules/blocktheme/LICENSE.txt b/modules/blocktheme/LICENSE.txt deleted file mode 100644 index d159169..0000000 --- a/modules/blocktheme/LICENSE.txt +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/modules/blocktheme/README.txt b/modules/blocktheme/README.txt deleted file mode 100644 index 6328667..0000000 --- a/modules/blocktheme/README.txt +++ /dev/null @@ -1,44 +0,0 @@ - -== Description == -BlockTheme allows an admin to define tpl files for standard block templates -and provides a select box on the block configure form so the user can select -a tpl file to use as opposed to having to override the templates by block ID. - -== Installation == - -1. Enable the module - -2. Go to admin/config/user-interface/blocktheme and add entries like: -customtemplate|My Custom Template -mysupertemplate|My SuperTemplate -Where the first name is the machine-readable name of your template which may contain only -alphanumerical characters, -, or _ . The second name is the user-friendly name that appears -in the selectionbox on the block edit form. - -3. Choose from either step 4. or 5. - -4. Create tpl files in your theme directory like: (Note: filenames must be preceded by block--blocktheme--) - block--blocktheme--customtemplate.tpl.php - block--blocktheme--mysupertemplate.tpl.php - -5. Alternatively use the extra provided variable $blocktheme to customize your - block.tpl.php or block-*.tpl.php files. The $blocktheme will typically be - used as a css class name in you template and contains the machine-readable name of - your template. - -6. In your custom block templates, you can also use values from the - $blocktheme_vars variable. This array contains custom variables defined in the - block edit form, right below the block theme selection. - -== Usage == - -Go to the edit form for any block and select the appropriate template. - -== Credits == - -Updated for Drupal 7 and currently maintained by: - - Andrei Mateescu - http://drupal.org/user/729614 - -Updated for Drupal 6 by: - - Tony Miller - tony.miller@eightyoptions.com - - Gertjan Idema - http://drupal.org/user/269240 diff --git a/modules/blocktheme/blocktheme.info b/modules/blocktheme/blocktheme.info deleted file mode 100644 index f8e4de5..0000000 --- a/modules/blocktheme/blocktheme.info +++ /dev/null @@ -1,12 +0,0 @@ -name = Block Theme -description = Provides a configuration option to select custom themes for blocks -core = 7.x -files[] = blocktheme.module -configure = admin/config/user-interface/blocktheme - -; Information added by drupal.org packaging script on 2012-06-01 -version = "7.x-1.1" -core = "7.x" -project = "blocktheme" -datestamp = "1338543351" - diff --git a/modules/blocktheme/blocktheme.install b/modules/blocktheme/blocktheme.install deleted file mode 100644 index aaf6973..0000000 --- a/modules/blocktheme/blocktheme.install +++ /dev/null @@ -1,16 +0,0 @@ - 'blocktheme-admin-display-form', -// ); -// } - -// return $return; -// } - -/** - * Implements hook_menu(). - */ -function blocktheme_menu() { - $items = array(); - $items['admin/config/user-interface/blocktheme'] = array( - 'title' => 'Block Theme', - 'description' => "Define re-usable block templates that can be configured from each block's configuration page.", - 'page callback' => 'drupal_get_form', - 'page arguments' => array('blocktheme_admin_settings'), - 'access arguments' => array('administer site configuration'), - 'type' => MENU_NORMAL_ITEM, - ); - - return $items; -} - -/** - * Block Theme settings page. - */ -function blocktheme_admin_settings() { - $form = array(); - $form['blocktheme_themes'] = array( - '#type' => 'textarea', - '#default_value' => variable_get('blocktheme_themes', ''), - '#title' => t('Custom Block Templates'), - '#description' => t('Enter one value per row in the form: customtemplate|Friendly Name, where "customtemplate" corresponds to a tpl file called block--blocktheme--customtemplate.tpl.php as well as to the value of an extra variable $blocktheme in the block template.'), - '#wysiwyg' => FALSE, - ); - $form['blocktheme_show_custom_block_theme'] = array( - '#type' => 'checkbox', - '#default_value' => variable_get('blocktheme_show_custom_block_theme', ''), - '#title' => t('Show Custom Block Theme'), - '#description' => t('Show the custom block theme used for a block in the block admin page.', array('@block-admin-page' => url('admin/build/block'))), - ); - $form['#submit'][] = 'blocktheme_admin_settings_submit'; - - return system_settings_form($form); -} - -/** * Implements hook_help(). */ function blocktheme_help($path, $arg) { @@ -80,20 +25,29 @@ function blocktheme_help($path, $arg) { } /** - * Handle submission of the blocktheme administrative page form. + * Implements hook_theme(). */ -function blocktheme_admin_settings_submit($form, &$form_state) { - drupal_theme_rebuild(); +function blocktheme_theme() { + $return = array(); + + $config = Drupal::config('blocktheme.settings'); + if ($config->get('blocktheme_show_custom_block_theme')) { + // Override the default admin display form template + $return['block_admin_display_form'] = array( + 'template' => 'blocktheme-admin-display-form', + 'render element' => 'element', + ); + } + return $return; } + /** * Form for updating a block. */ -function blocktheme_form_block_admin_configure_alter(&$form, &$form_state) { - $module = $form['module']['#value']; - $delta = $form['delta']['#value']; - $var_name = $module . '-' . $delta; - +function blocktheme_form_block_form_alter(&$form, &$form_state, $form_id) { + $module = $form['settings']['module']['#value']; + $var_name = $module; $options = blocktheme_get_blockthemes(); $blocktheme = blocktheme_get(); $blocktheme_vars = blocktheme_get_vars(); @@ -101,67 +55,110 @@ function blocktheme_form_block_admin_configure_alter(&$form, &$form_state) { $form['settings']['#weight'] = -2; $form['regions']['#weight'] = -1; $form['custom_block_theme'] = array( - '#type' => 'fieldset', - '#title' => t('Block Theme'), - '#weight' => 0, + '#type' => 'details', + '#title' => t('Block Theme'), + '#weight' => 0, '#collapsible' => TRUE, - '#collapsed' => FALSE, + '#collapsed' => FALSE, + '#open' => TRUE, ); $form['custom_block_theme']['blocktheme'] = array( - '#type' => 'select', - '#title' => t('Custom theme'), + '#type' => 'select', + '#title' => t('Custom theme'), + '#options' => $options, '#default_value' => isset($blocktheme[$var_name]) ? $blocktheme[$var_name] : '', - '#options' => $options, ); $form['custom_block_theme']['blocktheme_vars'] = array( - '#type' => 'textarea', + '#type' => 'textarea', + '#title' => t('Custom block variables'), + '#description' => t('Enter one entry per line, in the format: variable_name|variable_content.'), + '#wysiwyg' => FALSE, '#default_value' => isset($blocktheme_vars[$var_name]) ? blocktheme_format_vars_admin($blocktheme_vars[$var_name]) : '', - '#title' => t('Custom block variables'), - '#description' => t('Enter one entry per line, in the format: variable_name|variable_content.'), - '#wysiwyg' => FALSE, ); + $form['actions']['submit']['#submit'][] ='blocktheme_update'; +} + +/** + * Update an existing block after the block form has been submitted. + */ +function blocktheme_update($form, &$form_state) { + $var_name = $form_state['values']['settings']['module']; - $form['#submit'][] = 'blocktheme_update'; + $blocktheme = blocktheme_get(); + $blocktheme_vars = blocktheme_get_vars(); + if (!$form_state['values']['custom_block_theme']['blocktheme']) { + unset($blocktheme[$var_name]); + } + else { + $blocktheme[$var_name] = $form_state['values']['custom_block_theme']['blocktheme']; + } + if (!$form_state['values']['custom_block_theme']['blocktheme_vars']) { + unset($blocktheme_vars[$var_name]); + } + else { + $blocktheme_vars[$var_name] = blocktheme_format_vars($form_state['values']['custom_block_theme']['blocktheme_vars']); + } + blocktheme_set($blocktheme, $blocktheme_vars); + drupal_theme_rebuild(); } /** * Form for adding a new block. */ -function blocktheme_form_block_add_block_form_alter(&$form, &$form_state) { +function blocktheme_form_basic_custom_block_form_alter(&$form, &$form_state, $form_id) { $options = blocktheme_get_blockthemes(); - $form['settings']['#weight'] = -2; $form['regions']['#weight'] = -1; $form['custom_block_theme'] = array( - '#type' => 'fieldset', - '#title' => t('Block Theme'), - '#weight' => 0, + '#type' => 'details', + '#title' => t('Block Theme'), + '#weight' => 0, + '#open' => TRUE, + '#collapsed' => FALSE, '#collapsible' => TRUE, - '#collapsed' => FALSE, ); $form['custom_block_theme']['blocktheme'] = array( - '#type' => 'select', - '#title' => t('Custom theme'), + '#type' => 'select', + '#title' => t('Custom theme'), '#options' => $options, ); $form['custom_block_theme']['blocktheme_vars'] = array( - '#type' => 'textarea', + '#type' => 'textarea', + '#title' => t('Custom block variables'), + '#wysiwyg' => FALSE, + '#description' => t('Enter one entry per line, in the format: variable_name|variable_content.'), '#default_value' => '', - '#title' => t('Custom block variables'), - '#description' => t('Enter one entry per line, in the format: variable_name|variable_content.'), - '#wysiwyg' => FALSE, ); + $form['actions']['submit']['#submit'][] = 'blocktheme_save'; +} - $form['#submit'][] = 'blocktheme_save'; +/** + * Save a new block after the block form has been submitted. + */ +function blocktheme_save($form, &$form_state) { + $var_name = $form_state['values']['settings']['module']; + $blocktheme = blocktheme_get(); + $blocktheme_vars = blocktheme_get_vars(); + if ($form_state['values']['custom_block_theme']['blocktheme']) { + $blocktheme[$var_name] = $form_state['values']['custom_block_theme']['blocktheme']; + } + if ($form_state['values']['custom_block_theme']['blocktheme_vars']) { + $blocktheme_vars[$var_name] = blocktheme_format_vars($form_state['values']['custom_block_theme']['blocktheme_vars']); + } + blocktheme_set($blocktheme, $blocktheme_vars); + drupal_theme_rebuild(); } /** * Set Block Theme custom block settings. */ function blocktheme_set($blocktheme, $blocktheme_vars = NULL) { - variable_set('blocktheme', $blocktheme); + $config = Drupal::config('blocktheme.settings'); + $config->set('blocktheme', $blocktheme) + ->save(); if ($blocktheme_vars) { - variable_set('blocktheme_vars', $blocktheme_vars); + $config->set('blocktheme_vars', $blocktheme_vars) + ->save(); } } @@ -170,10 +167,13 @@ function blocktheme_set($blocktheme, $blocktheme_vars = NULL) { */ function blocktheme_get() { static $blocktheme; + $config = Drupal::config('blocktheme.settings'); if (empty($blocktheme)) { - $blocktheme = variable_get('blocktheme', array()); + $blocktheme = $config->get('blocktheme'); + if (is_null($blocktheme)) { + $blocktheme = array(); + } } - return $blocktheme; } @@ -182,80 +182,35 @@ function blocktheme_get() { */ function blocktheme_get_vars() { static $blocktheme_vars; + $config = Drupal::config('blocktheme.settings'); if (empty($blocktheme_vars)) { - $blocktheme_vars = variable_get('blocktheme_vars', array()); + $blocktheme_vars = $config->get('blocktheme_vars'); + if (is_null($blocktheme_vars)) { + $blocktheme_vars = array(); + } } - return $blocktheme_vars; } -/** - * Update an existing block after the block form has been submitted. - */ -function blocktheme_update($form_id, &$form_state) { - $var_name = $form_state['values']['module'] . '-' . $form_state['values']['delta']; - - $blocktheme = blocktheme_get(); - $blocktheme_vars = blocktheme_get_vars(); - - if (!$form_state['values']['blocktheme']) { - unset($blocktheme[$var_name]); - } - else { - $blocktheme[$var_name] = $form_state['values']['blocktheme']; - } - if (!$form_state['values']['blocktheme_vars']) { - unset($blocktheme_vars[$var_name]); - } - else { - $blocktheme_vars[$var_name] = blocktheme_format_vars($form_state['values']['blocktheme_vars']); - } - blocktheme_set($blocktheme, $blocktheme_vars); - drupal_theme_rebuild(); -} - -/** - * Save a new block after the block form has been submitted. - */ -function blocktheme_save($form_id, &$form_state) { - // First, get the new delta value - $result = db_query_range("SELECT delta FROM {block} ORDER BY bid DESC", 0, 1); - if ($record = $result->fetchObject()) { - $delta = $record->delta; - $var_name = $form_state['values']['module'] . '-' . $delta; - - $blocktheme = blocktheme_get(); - $blocktheme_vars = blocktheme_get_vars(); - - if ($form_state['values']['blocktheme']) { - $blocktheme[$var_name] = $form_state['values']['blocktheme']; - } - if ($form_state['values']['blocktheme_vars']) { - $blocktheme_vars[$var_name] = blocktheme_format_vars($form_state['values']['blocktheme_vars']); - } - blocktheme_set($blocktheme, $blocktheme_vars); - drupal_theme_rebuild(); - }; -} /** * Get the defined blockthemes and return an array to be used in a select list. */ function blocktheme_get_blockthemes() { + $config = Drupal::config('blocktheme.settings'); $options = array(); - $blockthemes = variable_get('blocktheme_themes', ''); - + $blockthemes = $config->get('blocktheme_themes'); + if (is_null($blockthemes)) { + $blocktheme_vars = ''; + } $options[] = t('- None -'); - if ($blockthemes) { $_sets = explode("\n", $blockthemes); - foreach ($_sets as $key => $value) { $set = explode('|', $value); $options[$set[0]] = $set[1]; } } - return $options; } @@ -271,7 +226,6 @@ function blocktheme_format_vars($block_vars) { $formatted_vars[$set[0]] = $set[1]; } } - return $formatted_vars; } @@ -286,7 +240,6 @@ function blocktheme_format_vars_admin($block_vars) { } $formatted_vars = implode("\n", $_formatted_vars); } - return $formatted_vars; } @@ -295,7 +248,8 @@ function blocktheme_format_vars_admin($block_vars) { */ function blocktheme_get_theme($block) { $blocktheme = blocktheme_get(); - $var_name = $block->module . '-' . $block->delta; + $settings = $block->get('settings'); + $var_name = $settings['module']; if (isset($blocktheme[$var_name])) { return $blocktheme[$var_name]; } @@ -306,7 +260,8 @@ function blocktheme_get_theme($block) { */ function blocktheme_get_theme_vars($block) { $blocktheme_vars = blocktheme_get_vars(); - $var_name = $block->module . '-' . $block->delta; + $settings = $block->get('settings'); + $var_name = $settings['module']; if (isset($blocktheme_vars[$var_name])) { return $blocktheme_vars[$var_name]; } @@ -316,41 +271,48 @@ function blocktheme_get_theme_vars($block) { * Implements hook_preprocess_block(). */ function blocktheme_preprocess_block(&$variables) { + $variables['block'] = $variables['elements']['#block']; + $custom_block_theme = NULL; if ($custom_block_theme = blocktheme_get_theme($variables['block'])) { $variables['blocktheme'] = $custom_block_theme; - $variables['classes_array'][] = $custom_block_theme; - $variables['theme_hook_suggestion'][] = 'block__blocktheme__' . str_replace('-', '_', $custom_block_theme); - + $variables['attributes']['class'][] = $custom_block_theme; } - // drupal_set_message('
Taky debug:
 ' . check_plain(print_r($variables['theme_hook_suggestions'], 1)) . '
'); - - // drupal_set_message('
Taky debug:
 ' . check_plain(print_r($variables, 1)) . '
'); - if ($custom_block_vars = blocktheme_get_theme_vars($variables['block'])) { $variables['blocktheme_vars'] = $custom_block_vars; } } -// /** -// * Implements template_preprocess_block_admin_display_form(). -// */ -// function blocktheme_preprocess_block_admin_display_form(&$variables) { -// if (variable_get('blocktheme_show_custom_block_theme', '')) { -// // Get blocks with custom templates. -// $blocktheme = blocktheme_get(); -// // Get block theme names. -// $blocktheme_themes = blocktheme_get_blockthemes(); - -// // Add each block in the form to the appropriate place in the block listing. -// foreach (element_children($variables['form']['blocks']) as $i) { -// $block = &$variables['form']['blocks'][$i]; - -// // Fetch the region for the current block. -// $region = (isset($block['region']['#default_value']) ? $block['region']['#default_value'] : BLOCK_REGION_NONE); -// // Set block theme key for the current module. -// $var_name = $block['module']['#value'] . '-' . $block['delta']['#value']; +/** + * Implements hook_theme_suggestions_alter(). + */ +function blocktheme_theme_suggestions_alter(array &$suggestions, array $variables, $hook) { + if ($hook == 'block') { + $variables['block'] = $variables['elements']['#block']; + $custom_block_theme = NULL; + if ($custom_block_theme = blocktheme_get_theme($variables['block'])) { + $suggestions[] = 'block__blocktheme_' . $custom_block_theme; + } + } +} -// $variables['block_listing'][$region][$i]->custom_block_theme = (isset($blocktheme[$var_name])) ? $blocktheme_themes[$blocktheme[$var_name]] : ''; -// } -// } -// } +/** + * Implements template_preprocess_block_admin_display_form(). + */ +function template_preprocess_block_admin_display_form(&$variables) { + $config = Drupal::config('blocktheme.settings'); + if ($config->get('blocktheme_show_custom_block_theme') == '') { + // Get blocks with custom templates. + $blocktheme = blocktheme_get(); + // Get block theme names. + $blocktheme_themes = blocktheme_get_blockthemes(); + // Add each block in the form to the appropriate place in the block listing. + foreach (element_children($variables['form']['blocks']) as $i) { + $block = &$variables['form']['blocks'][$i]; + // Fetch the region for the current block. + $region = (isset($block['region']['#default_value']) ? $block['region']['#default_value'] : BLOCK_REGION_NONE); + // Set block theme key for the current module. + $var_name = $block['module']['#value']; + $variables['block_listing'][$region][$i]->custom_block_theme = (isset($blocktheme[$var_name])) ? $blocktheme_themes[$blocktheme[$var_name]] : ''; + } + } +}