diff --git a/LICENSE.txt b/LICENSE.txt
deleted file mode 100644
index d159169d1050894d3ea3b98e1c965c4058208fe1..0000000000000000000000000000000000000000
--- a/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.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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.
-
- <signature of Ty Coon>, 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/README.txt b/README.txt
index 710f13bffa7101d6211dddc40c12c891ea4d396c..9c86cc7b779fdc9f2b4753e9dda80775770b1802 100644
--- a/README.txt
+++ b/README.txt
@@ -1,8 +1,32 @@
-Bootstrap theme for Drupal
+Bootstrap sub-theme for Drupal
-1. Download the Bootstrap library v2 (http://twitter.github.com/bootstrap/), make sure the resulting folder is named "bootstrap." If you are using the Github master branch, you will need to also find a way to compile the LESS and JS files since this module looks for bootstrap.css and bootstrap.js.
-2. Place the bootstrap folder inside the bootstrap theme folder or your subtheme folder: [path_to_themes]/bootstrap/bootstrap/js…
-3. Put any plugin files into [path_to_themes]/bootstrap/bootstrap/js/
-4. Make sure you have jQuery 1.7, which is available through the jQuery Update module (http://drupal.org/project/jquery_update/) 7.x-2.x-dev version. You need to make sure the 1.7 version is selected on the configuration page for it to work.
+Bootstrap Barrio is a sub-theme of the Bootstrap Theme, theme based on Twitter Bootstrap,
+a sleek, intuitive, and powerful front-end framework for faster and easier web development.
+While Bootstrap Theme add Twitter Bootstrap functionallity, Bootstrap Barrio focus on layout flexibility
+and customization using theme parameters and the Skinr module.
-Author: http://drupal.org/node/259843/committers
\ No newline at end of file
+- Layout is handle by Bootstrap.
+- Two columns, with configurable widths.
+- Fixed and fluid layouts.
+- Responsive features turn on and off.
+- Fixed and fluid layouts.
+- Configurable header behavior, using Bootstrap "fixed to top".
+- Any block could be defined as "modal" with one click using Skinr.
+- Full screen width slider region.
+- Skinr controlled, collapse, fixed, row, content and span over blocks.
+- Flexible blocks layout using span over row defined regions.
+
+Following modules and themes are requiered:
+
+- Bootstrap Theme
+- Skinr
+
+Installation
+
+Unpack and upload Bootstrap Theme as usual within your site's themes folder
+(usually sites/all/themes).
+ Unpack and upload Bootstrap Barrio within your default's themes folder
+(usually sites/default/themes).
+Dowload latest version of Twitter Bootstrap, copy bootstrap files into Bootstrap Theme directory,
+css files should be usually under sites/all/themes/bootstrap/bootstrap/css. js under sites/all/themes/bootstrap/bootstrap/js and img under sites/all/themes/bootstrap/bootstrap/img.
+Download and enable the Skinr module, set permissions if you're not uid 1
diff --git a/bootstrap_barrio.info b/bootstrap_barrio.info
index 43d4c4b484175a24ca7473c5dcac33a2b3c9838f..806a7c020e96a611571f1f6a681f3e1bfc96fcbb 100644
--- a/bootstrap_barrio.info
+++ b/bootstrap_barrio.info
@@ -1,6 +1,5 @@
name = Bootstrap Barrio
description = Built to use Bootstrap, a sleek, intuitive, and powerful front-end framework for faster and easier web development.
-version = 7.1
core = 7.x
base theme = bootstrap
diff --git a/css/style.css b/css/style.css
index cb2465dbf89dd1524ff0560da63015d23cdadbc9..9a35640a216726a6ebfd58345d47a22726bd34e7 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1,11 +1,10 @@
-
@media(min-width: 980px) {
body {
padding-top: 80px;
}
}
-.navbar .logo {
+.navbar .logo {
margin-top: 5px;
margin-right: 10px;
}
@@ -25,7 +24,7 @@
.footer {
margin-top: 45px;
padding: 35px 0 36px;
- border-top: 1px solid #E5E5E5;
+ border-top: 1px solid #e5e5e5;
}
ul.action-links {
@@ -48,11 +47,11 @@ ul.action-links [class*=" icon-"] {
/* Fix Toolbar for .navbar-fixed-top */
body.toolbar .navbar-fixed-top {
- top: 30px;
+ top: 30px;
}
body.toolbar-drawer .navbar-fixed-top {
- top: 65px;
+ top: 65px;
}
@media(min-width: 980px) {
@@ -78,7 +77,7 @@ html.overlay-open .navbar-fixed-top {
margin-top: 5px;
}
-.region-sidebar-first form#search-block-form input{
+.region-sidebar-first form#search-block-form input {
width: 100%;
}
@@ -107,25 +106,29 @@ div#admin-toolbar {
/* Admin_menu fix */
#admin-menu {
z-index: 1100;
- position: fixed;
+ position: fixed;
}
body.admin-menu .navbar-fixed-top {
- top: 30px;
+ top: 30px;
}
#admin-menu .dropdown li {
line-height: normal;
-}
+}
/* System base fix */
-.container-inline div, .container-inline label {
+.container-inline div,
+.container-inline label {
display: block;
}
/* Default form fields to auto */
-input, textarea, select, .uneditable-input {
- width:auto;
+input,
+textarea,
+select,
+.uneditable-input {
+ width: auto;
}
/* Default textfield styles inside vertical tabs */
@@ -137,13 +140,13 @@ input, textarea, select, .uneditable-input {
}
/* Vertical tabs form elements alighment */
-.vertical-tabs .form-item{
+.vertical-tabs .form-item {
margin: 1em 0;
}
/* Collapsible field groups fix */
html.js fieldset.collapsed {
- height: auto;
+ height: auto;
}
/* throbber fix */
@@ -157,12 +160,12 @@ html.js input.throbbing {
}
.navbar-search .control-group {
- margin-bottom:0px;
+ margin-bottom: 0px;
}
input.error {
- color: #B94A48;
- border-color: #B94A48;
+ color: #b94a48;
+ border-color: #b94a48;
}
/**
@@ -184,7 +187,7 @@ input.error {
}
.password-indicator {
- background-color: #C4C4C4;
+ background-color: #c4c4c4;
height: 0.3em;
width: 100%;
}
@@ -192,7 +195,7 @@ input.error {
.password-indicator div {
height: 100%;
width: 0%;
- background-color: #47C965;
+ background-color: #47c965;
}
input.password-confirm,
@@ -212,7 +215,7 @@ div.form-item div.password-suggestions {
padding: 0.2em 0.5em;
margin: 0.7em 0;
width: 38.5em;
- border: 1px solid #B4B4B4;
+ border: 1px solid #b4b4b4;
}
div.password-suggestions ul {
@@ -228,6 +231,6 @@ div.password-suggestions ul {
/* added an extra clear both in the situation the form actions is preceded by an badly wrapped float element and they overlap
e.g. multipage*/
-.form-actions{
+.form-actions {
clear: both;
}
diff --git a/js/script.js b/js/script.js
index bb3a341bbda7f8f5165ccb93a304e669d68c88c2..748f1b65180562768453951a1e02b6e403f701bc 100644
--- a/js/script.js
+++ b/js/script.js
@@ -1,11 +1,10 @@
-// JavaScript Document.
jQuery(document).ready(function() {
// Capture barrio-modal class generated by Skinr.
// This triggers block as modal.
jQuery('.barrio-modal').each(function () {
var title = jQuery(this).children('h2').text();
jQuery(this).after('<section id="btn-' + jQuery(this).attr('id') + '" class="sideral-corner after"><a href="#' + jQuery(this).attr('id') + '" role="button" class="btn" data-toggle="modal">' + title + '</a></section>');
- });
+ });
jQuery('.barrio-modal .block-content').addClass('modal-body');
jQuery('.barrio-modal h2').wrap('<div class="modal-header" />');
jQuery('.barrio-modal .modal-header').prepend('<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>');
diff --git a/skins/barrio_default/barrio_default.inc b/skins/barrio_default/barrio_default.inc
index df79cb21290fa52f28c5962156659871c8dbcdf4..6dfc7b355b7c824a7e664e59618a6eaa811fb4cc 100644
--- a/skins/barrio_default/barrio_default.inc
+++ b/skins/barrio_default/barrio_default.inc
@@ -1,10 +1,9 @@
<?php
-
/**
- * @file orange.skinr.inc
+ * @file barrio_default.inc
* Implementation of a Skinr plugin.
*/
-
+
/**
* Implements hook_skinr_group_info().
*
@@ -121,11 +120,11 @@ function bootstrap_barrio_skinr_group_info() {
* implementing it, followed by the plugin name, e.g.
* THEMENAME_PLUGINNAME_skinr_skin_info(), or
* MODULENAME_PLUGINNAME_skinr_skin_info().
- *
+ *
*/
function bootstrap_barrio_skinr_skin_barrio_default_info() {
$skins = array();
-
+
$skins['bootstrap_barrio_span'] = array(
'title' => t('Bootstrap Column Span'),
'description' => t('Define the SPAN value for Bootstrap Columns.'),
@@ -258,7 +257,7 @@ function bootstrap_barrio_skinr_skin_barrio_default_info() {
),
),
);
-
+
$skins['bootstrap_barrio_container'] = array(
'title' => t('Bootstrap Container'),
'type' => 'select',
@@ -277,7 +276,7 @@ function bootstrap_barrio_skinr_skin_barrio_default_info() {
),
),
);
-
+
$skins['bootstrap_barrio_responsive_utility'] = array(
'title' => t('Bootstrap Responsive Utility Classes'),
'type' => 'select',
@@ -312,15 +311,15 @@ function bootstrap_barrio_skinr_skin_barrio_default_info() {
),
),
);
-
+
$skins['bootstrap_barrio_modal'] = array(
'title' => t('Modal Block'),
'type' => 'checkboxes',
- 'description' => t('Define a block as Modal. Requieres button to trigger.'),
- 'scripts' => array('barrio_default.js'),
+ 'description' => t('Define a block as Modal. Replace block by button with block title as text.'),
+ 'js' => array('barrio_default.js'),
'theme hooks' => array('block'),
'group' => 'box',
- 'default status' => FALSE,
+ 'default status' => 1,
'options' => array(
'bootstrap_barrio_modal' => array(
'title' => t('Set as modal.'),
@@ -328,14 +327,14 @@ function bootstrap_barrio_skinr_skin_barrio_default_info() {
),
),
);
-
+
$skins['bootstrap_barrio_navbar'] = array(
'title' => t('Navigation Bar'),
'type' => 'checkboxes',
'description' => t('Define Navigation Bar characteristics.'),
'theme hooks' => array('block_menu'),
'group' => 'box',
- 'default status' => FALSE,
+ 'default status' => 1,
'options' => array(
'option_1' => array(
'title' => t('Visible Phone'),
@@ -351,14 +350,14 @@ function bootstrap_barrio_skinr_skin_barrio_default_info() {
),
),
);
-
+
$skins['bootstrap_barrio_collapse'] = array(
'title' => t('Collapsible responsive menu'),
'type' => 'checkboxes',
'description' => t('Define a menu as responsive collapsible. Needs to define navbar toggle button, .btn-navbar.'),
'theme hooks' => array('block_menu'),
'group' => 'box',
- 'default status' => FALSE,
+ 'default status' => 1,
'options' => array(
'bootstrap_barrio_collapse_menu' => array(
'title' => t('Set as collapsible.'),
@@ -366,6 +365,6 @@ function bootstrap_barrio_skinr_skin_barrio_default_info() {
),
),
);
-
+
return $skins;
}
diff --git a/template.php b/template.php
index ac52c2de85d57bb0fe718795359dfc90a1ef812e..6f34f6e5d7717aaaf26f35fb79d7e991a44e7ce4 100644
--- a/template.php
+++ b/template.php
@@ -1,5 +1,4 @@
<?php
-
/**
* Override or insert variables into the page template for HTML output.
* For taxonomy page, insert vocabulary id class.
@@ -13,7 +12,8 @@ function bootstrap_barrio_preprocess_html(&$variables) {
}
if (theme_get_setting('toggle_responsive')) {
$variables['mobile_friendly'] = TRUE;
- } else {
+ }
+ else {
$variables['mobile_friendly'] = FALSE;
}
}
@@ -29,7 +29,8 @@ function bootstrap_barrio_preprocess_page(&$variables) {
$variables['nav_style'] = _bootstrap_barrio_nav_style(theme_get_setting('nav_style'));
if (!theme_get_setting('print_content') && drupal_is_front_page()) {
$variables['print_content'] = FALSE;
- } else {
+ }
+ else {
$variables['print_content'] = TRUE;
}
if (theme_get_setting('collapse')) {
@@ -37,10 +38,11 @@ function bootstrap_barrio_preprocess_page(&$variables) {
} else {
$variables['collapse'] = 'not-collapse';
}
- if (theme_get_setting('fluid') || (arg(0) == 'admin') ) {
+ if (theme_get_setting('fluid') || (arg(0) == 'admin')) {
$variables['container'] = 'container-fluid';
$variables['row'] = 'row-fluid';
- } else {
+ }
+ else {
$variables['container'] = 'container';
$variables['row'] = 'row';
}
@@ -60,7 +62,7 @@ function _bootstrap_barrio_content_width() {
/**
* Returns a list of blocks.
* Uses Drupal block interface and appends any blocks assigned by the Context module.
- * Taken from Fusion Core
+ * Taken from Fusion Core.
*/
function _bootstrap_barrio_block_list($region) {
$drupal_list = array();
@@ -81,13 +83,13 @@ function _bootstrap_barrio_nav_style($theme_nav_style) {
switch ($theme_nav_style) {
case 0:
$nav_style = 'navbar navbar-static-top';
- break;
+ break;
case 1:
$nav_style = 'navbar navbar-fixed-top';
- break;
+ break;
case 2:
$nav_style = 'nav-collapse collapse';
- break;
+ break;
default:
$nav_style = 'navbar navbar-static-top';
break;
diff --git a/templates/block.tpl.php b/templates/block.tpl.php
index 2f501a4a1932b53a9e7ae41373bae353ab7fbcfe..f039d124216c0d96cb88ab785fc8d7b99b3e5aaa 100644
--- a/templates/block.tpl.php
+++ b/templates/block.tpl.php
@@ -1,3 +1,10 @@
+<?php
+
+/**
+ * @file
+ * Override of Bootstrap block.tpl.php.
+ */
+?>
<section id="<?php print $block_html_id; ?>" class="<?php print $classes; ?>"<?php print $attributes; ?>>
<?php print render($title_prefix); ?>
diff --git a/templates/html.tpl.php b/templates/html.tpl.php
index 241a23fbd5eba9a8b63bc53807ce8152cba85582..b107ba247f01ba6f24a5428ec7c62c85198e8fc5 100644
--- a/templates/html.tpl.php
+++ b/templates/html.tpl.php
@@ -1,3 +1,10 @@
+<?php
+
+/**
+ * @file
+ * Override of Bootstrap html.tpl.php.
+ */
+?>
<!DOCTYPE html>
<html lang="<?php print $language->language; ?>">
<head>
diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index 5b04b8adac7c80409217117c177556a0fe11134a..dd02179a8adc7dfd8399a32fb56e56e52cf26818 100644
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -1,3 +1,10 @@
+<?php
+
+/**
+ * @file
+ * Override of Bootstrap html.tpl.php.
+ */
+?>
<header id="navbar" class="<?php print $nav_style; ?>" role="banner">
<div class="navbar-inner">
<div class="<?php print $container; ?>">
diff --git a/theme-settings.php b/theme-settings.php
index 8e3bafd1cc77e49a4779cdecde08e6a4dacb4659..c25731ec1d182c657bdc12b81079cb90a5d4b7fc 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -1,5 +1,7 @@
<?php
-
+/**
+ * Prameter definitions for Bootstrap Barrio.
+ */
function bootstrap_barrio_form_system_theme_settings_alter(&$form, $form_state, $form_id = NULL) {
// Work-around for a core bug affecting admin themes. See issue #943212.
if (isset($form_id)) {
@@ -83,4 +85,3 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, $form_state,
);
}
-