From cd1eebb66c2c57dd5a64c2a79d7439583a8d6028 Mon Sep 17 00:00:00 2001
From: slothman <slothman>
Date: Thu, 28 Feb 2008 03:26:03 +0000
Subject: [PATCH] Allow attribution for colorsets Added criterion colorsets, in
 fixed and fluid variations

---
 templates/bulletproof/config.inc.php          |  14 +-
 .../bulletproof/criterion_fluid_license.txt   |   1 +
 .../bulletproof/criterion_fluid_style.css     | 211 ++++++++++++
 templates/bulletproof/criterion_license.txt   |   1 +
 templates/bulletproof/criterion_style.css     | 309 ++++++++++++++++++
 templates/bulletproof/img/criterion_back.png  | Bin 0 -> 979 bytes
 templates/bulletproof/img/criterion_body.png  | Bin 0 -> 1055 bytes
 templates/bulletproof/img/criterion_entry.png | Bin 0 -> 464 bytes
 .../bulletproof/img/criterion_fluid_back.png  | Bin 0 -> 979 bytes
 .../img/criterion_fluid_forward.png           | Bin 0 -> 980 bytes
 .../img/criterion_fluid_graph_bar.png         | Bin 0 -> 258 bytes
 .../bulletproof/img/criterion_forward.png     | Bin 0 -> 980 bytes
 .../bulletproof/img/criterion_graph_bar.png   | Bin 0 -> 258 bytes
 .../bulletproof/img/criterion_pagefooter.png  | Bin 0 -> 306 bytes
 .../bulletproof/img/criterion_sbcontent.png   | Bin 0 -> 451 bytes
 .../bulletproof/img/criterion_sbtitle.png     | Bin 0 -> 305 bytes
 templates/bulletproof/img/criterion_tab.png   | Bin 0 -> 325 bytes
 .../bulletproof/img/criterion_tabactive.png   | Bin 0 -> 337 bytes
 .../bulletproof/img/criterion_tabhover.png    | Bin 0 -> 320 bytes
 templates/bulletproof/index.tpl               |   5 +-
 20 files changed, 538 insertions(+), 3 deletions(-)
 create mode 100644 templates/bulletproof/criterion_fluid_license.txt
 create mode 100644 templates/bulletproof/criterion_fluid_style.css
 create mode 100644 templates/bulletproof/criterion_license.txt
 create mode 100644 templates/bulletproof/criterion_style.css
 create mode 100644 templates/bulletproof/img/criterion_back.png
 create mode 100644 templates/bulletproof/img/criterion_body.png
 create mode 100644 templates/bulletproof/img/criterion_entry.png
 create mode 100644 templates/bulletproof/img/criterion_fluid_back.png
 create mode 100644 templates/bulletproof/img/criterion_fluid_forward.png
 create mode 100644 templates/bulletproof/img/criterion_fluid_graph_bar.png
 create mode 100644 templates/bulletproof/img/criterion_forward.png
 create mode 100644 templates/bulletproof/img/criterion_graph_bar.png
 create mode 100644 templates/bulletproof/img/criterion_pagefooter.png
 create mode 100644 templates/bulletproof/img/criterion_sbcontent.png
 create mode 100644 templates/bulletproof/img/criterion_sbtitle.png
 create mode 100644 templates/bulletproof/img/criterion_tab.png
 create mode 100644 templates/bulletproof/img/criterion_tabactive.png
 create mode 100644 templates/bulletproof/img/criterion_tabhover.png

diff --git a/templates/bulletproof/config.inc.php b/templates/bulletproof/config.inc.php
index 07a9732..6eaa47d 100644
--- a/templates/bulletproof/config.inc.php
+++ b/templates/bulletproof/config.inc.php
@@ -306,7 +306,7 @@ $template_config = array(
     )
 );
 
-$template_loaded_config = serendipity_loadThemeOptions($template_config, $serendipity['smarty_vars']['template_option']);
+$template_loaded_config = &serendipity_loadThemeOptions($template_config, $serendipity['smarty_vars']['template_option']);
 
 $navlinks = array();
 
@@ -330,3 +330,15 @@ for ($i = 0; $i < $template_loaded_config['amount']; $i++) {
 }
 
 $serendipity['smarty']->assign_by_ref('navlinks', $navlinks);
+
+// Allow colorset authors to include license and attribution data
+$colorset_data = array();  // Maybe we'll want more data later...
+$colorset_data['attribution'] = $template_loaded_config['colorset'] . ' colorset provided under BSD license.';
+$attribution_file = dirname(__FILE__) . '/' . $template_loaded_config['colorset'] . '_license.txt';
+if (is_readable($attribution_file)) {
+	$attribution = file_get_contents($attribution_file);
+	if (!empty($attribution)) {
+		$colorset_data['attribution'] = $attribution;
+	}
+}
+$template_loaded_config['colorset_data'] = $colorset_data;
diff --git a/templates/bulletproof/criterion_fluid_license.txt b/templates/bulletproof/criterion_fluid_license.txt
new file mode 100644
index 0000000..0048dbe
--- /dev/null
+++ b/templates/bulletproof/criterion_fluid_license.txt
@@ -0,0 +1 @@
+criterion <a href="http://creativecommons.org/licenses/by/2.5/">CC BY</a> <a href="http://freecsstemplates.org/">Free CSS Templates</a>
diff --git a/templates/bulletproof/criterion_fluid_style.css b/templates/bulletproof/criterion_fluid_style.css
new file mode 100644
index 0000000..08763f8
--- /dev/null
+++ b/templates/bulletproof/criterion_fluid_style.css
@@ -0,0 +1,211 @@
+/*
+Design by Free CSS Templates
+http://www.freecsstemplates.org
+Released for free under a Creative Commons Attribution 2.5 License
+
+Adapted for Serendipity BulletProof Template as a colorset by Judebert
+http://judebert.com/
+*/
+
+* {
+margin: 0pt;
+padding: 0pt;
+}
+
+#wrapper {
+  font-size: 100%;
+}
+
+body {
+  background: #FFFFFF url(img/criterion_body.png) repeat-x;
+  /*--JAM: (I don't like this) font: normal small "Trebuchet MS", Arial, Helvetica, sans-serif; */
+  font: normal small "Trebuchet MS", Arial, Helvetica, sans-serif;
+  color: #666666;
+}
+
+h1, h2, h3 {
+  color: #586BAA;
+}
+
+blockquote {
+  margin-left: 3em;
+}
+
+/* This is not really needed; if used, fix {#sitenav ul}, {#sbsitenav ul}, {#skiplinks ul}, {ul.archivesrow}, and {ul.staticpage_navigation}, along with their <li>s
+ul {
+  margin-left: 3em;
+}
+
+ul li {
+}
+
+ol {
+  margin-left: 3em;
+}
+
+ol li {
+}
+*/
+
+.serendipity_entry_body ul,
+.serendipity_entry_body ol {
+	margin-left: 3em;
+}
+
+
+a {
+  color: #586BAA;
+}
+
+a:hover {
+  text-decoration: none;
+}
+
+/* Sidebar items (criterion Boxed Style) */
+.serendipitySideBarItem {
+  margin-bottom: 20px;
+}
+
+.serendipitySideBarItem .serendipitySideBarTitle {
+  height: 31px;
+  padding: 9px 0 0 20px;
+  background: #6FBE6E url(img/criterion_sbtitle.png) repeat-x;
+  font-size: 1.2em;
+  color: #CC0000;
+}
+
+.serendipitySideBarItem .serendipitySideBarContent {
+  padding: 20px 20px 40px 20px;
+  background: url(img/criterion_sbcontent.png) repeat-x;
+}
+
+/* entries (criterion Post) */
+.serendipity_title {
+  padding: 5px 0 0 20px;
+  font-size: 2em;
+  font-weight: normal;
+}
+
+.serendipity_title a {
+  text-decoration: none;
+}
+
+.serendipity_entry {
+  padding: 20px 20px 10px 20px;
+  background: url(img/criterion_entry.png) repeat-x;
+}
+
+.serendipity_entry_body p, 
+.serendipity_entry_body blockquote, 
+.serendipity_entry_body ul, 
+.serendipity_entry_body ol {
+  margin-bottom: 1.5em;
+  line-height: 180%;
+}
+
+/* Sitenav tabs (criterion Menu) */
+#sitenav {
+  width: auto;
+  height: 90px;
+  margin: 0 auto;
+  padding: 0;
+  float: none;
+}
+
+#sitenav ul {
+  display: block;
+  margin: 0;
+  padding-top: 25px;
+}
+
+/* Already handled by BP
+#sitenav li {
+  display: inline;
+}
+*/
+
+#sitenav ul li {
+  /* Override index.php */
+  padding: 0;
+}
+
+#sitenav a {
+  display: block;
+  float: left;
+  height: 32px;
+  margin-left: 1px;
+  padding: 13px 25px 0 25px;
+  background: #FFFFFF url(img/criterion_tab.png) repeat-x;
+  text-align: center;
+  text-decoration: none;
+  font-weight: bold;
+  color: #586BAA;
+}
+
+#sitenav a:hover {
+  background-image: url(img/criterion_tabhover.png);
+  border-color: #FEDA8D;
+  color: #CC0000;
+}
+
+#sitenav .currentpage a {
+  height: 36px;
+  margin-top: -4px;
+  background-image: url(img/criterion_tabactive.png);
+  border: 1px solid #479AC6;
+  border-bottom: none;
+  font-weight: bold;
+  color: #479AC6;
+}
+
+/* Banner (criterion Logo */
+#serendipity_banner {
+  height: 60px;
+  margin: 0 auto;
+}
+
+#serendipity_banner h1 {
+  float: left;
+  letter-spacing: -2px;
+  font-size: 36px;
+  font-weight: normal;
+}
+
+#serendipity_banner h2 {
+  float: left;
+  font-size: 14px;
+  font-weight: normal;
+}
+
+#serendipity_banner a {
+  text-decoration: none;
+  text-transform: lowercase;
+  font-style: italic;
+  color: #479AC6;
+}
+
+/* criterion Content */
+/* Nothing in BP exactly matches this.  As it sets the width of the page, 
+ * it's closest to #wrapper; however, criterion uses #content to wrap the 
+ * entries and sidebar, leaving #logo and #menu outside.  BP puts everything
+ * in #wrapper, and only the entries in #content.
+ */
+#wrapper {
+  width: 95%;
+  margin: 0 auto;
+}
+
+/* Footer (criterion Footer) (Imagine that!) */
+#footer {
+  clear: both;
+  width: 740px;
+  margin: 0 auto;
+  padding: 30px 0;
+  background: url(img/criterion_pagefooter.png) repeat-x;
+}
+
+#footer p {
+  margin: 0;
+  text-align: center;
+  font-size: x-small;
+}
diff --git a/templates/bulletproof/criterion_license.txt b/templates/bulletproof/criterion_license.txt
new file mode 100644
index 0000000..0048dbe
--- /dev/null
+++ b/templates/bulletproof/criterion_license.txt
@@ -0,0 +1 @@
+criterion <a href="http://creativecommons.org/licenses/by/2.5/">CC BY</a> <a href="http://freecsstemplates.org/">Free CSS Templates</a>
diff --git a/templates/bulletproof/criterion_style.css b/templates/bulletproof/criterion_style.css
new file mode 100644
index 0000000..bfe46f2
--- /dev/null
+++ b/templates/bulletproof/criterion_style.css
@@ -0,0 +1,309 @@
+/*
+Design by Free CSS Templates
+http://www.freecsstemplates.org
+Released for free under a Creative Commons Attribution 2.5 License
+
+Adapted for Serendipity BulletProof Template as a colorset by Judebert
+http://judebert.com/
+*/
+
+* {
+margin: 0pt;
+padding: 0pt;
+}
+
+#wrapper {
+  font-size: 100%;
+  /*
+  width: 100%;
+  */
+}
+
+body {
+  background: #FFFFFF url(img/criterion_body.png) repeat-x;
+  /*--JAM: (I don't like this) font: normal small "Trebuchet MS", Arial, Helvetica, sans-serif; */
+  font: normal small "Trebuchet MS", Arial, Helvetica, sans-serif;
+  color: #666666;
+}
+
+h1, h2, h3 {
+  color: #586BAA;
+}
+
+blockquote {
+  margin-left: 3em;
+}
+
+/* This is not really needed; if used, fix {#sitenav ul}, {#sbsitenav ul}, {#skiplinks ul}, {ul.archivesrow}, and {ul.staticpage_navigation}, along with their <li>s
+ul {
+  margin-left: 3em;
+}
+
+ul li {
+}
+
+ol {
+  margin-left: 3em;
+}
+
+ol li {
+}
+*/
+
+.serendipity_entry_body ul,
+.serendipity_entry_body ol {
+	margin-left: 3em;
+}
+
+a {
+  color: #586BAA;
+}
+
+a:hover {
+  text-decoration: none;
+}
+
+/* Sidebar items (criterion Boxed Style) */
+.serendipitySideBarItem {
+  margin-bottom: 20px;
+}
+
+.serendipitySideBarItem .serendipitySideBarTitle {
+  height: 31px;
+  padding: 9px 0 0 20px;
+  background: #6FBE6E url(img/criterion_sbtitle.png) repeat-x;
+  font-size: 1.2em;
+  color: #CC0000;
+}
+
+.serendipitySideBarItem .serendipitySideBarContent {
+  padding: 20px 20px 40px 20px;
+  background: url(img/criterion_sbcontent.png) repeat-x;
+}
+
+/* entries (criterion Post) */
+.serendipity_title {
+  padding: 5px 0 0 20px;
+  font-size: 2em;
+  font-weight: normal;
+}
+
+.serendipity_title a {
+  text-decoration: none;
+}
+
+.serendipity_entry {
+  padding: 20px 20px 10px 20px;
+  background: url(img/criterion_entry.png) repeat-x;
+}
+
+.serendipity_entry_body p, 
+.serendipity_entry_body blockquote, 
+.serendipity_entry_body ul, 
+.serendipity_entry_body ol {
+  margin-bottom: 1.5em;
+  line-height: 180%;
+}
+
+/* Oddly, criterion doesn't have any Header 
+ * The closest thing is div#logo, which contains an h1 and h2.
+#header {
+  width: 740px;
+  height: 150px;
+  margin: 0 auto;
+}
+*/
+
+/* Sitenav tabs (criterion Menu) */
+#sitenav {
+  width: 740px;
+  height: 90px;
+  margin: 0 auto;
+  padding: 0;
+  float: none;
+}
+
+#sitenav ul {
+  display: block;
+  margin: 0;
+  padding-top: 25px;
+}
+
+/* Already handled by BP
+#sitenav li {
+  display: inline;
+}
+*/
+
+#sitenav ul li {
+  /* Override index.php */
+  padding: 0;
+}
+
+#sitenav a {
+  display: block;
+  float: left;
+  height: 32px;
+  margin-left: 1px;
+  padding: 13px 25px 0 25px;
+  background: #FFFFFF url(img/criterion_tab.png) repeat-x;
+  text-align: center;
+  text-decoration: none;
+  font-weight: bold;
+  color: #586BAA;
+}
+
+#sitenav a:hover {
+  background-image: url(img/criterion_tabhover.png);
+  border-color: #FEDA8D;
+  color: #CC0000;
+}
+
+#sitenav .currentpage a {
+  height: 36px;
+  margin-top: -4px;
+  background-image: url(img/criterion_tabactive.png);
+  border: 1px solid #479AC6;
+  border-bottom: none;
+  font-weight: bold;
+  color: #479AC6;
+}
+
+/* Banner (criterion Logo */
+#serendipity_banner {
+  width: 740px;
+  height: 60px;
+  margin: 0 auto;
+}
+
+#serendipity_banner h1 {
+  float: left;
+  letter-spacing: -2px;
+  font-size: 36px;
+  font-weight: normal;
+}
+
+#serendipity_banner h2 {
+  float: left;
+  font-size: 14px;
+  font-weight: normal;
+}
+
+#serendipity_banner a {
+  text-decoration: none;
+  text-transform: lowercase;
+  font-style: italic;
+  color: #479AC6;
+}
+
+/* criterion Content */
+/* Nothing in BP exactly matches this.  As it sets the width of the page, 
+ * it's closest to #wrapper; however, criterion uses #content to wrap the 
+ * entries and sidebar, leaving #logo and #menu outside.  BP puts everything
+ * in #wrapper, and only the entries in #content.
+ */
+#wrapper {
+  width: 740px;
+  margin: 0 auto;
+}
+
+/* criterion Content > Main */
+/* This doesn't fit well in BP.  As #main contains only entries, the idea
+ * appears to be to float the entries in a right "column".  BP takes care
+ * of column placement on its own.  But we can still take care of the width.
+ */
+/* Two columns, main and sidebar, just like criterion */
+.twomain {
+  width: 505px;
+}
+/* Three columns, main and two equal sidebars */
+.threemain {
+  width: 400px;
+}
+
+/* criterion Content > Sidebar */
+/* Again, this doesn't fit well in BP. #sidebar contains, predictably; the
+ * sidebar, which criterion floats left.  BP still handles column placement
+ * with no intervention from me (which allows multiple layouts).  Note that
+ * #login is a sidebar box, which doesn't apply to s9y.
+ * 
+ * However, Serendipity does have sidebars, and in a fixed-width template,
+ * it's important to get the size right.
+ */
+/* Two columns, main and sidebar, just like criterion */
+.twoside {
+  width: 220px;
+}
+/* Three columns, main and two equal sidebars */
+.threeside {
+  width: 160px;
+}
+/* Bottom sidebars, 5 items at a time */
+.onefull .serendipitySideBarItem {
+  width: 18%
+}
+
+/* These are the specific sidebar items in the original criterion
+#login fieldset {
+  border: none;
+}
+
+#login legend {
+  display: none;
+}
+
+#login label {
+  font-size: x-small;
+  font-weight: bold;
+}
+
+#login input {
+  margin-bottom: 5px;
+}
+
+#inputtext1, #inputtext2 {
+  width: 170px;
+  padding: 2px;
+  font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  color: #666666;
+}
+
+#inputsubmit1 {
+}
+
+/* criterion Content > Sidebar > Updates*/
+/* This might be useful in the s9y recent plugin.
+#updates {
+}
+
+#updates ul {
+  margin: 0;
+  list-style: none;
+}
+
+#updates h3 {
+  margin: 0;
+  font: bold x-small Verdana, Arial, Helvetica, sans-serif;
+}
+
+#updates p {
+  margin-bottom: 1.4em;
+  font-size: smaller;
+  line-height: normal;
+}
+*/
+
+/* Footer (criterion Footer) (Imagine that!) */
+#footer {
+  clear: both;
+  width: 740px;
+  margin: 0 auto;
+  padding: 30px 0;
+  background: url(img/criterion_pagefooter.png) repeat-x;
+}
+
+#footer p {
+  margin: 0;
+  text-align: center;
+  font-size: x-small;
+}
diff --git a/templates/bulletproof/img/criterion_back.png b/templates/bulletproof/img/criterion_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6ca30cafa4a88903c534fa865f120e239d38189
GIT binary patch
literal 979
zcmV;^11$WBP)<h;3K|Lk000e1NJLTq000aC000aK0{{R47Ob2@00004XF*Lt006O%
z3;baP00093P)t-shX4TDH#zv|+x~?s<@x@#xXJ$h{EV^H^ZNZREie4~^u*ilk+|mo
z005bpng3=0W|{w)004TEte6}e?#^oeGBRdnW;ZqfZ2$oM0RaFq0BDZ4%m4tG4+qQ3
z%ZG}t0W)R_x#hmTz5p_gu>b&*lat-u-2wt<ngAvMu>b$n9Q~OAsi~>n=I<vsgv>Jl
zW|_?Y%mAUGq3mb?|CuyRkj<LQ{nY9F95hzA%!k$>CH(pB_4M^IWX+_#;$~*d%H;ja
z1||SznWd$rot~ZL?De&^wbj+t{F!ElbAAhKY(+&x{;n*;!^4e^jpb=4{p+d!etrK!
z0RLWH{mn=B_xN+1!_dgDn77scav0n3{P*toudlEB*|q)l?D6sM$K3h<`~L(s&77N@
ze4@s~#I<yHrQ(2upRnF^b8i1lO^2$^005Zq_4%N`*Ynwi-?RQFCUNNK-v5#>x!?Qs
zrIY=uQ2lu&*QEcb!`uc#f=OV1|Hh5~Jw5!%qaG0x)@gL$SX}1j=E`jW|NiLJ-RN$3
zii3lM|CUh8*51&Um;YoJ|BQ@hnycU2*X^91>(l$Y$kJw;0JYBc|F~@bXlT&T(EizX
z`Sr(_tkUn?+W)wJ|5_5U8aq&Dh2`7G2Od2@EH_tJo2R(S``*IyGBW%7`?z9a{nVq~
z>h`5LIFF;+<i5nLNJ!<-zxbGt8b=w`qM~V|>O05k(&O@$a<S!gE|sgrSeMZH!kI~r
z=yjyCYKCS1qh`~D3i+r7{L|2&sF>ZywEz3nZ>82#M9F%r+RMh48ouYBpT%2TUH<2d
z$CvKeqduF#<NsnM_VDF~ue~Z&fmU@<|KiBb@%s`~t=w`?W1iFh*kjMn;&*s=vCiqS
zh1BMnfzU%0L1#Yk$GP(E<cpA&ci8aAvzpphC(4ykzrWb+xTdeRz2@S<+T6~bxyvbe
z=i;_y|E+iBsC-{Zbf(AVbB^A;)$CSx+GK*;c3P3)$*%_hU-iexL^M-@nc(j3?*IS)
z!(D4e00001VoOIv0Eh)0NB{r;32;bRa{vGf6951U69E94oEQKA00(qQO+^RS0|pEr
z8ClWRJpcdzNl8ROR0!8ij6n_nAq)ch5{^EchnA&ibSEJ=X>AFGE|fzDezg*G?;`11
zMza8@*395y${Rl$d{r0Ad|(bn7>?N9<X{ml`T#5dS13J$f5rd+002ovPDHLkV1kTY
B6$bzS

literal 0
HcmV?d00001

diff --git a/templates/bulletproof/img/criterion_body.png b/templates/bulletproof/img/criterion_body.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e2cb359e2315d4830b32874f2a9a96928aa08ff
GIT binary patch
literal 1055
zcmX9+3rv#-5U#@o#>P;VR5A%H42cmWL&)OP2$)hHLa7y<%eIUG*%oFtHi$X|bb|6S
z3)p}>#~g!+1q2GErBDP47D`*7v^+{Fr7dlF_xbmI`^_%-?)&m3ce%@58Icg@<@uo}
z27~cRh{usoc0*C)@g|3UJyw9yp&U}&B}^CJPmAguVp3`>061MPyVK=xx~vZ8rVd%(
zGi~gf^%lDYbzNX{IM;Sf+eYgFVl&$uduH43gG-NJN&XmJRqHKV28+gELF`WXp4n)%
z%XUqO%^}@2DGv~X#jZnaI>fF*$?4oT+jdPh7l77a*)m#9Hit%U*)dvoOx9hK)ns)j
z4$O)J#AtP>^@vi3pfv`oJ+6L|1<()hTfgXEf%4hRMk8&ajj#NNrzjp;E@m!wFQ};^
zbq7Gr#M+~w<?4yGo&|L)Ptn3tJQ`lP-6twyF8?_#zt32j0chZ?cLG$5NNOi#Rb$fj
zStV7Z`Fm#LY4>p5Ygxyfs!O=}7gyfG;`Is@-NMcM0deR2CS^|bT%f#1U*rH(j!9nu
zFaVxUhy(yt<I)29;_ZG>^R%1}Kto4e)Z85q*K^jX09`z351Ik;XySgch6iw`Uqoh0
z$?UbJDfx?8RpZop8B0>eS}A3%6w()G(JdxrqX6Ro(*P3y-2lS?On}z_BLI^Ce1Kkn
z4nBVn)i&D{z&ya1Ryzkk6^n-e1_0Oq6x0OZ==CoFxBz_sgECp<D(fEl1n*?Wf02X1
zy!*i$9KzH$`l6<LZbEXb`_fx}ZXPFur+=oR|G`MW#iX7TRF7Y~8c4+4pG%1)9<K5^
zN<0#D_-!}l|B=Bw@6zyB-DSv(-`2?DRTiD&D*TMm$>`hL>88<m9J9v=7E7nozuzc)
z(AgHeuyuOjrRZj4B$3n`qiat8^;AeZg)7fjHC9t22q`1;wAIO8d=WmP=oX&)WoJ!$
zd)zty^OiGFg3(d867Q1C&#zs%QpFQhgtSQ{+TEt_oOw;#HCO_nFgrJgot*LU<;yZ(
z`tkL!sOG)BrwbQF`qWfhGB4;M`Qea&o00FR;Y$dG0Ra)8ij%&{3Ao$RVnp`C9a*)E
zdD07t`Xn<{(Mze2N>e%tZ>XfRM;aQU>YQh}ve6h%&x=AsTS?j{rOP+*&xoZuoi4tW
z6do4#eqB;<TWhNvvG?2v&CJY9qb_@Rdmj@Dg>%~6I~V-ZGctZT*Q7D!eHC^rv6YmR
zkTAM!+AvtN&-$_1?9yAzCXMEY@bK`X6j34$S6o|J8GZda7T;18{ZVvQ)~TNcj#nq1
zs80$$6A=;a`yLLDFZU_KJuWZzAwPNI;pJ7}kHwlV1O+J>Xn!)9Z1o1rkC)S@0>2Fj
QMDL18h$Y~<E~P#A4}ij(0{{R3

literal 0
HcmV?d00001

diff --git a/templates/bulletproof/img/criterion_entry.png b/templates/bulletproof/img/criterion_entry.png
new file mode 100644
index 0000000000000000000000000000000000000000..2101de313f3ae5560a0ed4ee710ea58e69a9647d
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq00093003kN0{{R3bO(BG00001b5ch_0Itp)
z=>Px#pHNIxMgRZ*+w1iE{r=wV_1x_A{Qds@{{H#={o?QT>-72d`uy7K^xf?A^7#Ay
z{{Qgz`t9}k-|hA1^7!TP_u=pM@AmrU@%Q-q{q_3%@%Q`w|Nr3b_2lsP>GSxJ!rk5M
z_3rli?DYBf`~2hZ_U!ff<L~zO`~B$i`1Sex^!fby{Qc<i`1APt^ZEPg^!eZJ_4N7s
z`uzUx_4?uN_UH2VGEK0|00009a7bBm000XU000XU0RWnu7ytkO2XskIMF-dd90Ld$
z{6Z5n0002DNkl<Z7}Jf$2NHrn5Jb_BiJ%xjk_rmu9PfWNd&&#A?@!lKRTcF67LMRJ
z*6-ixSZHA|uviN1wuKfZ6N|erpIf|z>D0m#Jdf=b*1}?85esolnnEgkK12~j!uia8
z52a9++-~3tzE54lMi`GRUczccl0YJiMizxo6oes!!sWvC3J>9U<Zyso$a8`K0-<Tx
z?I07f4A%u08<*1wo<gf-p@nYOLJPf~g%*ZGi<vOf{r|pcLk@!=cgA1<0000<MNUMn
GLSTZimIWXH

literal 0
HcmV?d00001

diff --git a/templates/bulletproof/img/criterion_fluid_back.png b/templates/bulletproof/img/criterion_fluid_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6ca30cafa4a88903c534fa865f120e239d38189
GIT binary patch
literal 979
zcmV;^11$WBP)<h;3K|Lk000e1NJLTq000aC000aK0{{R47Ob2@00004XF*Lt006O%
z3;baP00093P)t-shX4TDH#zv|+x~?s<@x@#xXJ$h{EV^H^ZNZREie4~^u*ilk+|mo
z005bpng3=0W|{w)004TEte6}e?#^oeGBRdnW;ZqfZ2$oM0RaFq0BDZ4%m4tG4+qQ3
z%ZG}t0W)R_x#hmTz5p_gu>b&*lat-u-2wt<ngAvMu>b$n9Q~OAsi~>n=I<vsgv>Jl
zW|_?Y%mAUGq3mb?|CuyRkj<LQ{nY9F95hzA%!k$>CH(pB_4M^IWX+_#;$~*d%H;ja
z1||SznWd$rot~ZL?De&^wbj+t{F!ElbAAhKY(+&x{;n*;!^4e^jpb=4{p+d!etrK!
z0RLWH{mn=B_xN+1!_dgDn77scav0n3{P*toudlEB*|q)l?D6sM$K3h<`~L(s&77N@
ze4@s~#I<yHrQ(2upRnF^b8i1lO^2$^005Zq_4%N`*Ynwi-?RQFCUNNK-v5#>x!?Qs
zrIY=uQ2lu&*QEcb!`uc#f=OV1|Hh5~Jw5!%qaG0x)@gL$SX}1j=E`jW|NiLJ-RN$3
zii3lM|CUh8*51&Um;YoJ|BQ@hnycU2*X^91>(l$Y$kJw;0JYBc|F~@bXlT&T(EizX
z`Sr(_tkUn?+W)wJ|5_5U8aq&Dh2`7G2Od2@EH_tJo2R(S``*IyGBW%7`?z9a{nVq~
z>h`5LIFF;+<i5nLNJ!<-zxbGt8b=w`qM~V|>O05k(&O@$a<S!gE|sgrSeMZH!kI~r
z=yjyCYKCS1qh`~D3i+r7{L|2&sF>ZywEz3nZ>82#M9F%r+RMh48ouYBpT%2TUH<2d
z$CvKeqduF#<NsnM_VDF~ue~Z&fmU@<|KiBb@%s`~t=w`?W1iFh*kjMn;&*s=vCiqS
zh1BMnfzU%0L1#Yk$GP(E<cpA&ci8aAvzpphC(4ykzrWb+xTdeRz2@S<+T6~bxyvbe
z=i;_y|E+iBsC-{Zbf(AVbB^A;)$CSx+GK*;c3P3)$*%_hU-iexL^M-@nc(j3?*IS)
z!(D4e00001VoOIv0Eh)0NB{r;32;bRa{vGf6951U69E94oEQKA00(qQO+^RS0|pEr
z8ClWRJpcdzNl8ROR0!8ij6n_nAq)ch5{^EchnA&ibSEJ=X>AFGE|fzDezg*G?;`11
zMza8@*395y${Rl$d{r0Ad|(bn7>?N9<X{ml`T#5dS13J$f5rd+002ovPDHLkV1kTY
B6$bzS

literal 0
HcmV?d00001

diff --git a/templates/bulletproof/img/criterion_fluid_forward.png b/templates/bulletproof/img/criterion_fluid_forward.png
new file mode 100644
index 0000000000000000000000000000000000000000..60804ee2afa0b7afe98bc6e3c3bbfc695433e2b1
GIT binary patch
literal 980
zcmV;_11tQAP)<h;3K|Lk000e1NJLTq000aC000aK0{{R47Ob2@00004XF*Lt006O%
z3;baP00093P)t-shX4TDH#zv|+x~?s<@x@#xXJ$h{EV^H^ZNZREie4~^u*ilk+|mo
z005bpng3=0W|{w)004TEte6}e?#^oeGBRdnW;ZqfZ2$oM0RaFq0BDZ4%m4tG4+qQ3
z%ZG}t0W)R_x#hmTz5p_gu>b&*lat-u-2wt<ngAvMu>b$n9Q~OAsi~>n=I<vsgv>Jl
zW|_?Y%mAUGq3mb?|CuyRkj<LQ{nY9F95hzA%!k$>CH(pB_4M^IWX+_#;$~*d%H;ja
z1||SznWd$rot~ZL?De&^wbj+t{F!ElbAAhKY(+&x{;n*;!^4e^jpb=4{p+d!etrK!
z0RLWH{mn=B_xN+1!_dgDn77scav0n3{P*toudlEB*|q)l?D6sM$K3h<`~L(s&77N@
ze4@s~#I<yHrQ(2upRnF^b8i1lO^2$^005Zq_4%N`*Ynwi-?RQFCUNNK-v5#>x!?Qs
zrIY=uQ2lu&*QEcb!`uc#f=OV1|Hh5~Jw5!%qaG0x)@gL$SX}1j=E`jW|NiLJ-RN$3
zii3lM|CUh8*51&Um;YoJ|BQ@hnycU2*X^91>(l$Y$kJw;0JYBc|F~@bXlT&T(EizX
z`Sr(_tkUn?+W)wJ|5_5U8aq&Dh2`7G2Od2@EH_tJo2R(S``*IyGBW%7`?z9a{nVq~
z>h`5LIFF;+<i5nLNJ!<-zxbGt8b=w`qM~V|>O05k(&O@$a<S!gE|sgrSeMZH!kI~r
z=yjyCYKCS1qh`~D3i+r7{L|2&sF>ZywEz3nZ>82#M9F%r+RMh48ouYBpT%2TUH<2d
z$CvKeqduF#<NsnM_VDF~ue~Z&fmU@<|KiBb@%s`~t=w`?W1iFh*kjMn;&*s=vCiqS
zh1BMnfzU%0L1#Yk$GP(E<cpA&ci8aAvzpphC(4ykzrWb+xTdeRz2@S<+T6~bxyvbe
z=i;_y|E+iBsC-{Zbf(AVbB^A;)$CSx+GK*;c3P3)$*%_hU-iexL^M-@nc(j3?*IS)
z!(D4e00001VoOIv0Eh)0NB{r;32;bRa{vGf6951U69E94oEQKA00(qQO+^RS0|pEs
z1yswsGXMYpN=ZaPR0!8ajKK}SFbo1c3C|ABpipqC6bX?F$YTsNm{>9L;<FA*4YKr9
z9RMD;LxYVh4((@$x$3JzJNDoLS0A*Ye$bg2SAGGZ&sQiO#=yA%0000<MNUMnLSTaO
CbQjzJ

literal 0
HcmV?d00001

diff --git a/templates/bulletproof/img/criterion_fluid_graph_bar.png b/templates/bulletproof/img/criterion_fluid_graph_bar.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c48022079f7ee6752d7264d3b05ba7286477bd7
GIT binary patch
literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^OhC-V0VEmI8Z<h99F}xPUq=Rpjs4tz5?O(Kwj^(N
z7l!{JxM1({$v_d#0*}aI1_o|n5N2eUHAey{$X?><>&kwenT^MoAtuy5A1EYS;u=xn
zoS&PUnpeW$T$GwvlA5AWo>`Ki5R#Fq;O^-g@IFN~52!HA)5S4_<2s`^!<PRH?lmhI
z?mT_RFlobShTLg88MdFk%ivkFf=N|MkV!>a2uKSt+<pFzF{*PTBha-#E{IZ-76cl^
jq9QE_<T1Yc{2fRgn=5kq!bJfdpag@btDnm{r-UW|q?AL&

literal 0
HcmV?d00001

diff --git a/templates/bulletproof/img/criterion_forward.png b/templates/bulletproof/img/criterion_forward.png
new file mode 100644
index 0000000000000000000000000000000000000000..60804ee2afa0b7afe98bc6e3c3bbfc695433e2b1
GIT binary patch
literal 980
zcmV;_11tQAP)<h;3K|Lk000e1NJLTq000aC000aK0{{R47Ob2@00004XF*Lt006O%
z3;baP00093P)t-shX4TDH#zv|+x~?s<@x@#xXJ$h{EV^H^ZNZREie4~^u*ilk+|mo
z005bpng3=0W|{w)004TEte6}e?#^oeGBRdnW;ZqfZ2$oM0RaFq0BDZ4%m4tG4+qQ3
z%ZG}t0W)R_x#hmTz5p_gu>b&*lat-u-2wt<ngAvMu>b$n9Q~OAsi~>n=I<vsgv>Jl
zW|_?Y%mAUGq3mb?|CuyRkj<LQ{nY9F95hzA%!k$>CH(pB_4M^IWX+_#;$~*d%H;ja
z1||SznWd$rot~ZL?De&^wbj+t{F!ElbAAhKY(+&x{;n*;!^4e^jpb=4{p+d!etrK!
z0RLWH{mn=B_xN+1!_dgDn77scav0n3{P*toudlEB*|q)l?D6sM$K3h<`~L(s&77N@
ze4@s~#I<yHrQ(2upRnF^b8i1lO^2$^005Zq_4%N`*Ynwi-?RQFCUNNK-v5#>x!?Qs
zrIY=uQ2lu&*QEcb!`uc#f=OV1|Hh5~Jw5!%qaG0x)@gL$SX}1j=E`jW|NiLJ-RN$3
zii3lM|CUh8*51&Um;YoJ|BQ@hnycU2*X^91>(l$Y$kJw;0JYBc|F~@bXlT&T(EizX
z`Sr(_tkUn?+W)wJ|5_5U8aq&Dh2`7G2Od2@EH_tJo2R(S``*IyGBW%7`?z9a{nVq~
z>h`5LIFF;+<i5nLNJ!<-zxbGt8b=w`qM~V|>O05k(&O@$a<S!gE|sgrSeMZH!kI~r
z=yjyCYKCS1qh`~D3i+r7{L|2&sF>ZywEz3nZ>82#M9F%r+RMh48ouYBpT%2TUH<2d
z$CvKeqduF#<NsnM_VDF~ue~Z&fmU@<|KiBb@%s`~t=w`?W1iFh*kjMn;&*s=vCiqS
zh1BMnfzU%0L1#Yk$GP(E<cpA&ci8aAvzpphC(4ykzrWb+xTdeRz2@S<+T6~bxyvbe
z=i;_y|E+iBsC-{Zbf(AVbB^A;)$CSx+GK*;c3P3)$*%_hU-iexL^M-@nc(j3?*IS)
z!(D4e00001VoOIv0Eh)0NB{r;32;bRa{vGf6951U69E94oEQKA00(qQO+^RS0|pEs
z1yswsGXMYpN=ZaPR0!8ajKK}SFbo1c3C|ABpipqC6bX?F$YTsNm{>9L;<FA*4YKr9
z9RMD;LxYVh4((@$x$3JzJNDoLS0A*Ye$bg2SAGGZ&sQiO#=yA%0000<MNUMnLSTaO
CbQjzJ

literal 0
HcmV?d00001

diff --git a/templates/bulletproof/img/criterion_graph_bar.png b/templates/bulletproof/img/criterion_graph_bar.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c48022079f7ee6752d7264d3b05ba7286477bd7
GIT binary patch
literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^OhC-V0VEmI8Z<h99F}xPUq=Rpjs4tz5?O(Kwj^(N
z7l!{JxM1({$v_d#0*}aI1_o|n5N2eUHAey{$X?><>&kwenT^MoAtuy5A1EYS;u=xn
zoS&PUnpeW$T$GwvlA5AWo>`Ki5R#Fq;O^-g@IFN~52!HA)5S4_<2s`^!<PRH?lmhI
z?mT_RFlobShTLg88MdFk%ivkFf=N|MkV!>a2uKSt+<pFzF{*PTBha-#E{IZ-76cl^
jq9QE_<T1Yc{2fRgn=5kq!bJfdpag@btDnm{r-UW|q?AL&

literal 0
HcmV?d00001

diff --git a/templates/bulletproof/img/criterion_pagefooter.png b/templates/bulletproof/img/criterion_pagefooter.png
new file mode 100644
index 0000000000000000000000000000000000000000..665409fae4c28bf8f2105e668ab5f32f580a6dc1
GIT binary patch
literal 306
zcmV-20nPr2P)<h;3K|Lk000e1NJLTq00093001%w0{{R3uF#Q%00001b5ch_0Itp)
z=>Px#U{Fj{MgRZ*qs-#5)aTIU@$L2bu+-+s;_mA7`1APtv(@Os-tG1J{J`Ao-tF|g
z+w0`;_r~DuuG8lF{Qdp@|NQ;_%;WF)`~BhW_Sfn2@b~(**XX#|>F4tJ+UxYX+3M5h
z@ut<0qyPW_32;bRa{vGf6951U69E94oEQKA00(qQO+^RT0vrPf1?WRhdjJ3cSV=@d
zR0!9d!`l{t02DyMNu?XzloI9t|I%3=J=(LjBuV`KZ5ZS^r=Y5A8_(c4v@MsQuJt|V
zV4kHZ?_gc+JJ(=YbRDmtC}bIrpe!{F_h1}N6SweZAH+oi?(kt_ga7~l07*qoM6N<$
Ef+nV&NdN!<

literal 0
HcmV?d00001

diff --git a/templates/bulletproof/img/criterion_sbcontent.png b/templates/bulletproof/img/criterion_sbcontent.png
new file mode 100644
index 0000000000000000000000000000000000000000..257f9e4e334da9cf2c17826eaf60164dfad439f2
GIT binary patch
literal 451
zcmV;!0X+VRP)<h;3K|Lk000e1NJLTq00093003kN0{{R3bO(BG00001b5ch_0Itp)
z=>Px#kWfriMgRZ*|Mb`Y|Nj5{^#Awa|NZy>{`~*++5h|T|M%nn`||(#?Em)P|M}_v
z{rdm?`2YR+|M%qo`Rf1n-T(US|Ni^`{{8>>=l}KG|Mb@X_1gdS+yD6G|MuSh`tJYq
z*#G<R|M%km_1*vW;Q#vT|N8I${PX|x+W-Ik|M=$r_~`%n=>Puu|NQp<{r3O-^$IDY
zQUCw|32;bRa{vGf6951U69E94oEQKA00(qQO+^RT0vrPeGS_DIy8r+Hxk*GpR2b8Z
z#z~Tb01!mc4+t_SD6<HH^Q`y3U1#;8*In;NMuFXCW8nynWBvW(2%|8cTWH~WrR$&*
zwp)u<Xj={kD1@S57+??<3yY&Ln^|aKzbA?y64q;rUg&%7cW8vB;qic{uv}W?LY{Lv
zK_VmxWeKIQ+gY52X|f1~FeHv47A_Y&4?Ju<zF&9?pAWtdJ~lpC2AQy0S)@Xm@_Iof
tR24x00X6}34YhE);kw{r<Np5tydQA_4KZu%qW=H@002ovPDHLkV1n35_aguR

literal 0
HcmV?d00001

diff --git a/templates/bulletproof/img/criterion_sbtitle.png b/templates/bulletproof/img/criterion_sbtitle.png
new file mode 100644
index 0000000000000000000000000000000000000000..d83718ecdbbec527ec24a21f9a7a676bdedc71b4
GIT binary patch
literal 305
zcmeAS@N?(olHy`uVBq!ia0vp^j6kfx!3-ohG7?-t0>we@P7LeL$-D$|Dgt~$T>n4l
z`+wN^|BZtGd-eWb%lUsL@&BW#|F32Ke>my?e$)T=X8b>B^Z!=Q|DB5epUnM#%<KQ{
zs{hyO{$Gy$f4A}fok{<17XN=d>;Juu|Bq(;zmoF*bkzTQt^co-|39Dk|7_y_6G8uP
zwEo{J_Wx4B|C{CiAN2g+CjEc6`v2Q?4Q@(yKsRs}ctjR6FmMZlFeAgPITAoY_7YED
zSN0oBGR*AiyLJl&0EO&5T^vI=uCpFwXL15^4=fIH3ci{0^uK+{^Jl9?b|wU7?8%i&
zlV7-a^Qn`kGp7Eu?oeeaZ;o1ToN4=aNzrxL(tXUle;x;i0`)R@y85}Sb4q9e0M$^B
A3;+NC

literal 0
HcmV?d00001

diff --git a/templates/bulletproof/img/criterion_tab.png b/templates/bulletproof/img/criterion_tab.png
new file mode 100644
index 0000000000000000000000000000000000000000..db0c246326c08e4ae13127fc505b71bed7595cb7
GIT binary patch
literal 325
zcmV-L0lNN)P)<h;3K|Lk000e1NJLTq00031001or0{{R3Sf%my00001b5ch_0Itp)
z=>Px#giuUWMaSgx`~Cmx_x<Yj{mkh1%I5Xw_5AMm{qOnx$>sF<{r<?~^Y;7x{r>;{
z{{Qp({_*+!slUp;*5mE>{pR%i#NX@p{Qj`T(#huZ$mH_;{{P73^!5Ax{{R2Z>i5Ux
z^YZ%r==S`}=l1&j{{R2~&FJ^c=l06y_4xe$w$9qe<nqep^HC5^&j0`b32;bRa{vGf
z6951U69E94oEQKA00(qQO+^RT0vrPe1#jC^v;Y7AM@d9MR0!7%!wC{X0002MCFw+T
z&>_0X|NqC%thZV!aS?b~>zr)eWLi5*3wxoNhuFc{2LEZ}YNayw^Yj(@xEmZ5dZl~>
XoiYQn_R#8K00000NkvXXu0mjfeDJr*

literal 0
HcmV?d00001

diff --git a/templates/bulletproof/img/criterion_tabactive.png b/templates/bulletproof/img/criterion_tabactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..714d25586c203c44fbe331957d17c84071ee101d
GIT binary patch
literal 337
zcmV-X0j~auP)<h;3K|Lk000e1NJLTq00031001!v0{{R3EU_~d00001b5ch_0Itp)
z=>Px#jZjQfMcnN4+UxYb(%aMI?#SEZ%iZU_(c9VS^X2jP@b~)L>-50W-o)7A{Qds@
z{{PVB@Wj^P!PMW>=<?3s>e}n``uzRh?)Asn<L&kN-R$(!<?q7Q-^twO|NsBi>GRR%
z@!09|*68uS(%tp?{Oa`i)93Nx@Amln{qy+y=<@j1=kU<t>)7e@&EM(K<Lv)t)HMJA
z010qNS#tmY3ljhU3ljkVnw%H_000McNliru*a92_2N#@TBK!aV07^+jK~xCW4Z#Nj
zLI3~&z|&4iG_**x!~dU`JGqs}&P(lW?%?iY=4tO}t5HZjT*W2^Dhr9TwWZ9+#aL_O
jr!#c&byJ!O`k~$*<lqE5=(HnO00000NkvXXu0mjfg9N?>

literal 0
HcmV?d00001

diff --git a/templates/bulletproof/img/criterion_tabhover.png b/templates/bulletproof/img/criterion_tabhover.png
new file mode 100644
index 0000000000000000000000000000000000000000..229072c64dd5b98aaeb9568237a5c39543692383
GIT binary patch
literal 320
zcmV-G0l)r<P)<h;3K|Lk000e1NJLTq00031001or0{{R3Sf%my00001b5ch_0Itp)
z=>Px#fly3TMg7-${n&v0*M9!li2m7%|NsB}*o6Q2>i_=z{_n={&2atKdH(Xx{`K4b
z^V9z6vHt71|M=$r{rLa<^Z)nb{`TMa)O7yZjs4es{n&W^?!x`qhX4BQ|Ni^_^w<9F
zzURek)wE&#*nIuid(Ey~|NQp<`|$qo%l+7b-Mwc1>a`HhIF<ka010qNS#tmY3ljhU
z3ljkVnw%H_000McNliru*a92_1~a*O_iO+F07XeeK~xCW6~PArLI3~&z$0lQ8Z<<k
z{{KMSnOmwAKK8zD7IFtiiM!O+&&ow(=Py%=%v{Af!8lZTdYNpTovgKb5AOk-Y6FQ~
S<OPfX0000<MNUMnLSTZRwWtpO

literal 0
HcmV?d00001

diff --git a/templates/bulletproof/index.tpl b/templates/bulletproof/index.tpl
index fc49b59..4c70c2c 100644
--- a/templates/bulletproof/index.tpl
+++ b/templates/bulletproof/index.tpl
@@ -396,7 +396,8 @@
             <!-- if you create a custom template based on bulletproof.          -->
             <!-- ************************************************************** -->
 
-            <div id="serendipity_credit_line">{$CONST.POWERED_BY} <a href="http://www.s9y.org">s9y</a> &ndash; Template by <a href="http://s9y-bulletproof.com">Bulletproof development team</a>.</div>
+            <div id="serendipity_credit_line">{$CONST.POWERED_BY} <a href="http://www.s9y.org">s9y</a> &ndash; Template by <a href="http://s9y-bulletproof.com">Bulletproof development team</a>.<br />{$template_option.colorset_data.attribution}</div>
+            
             {if $template_option.counter_code_toggle == 'true'}
                 <div class="counter_code">{$template_option.counter_code}</div>
             {/if}
@@ -421,4 +422,4 @@
 {if $is_embedded != true}
     </body>
     </html>
-{/if}
\ No newline at end of file
+{/if}
-- 
2.39.5