Index: /extensions/floPure/Copie de menubar.tpl
===================================================================
--- /extensions/floPure/Copie de menubar.tpl (revision 3333)
+++ /extensions/floPure/Copie de menubar.tpl (revision 3333)
@@ -0,0 +1,220 @@
+{* $Id: menubar.tpl 2409 2008-07-01 02:09:21Z rvelices $ *}
+
+
Index: /extensions/floPure/Copie de picture.tpl
===================================================================
--- /extensions/floPure/Copie de picture.tpl (revision 3333)
+++ /extensions/floPure/Copie de picture.tpl (revision 3333)
@@ -0,0 +1,281 @@
+{* $Id: picture.tpl 2435 2008-07-15 01:29:23Z rvelices $ *}
+{if isset($errors)}
+
+
+ {'Author'|@translate}
+ {if isset($INFO_AUTHOR)}{$INFO_AUTHOR}{else}{'N/A'|@translate}{/if}
+
+
+ {'Created on'|@translate}
+ {if isset($INFO_CREATION_DATE)}{$INFO_CREATION_DATE}{else}{'N/A'|@translate}{/if}
+
+
+ {'Posted on'|@translate}
+ {$INFO_POSTED_DATE}
+
+
+ {'Dimensions'|@translate}
+ {if isset($INFO_DIMENSIONS)}{$INFO_DIMENSIONS}{else}{'N/A'|@translate}{/if}
+
+
+ {'File'|@translate}
+ {$INFO_FILE}
+
+
+ {'Filesize'|@translate}
+ {if isset($INFO_FILESIZE)}{$INFO_FILESIZE}{else}{'N/A'|@translate}{/if}
+
+
+ {'Tags'|@translate}
+
+ {if isset($related_tags)}
+ {foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first}, {/if}
+ {$tag.name} {/foreach}
+ {/if}
+
+
+
+ {'Categories'|@translate}
+
+ {if isset($related_categories)}
+
+ {foreach from=$related_categories item=cat}
+ {$cat}
+ {/foreach}
+
+ {/if}
+
+
+
+ {'Visits'|@translate}
+ {$INFO_VISITS}
+
+ {if isset($available_permission_levels) }
+
+ {'Privacy level'|@translate}:
+
+
+
+ {foreach from=$available_permission_levels item=level}
+ {$pwg->l10n($pwg->sprintf('Level %d',$level))}
+ {/foreach}
+
+
+ {/if}
+ {if isset($rate_summary) }
+
+ {'Average rate'|@translate}
+
+ {if $rate_summary.count}
+ {assign var='rate_text' value='%.2f (rated %d times, standard deviation = %.2f)'|@translate }
+ {$pwg->sprintf($rate_text, $rate_summary.average, $rate_summary.count, $rate_summary.std) }
+ {else}
+ {'no_rate'|@translate}
+ {/if}
+
+
+ {/if}
+
+
+{if isset($metadata)}
+
+
+
+
+
+
+
{'User comments'|@translate}
+
+
+
+
+
{$NAVBAR}
+
+{if isset($comments)}
+
+{/if}
+
+
Index: /extensions/floPure/content.css
===================================================================
--- /extensions/floPure/content.css (revision 3333)
+++ /extensions/floPure/content.css (revision 3333)
@@ -0,0 +1,244 @@
+/* $Id: content.css 2352 2008-05-20 00:27:26Z patdenice $ */
+.content {
+ margin-right: 1em;
+ margin-bottom: 1em; /* when it's longer than menu bar */
+}
+#autre_content {
+ padding-bottom: 1em;
+}
+
+BODY#theCommentsPage .content,
+BODY#theUploadPage .content,
+BODY#theRegisterPage .content,
+BODY#theIdentificationPage .content,
+BODY#theProfilePage .content,
+BODY#theSearchPage .content,
+BODY#theAboutPage .content,
+BODY#thePopuphelpPage .content,
+BODY#thePasswordPage .content,
+BODY#theNotificationPage .content,
+BODY#theTagsPage .content,
+BODY#theNBMPage .content
+{
+ margin: 1em;
+}
+
+.content H3 {
+ margin-bottom: 1ex;
+}
+
+.content H2 { margin-bottom: 3px;} /*<- for IE otherwise calendar select is displaced to middle of page*/
+
+.content H3 {
+ text-align: center;
+}
+
+.content .navigationBar, .content .additional_info {
+ margin: 10px 0;
+ text-align: center;
+}
+
+.content .pageNumberSelected {
+ font-style: italic;
+ font-weight: bold;
+}
+
+.content .additional_info {
+ font-size: 110%;
+}
+
+.content FORM {
+ text-align: left;
+}
+
+/* content defaults */
+.content DL, DD { margin: 10px; }
+.content DT {
+ margin-bottom: 5px;
+ font-style: italic;
+ font-size: 110%;
+}
+
+/* actions */
+UL.categoryActions {
+ margin: 0 2px;
+ width: auto;
+ padding: 0;
+ text-indent: 0;
+ list-style: none;
+ text-align: center;
+}
+
+.content DIV.titrePage UL.categoryActions {
+ float: right;
+ text-align: center;
+}
+
+.content DIV.titrePage {
+ padding: 0;
+}
+
+.content UL.categoryActions LI {
+ display: inline;
+}
+
+.content UL.categoryActions A IMG, UL.categoryActions A {
+ border: none;
+ margin-bottom: -5px;
+}
+
+/* User comments */
+
+.content DIV#comments {
+ padding-left: 5px;
+ padding-right: 5px;
+}
+.content DIV.comment {
+ margin: 0 0 0.5em 0;
+ padding: 0;
+ overflow: hidden; /* these 2 lines keep the floating child in the DIV */
+ width: 100%; /* don't ask why. It's a very usefull trick */
+}
+
+.content DIV.comment A.illustration {
+ display: block;
+ float: left;
+ margin: 0.5em 0 0 0.5em;
+}
+
+.content DIV.comment P.commentHeader {
+ text-align: right;
+ margin: 0.5em 0.5em 0 0;
+}
+
+.content DIV.comment UL.actions {
+ text-align: center;
+ margin: 0.2em;
+}
+
+.content DIV.comment BLOCKQUOTE {
+ margin-right: 0.5em;
+ overflow: visible; /*avoid a very strange margin behaviour (all browsers) */
+}
+
+/* begin chronology/calendar elements*/
+.content DIV.calendarViews {
+ display: block;
+ float: right;
+ margin: 2px 0 0;
+}
+
+.content DIV.calendarBar { margin: 8px 4px; }
+
+SPAN.calItem, SPAN.calItemEmpty {
+ font-weight: bold;
+ margin: 0 1px;
+}
+
+SPAN.calItem A { border:0 }
+
+.content DIV.calendarCalBar {
+ margin: 10px 10px;
+ text-align: left;
+}
+
+SPAN.calCalHead {
+ font-weight: bold;
+ font-size: 110%;
+ margin: 0 2px;
+}
+
+SPAN.calCal { margin: 0 2px; }
+
+/* nice looking month calendar*/
+TABLE.calMonth {
+ border: none;
+ border-collapse: collapse;
+ margin-bottom: 10px; /*<-IE ignores this */
+}
+
+TD.calDayCellFull, TD.calDayCellEmpty, TD.calDayCellBlank {
+ text-align:left;
+ vertical-align: top;
+ font: bold 18px Arial, Helvetica, sans-serif;
+}
+
+TD.calDayHead { font: bold 12px Arial, Helvetica, sans-serif; }
+
+DIV.calImg {
+ overflow: hidden;
+ vertical-align: bottom;
+ z-index: 1;
+ position: relative; /*<- this required by IE*/
+}
+
+.calImg img {
+ position: relative;
+ border: 0;
+}
+
+.calBackDate {
+ padding-left: 4px;
+ padding-top: 0px;
+ z-index: 2;
+ position: absolute;
+ text-align: left;
+ vertical-align: top;
+ color: #000;
+}
+
+.calForeDate {
+ padding-left: 5px;
+ padding-top: 1px;
+ z-index: 3;
+ position: absolute;
+ text-align: left;
+ vertical-align: top;
+ color: #fff;
+}
+
+/* Category thumbnails on main page, CSS code inspired from MOD subcatify */
+.content UL.thumbnailCategories {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+ text-align: center;
+ overflow: hidden;
+ width: 100%;
+}
+
+.content UL.thumbnailCategories LI {
+ margin:0;
+ padding:0;
+ float:left;
+}
+
+.content DIV.thumbnailCategory {
+ display:block;
+ padding: 2px 0px 0px 2px;
+ margin: 5px;
+}
+
+.content DIV.thumbnailCategory DIV.description {
+ font-size: 90%;
+ overflow: auto;
+ /*width: inherit;*/
+}
+
+.content DIV.thumbnailCategory DIV.description H3 {
+ text-align: left;
+ background: transparent;
+ margin: 0;
+ padding: 0.1em;
+ font-size: 120%;
+}
+
+.content DIV.thumbnailCategory DIV.description P {
+ margin: 0;
+}
+
+.content DIV.thumbnailCategory DIV.illustration {
+ text-align: left;
+ margin: 2px 0 0 2px;
+ float: left;
+}
Index: /extensions/floPure/default-colors.css
===================================================================
--- /extensions/floPure/default-colors.css (revision 3333)
+++ /extensions/floPure/default-colors.css (revision 3333)
@@ -0,0 +1,112 @@
+/* $Id: default-colors.css 2352 2008-05-20 00:27:26Z patdenice $ */
+
+/* others
+
+#imageToolBar * {
+ background: inherit;
+}
+ */
+/* So that non-links are slightly greyed out */
+.content .navigationBar, SPAN.calItemEmpty, TD.calDayCellEmpty {
+ color: #b0b0b0;
+}
+
+/* Tables & forms */
+
+/* IE <= 6 is so bad with this that you can't merge with the following rule */
+INPUT[type="text"], INPUT[type="password"], INPUT[type="button"],
+INPUT[type="submit"], INPUT[type="reset"], INPUT[type="file"] {
+ color:black;
+ background-color: #d3d3d3; /* lightgrey */
+}
+
+INPUT.text, INPUT.password, INPUT.button,
+INPUT.submit, INPUT.reset, INPUT.file,
+SELECT, TEXTAREA {
+ color:black;
+ background-color: #d3d3d3; /* lightgrey */
+}
+
+INPUT:focus, SELECT:focus, TEXTAREA:focus, INPUT.focus, FORM .focus {
+ background-color: #f5f5f5; /* whitesmoke */
+}
+
+/* some theme set a border on INPUT which is not pretty for radio/checkbox */
+INPUT[type="radio"], INPUT[type="checkbox"] {
+ border: none; /* <= Opera needs this */
+}
+
+INPUT.radio, INPUT.checkbox {
+ border: none; /* <= IE6 needs this */
+}
+
+/* rate buttons displayed like links */
+INPUT.rateButton, INPUT.rateButtonSelected, INPUT.rateButtonStarFull, INPUT.rateButtonStarEmpty {
+ color:inherit;
+ background-color:transparent; /* Konqueror doesn't accept transparent here */
+}
+
+.errors { /* Errors display */
+ color: red;
+ background-color: #ffe1e1;
+ font-weight: bold;
+ text-align: left;
+ margin: 5px;
+ border: 1px solid red;
+ background-image: url(icon/admin/errors.png);
+ background-repeat: no-repeat;
+ background-position: top right;
+ padding: 10px 50px 10px 10px;
+}
+
+/**
+ * Informations box in administration
+ */
+.infos {
+ text-align: left;
+ color: #002000;
+ background-color: #98fb98; /* palegreen */
+ background-image: url(icon/admin/infos.png);
+ background-repeat: no-repeat;
+ background-position: top right;
+ margin: 5px;
+ padding: 10px 50px 10px 10px;
+}
+
+/**
+ * Header message like upgrade or adviser mode
+ */
+.header_msgs {
+ text-align:center;
+ font-weight: bold;
+ color:#696969; /* dimgray */
+ background-color: #d3d3d3;
+ margin: 1px;
+ padding: 1px;
+}
+
+/**
+ * Header notes box in public/administration
+ */
+.header_notes {
+ border: 1px solid #aaaaaa; /* border color and style */
+ text-align: center;
+ background-image: url(icon/note.png);
+ background-repeat: no-repeat;
+ background-position: top left;
+ font-weight: bold;
+ margin: 14px;
+ padding: 5px 00px 0px 0px;
+}
+
+LEGEND {
+ font-style: italic;
+}
+
+/*calendar*/
+SPAN.calItem, SPAN.calItemEmpty,
+TD.calDayCellEmpty, TD.calDayCellFull {
+ border: 1px solid gray;
+}
+
+
Index: /extensions/floPure/default-layout.css
===================================================================
--- /extensions/floPure/default-layout.css (revision 3333)
+++ /extensions/floPure/default-layout.css (revision 3333)
@@ -0,0 +1,313 @@
+/* $Id: default-layout.css 2396 2008-06-23 23:40:55Z rvelices $ */
+@import "admin/default-layout.css";
+BODY {
+ margin: 5px;
+ padding: 0;
+ font-size: 0.8em;
+ font-family: Univers, Helvetica, Optima, "Bitstream Vera Sans", sans-serif;
+ text-align: center; /* be nice to IE5 */
+}
+
+#the_page {
+ /* Just in case another template needs an inner frame */
+}
+
+H1 {
+ text-align: center;
+ font-size: 150%;
+ font-weight: bold;
+ padding: 0;
+ margin: 0.5em 0 1em 0;
+}
+
+H2 {
+ margin: 0;
+ padding: 5px 0.5em 5px 0.5em;
+ text-align: left;
+ font-size: 120%;
+}
+
+A {
+ text-decoration:none;
+ border-bottom: 1px dotted #005e89;
+}
+A:hover {
+ border-bottom: 1px solid #858460;
+}
+A.button, A.button:hover {
+ border: 0;
+}
+IMG {
+ border: none;
+}
+
+HR.separation {
+ visibility: hidden;
+ clear: both;
+}
+
+#copyright {
+ clear: both;
+ font-size: 83%;
+ text-align: center;
+ margin: 0 0 10px 0;
+}
+
+/** General defaults **/
+INPUT, SELECT {
+ margin: 0;
+ font-size: 1em; /* <= some browsers don't set it correctly */
+}
+UL, DL, LI { text-align: left;}
+TABLE { /* horizontaly centered */
+ margin-left: auto;
+ margin-right: auto;
+}
+
+.wrap2 .icon { float:right; }
+/* for debugging purpose */
+PRE { text-align:left; }
+
+/** forms **/
+
+FORM { padding: 0em; }
+
+FORM P {
+ text-align: center;
+ margin-top: 2em;
+ margin-bottom: 2em;
+}
+
+FORM FIELDSET P {
+ margin-top: 1em;
+ margin-bottom: 0;
+}
+
+.small {
+ font-size: 80%;
+}
+
+TEXTAREA.description {
+ height: 6em;
+ width: 40em;
+ overflow: auto;
+}
+
+SELECT.categoryList {
+ height: 20em;
+ width: auto;
+}
+
+DIV.comment BLOCKQUOTE {
+ padding: 0.5em;
+ overflow: auto; /* no solution for IE6 */
+ min-height: 2.75em; /* fix a Gecko bug whith scrollbar and 1 line only */
+}
+
+
+/**
+ * Filter forms are displayed label by label with the input (or select...)
+ * below the label. Use an UL to make a group (radiobox for instance).
+ * Use a SPAN to group objects in line
+ */
+FIELDSET {
+ padding: 1em;
+ margin: 1em;
+ overflow: hidden; /* <- makes Opera happy */
+}
+
+FORM.filter FIELDSET UL {
+ margin: 0;
+}
+FORM.filter FIELDSET UL,
+FORM.filter FIELDSET LABEL {
+ display: block;
+ float: left;
+ margin-right: 1em;
+ padding: 0;
+}
+
+FORM.filter FIELDSET LI {
+ list-style: none;
+ margin-bottom: 0.5em;
+}
+
+FORM.filter FIELDSET LI LABEL {
+ display: inline;
+ float: none;
+}
+
+FORM.filter FIELDSET UL.tagSelection LABEL {
+ display: inline;
+ float: none;
+ margin-right:0.5em;/*reduce from above*/
+}
+
+/* cannot use FIELDSET>LABEL because of IE<=6 */
+FORM.filter FIELDSET LABEL INPUT,
+FORM.filter FIELDSET LABEL SELECT,
+FORM.filter FIELDSET LABEL SPAN,
+FORM.filter FIELDSET LABEL TEXTAREA {
+ display: block;
+ margin: 0.5em 0;
+}
+FORM.filter FIELDSET * LABEL INPUT,
+FORM.filter FIELDSET * LABEL SELECT,
+FORM.filter FIELDSET * LABEL TEXTAREA,
+FORM.filter FIELDSET LABEL SPAN INPUT,
+FORM.filter FIELDSET LABEL SPAN SELECT,
+FORM.filter FIELDSET LABEL SPAN TEXTAREA {
+ display: inline;
+ vertical-align: top;
+ margin: 0 0.5em 0 0;
+}
+
+FORM.filter FIELDSET UL.tagSelection LI LABEL INPUT {
+ margin-right:0;
+}
+
+/* following declaration is important to avoid strange FF behaviour */
+FORM.filter FIELDSET LABEL SPAN SELECT {
+ margin: 0;
+}
+
+FORM.filter FIELDSET P
+{
+ clear: left;
+ display: block;
+}
+
+FORM.filter INPUT[type="submit"] {
+ margin-top: 1em;
+}
+
+FORM.properties UL, FORM#update UL {
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+}
+
+FORM.properties LI, FORM#update UL {
+ margin-bottom: 0.5em;
+ padding: 0;
+ line-height: 1.8em;
+ clear: left;
+}
+
+FORM.properties SPAN.property {
+ font-weight: bold;
+ float: left;
+ width: 50%;
+ text-align: right;
+ margin: 0;
+ padding: 0 0.5em 0 0;
+}
+
+#theHeader H1 {
+ margin-bottom: 0.5em;
+}
+
+/* button tools */
+UL.actions {
+ text-indent: 0;
+ list-style: none;
+}
+UL.actions LI {
+ display: inline;
+}
+UL.actions A {
+ border: none;
+}
+
+UL.tagSelection {
+ width: 99%;
+ margin: 1em 0 1em 0;
+ padding: 0;
+}
+
+UL.tagSelection LI {
+ display: inline;
+ white-space: nowrap;
+}
+
+#fullTagCloud {
+ font-size: 120%;
+ text-align: justify;
+ padding: 0;
+ margin: 1em 2em 1em 2em;
+}
+
+#fullTagCloud LI {
+ display: inline;
+ white-space: nowrap;
+ margin: 0 2px;
+}
+
+
+.tagLevel5 { font-size: 150%; }
+.tagLevel4 { font-size: 140%; }
+.tagLevel3 { font-size: 120%; }
+.tagLevel2 { font-size: 100%; }
+.tagLevel1 { font-size: 90%; }
+
+
+/* Popup help page */
+BODY#thePopuphelpPage #copyright {
+ display: none;
+}
+
+BODY#thePopuphelpPage .content P {
+ text-align: justify;
+ padding: 0.5em;
+}
+
+BODY#thePopuphelpPage .content OL LI,
+BODY#thePopuphelpPage .content UL LI
+{
+ margin-bottom: 0.5em;
+}
+
+BODY#thePopuphelpPage P#pageBottomActions A {
+ border: none;
+}
+
+TR.tagLine {
+ border-bottom: 1px solid #ddd;
+ text-align: left;
+}
+TR.tagLine:hover {
+ background-color: #fff;
+}
+TD.nbEntries {
+ text-align: right;
+ font-style: italic;
+ font-size: 90%;
+}
+
+FIELDSET.tagLetter {
+ border: 1px solid #d3d3d3;
+ width: 200px;
+ margin: 0.5em;
+ padding: 10px;
+}
+
+LEGEND.tagLetterLegend {
+ border: 1px solid #d3d3d3;
+ font-size:120%;
+ font-weight: bold;
+ padding: 0 5px;
+ font-style: normal;
+}
+
+TABLE.tagLetterContent {
+ width:100%;
+ font-size:80%;
+ border-collapse : collapse;
+}
+/*--------menu--------------*/
+#table_content, .table_menu, #table_mbLinks, #table_mbCategories, #table_mbTags, #table_mbSpecials, #table_mbMenu, #table_mbIdentification {
+width:100%;
+border:0;
+padding:0;
+margin:0;
+}
Index: /extensions/floPure/fix-ie5-ie6.css
===================================================================
--- /extensions/floPure/fix-ie5-ie6.css (revision 3333)
+++ /extensions/floPure/fix-ie5-ie6.css (revision 3333)
@@ -0,0 +1,23 @@
+/* $Id: fix-ie5-ie6.css 2356 2008-05-23 10:15:48Z rvelices $ */
+/* Issues in IE from 5 to 6 only not to be used with IE7 */
+
+@import "thumbnails-fix-ie5-ie6.css";
+
+/* to avoid vanishing objects in IE6 */
+H1, #theHeader {
+ width: 100%; /* <- useless but seems to make IE6 happy */
+}
+.content {
+ height: 1em; /* for IE6 it's like min-height */
+}
+
+/* fix category thumbnails on main page */
+.content UL.thumbnailCategories {
+ width: 99%; /* buggy IE box model */
+}
+
+
+/* fix quickconnect layout */
+FORM#quickconnect FIELDSET {
+ width: 99%; /* correct an ugly 1 or 2 px misalignement with IE */
+}
Index: /extensions/floPure/fix-ie7.css
===================================================================
--- /extensions/floPure/fix-ie7.css (revision 3333)
+++ /extensions/floPure/fix-ie7.css (revision 3333)
@@ -0,0 +1,22 @@
+/* $Id: fix-ie7.css 2352 2008-05-20 00:27:26Z patdenice $ */
+/* fix IE with another layout for thumbnails */
+
+.content UL.thumbnails SPAN.wrap2 {
+ display: block;
+ position: relative;
+ text-align: left;
+}
+.content UL.thumbnails SPAN.wrap2 A,
+.content UL.thumbnails SPAN.wrap2 SPAN {
+ overflow: visible;
+ position: absolute;
+ top: 50%;
+ text-align: center;
+}
+
+.content UL.thumbnails IMG.thumbnail {
+ position: relative;
+ top: -50%;
+ margin-top: 2%;
+}
+
Index: /extensions/floPure/fix-khtml.css
===================================================================
--- /extensions/floPure/fix-khtml.css (revision 3333)
+++ /extensions/floPure/fix-khtml.css (revision 3333)
@@ -0,0 +1,20 @@
+/* $Id: fix-khtml.css 2356 2008-05-23 10:15:48Z rvelices $ */
+/* Issue in Safari/Konqueror only */
+/* If H2 has a 0 margin-top categoryActions doesn't float right but overwrites H2 */
+.content>DIV.titrePage>H2 {
+ margin: 1px 0 0 0; /* add an arbitrary margin-top */
+}
+
+.content>div.titrePage {
+ position: relative;
+ top: -1px; /* move the container up by the same amount */
+ margin-bottom: 5px;
+}
+
+#menubar #menuTagCloud LI
+{
+ display: inline-block;/* required for Safari 3.1 - otherwise overflows on the right */
+}
+
+/* end Safari/Konqueror */
+
Index: /extensions/floPure/footer.tpl
===================================================================
--- /extensions/floPure/footer.tpl (revision 3333)
+++ /extensions/floPure/footer.tpl (revision 3333)
@@ -0,0 +1,36 @@
+{* $Id: footer.tpl 2381 2008-06-01 19:19:46Z vdigital $ *}
+
+
+ {if isset($debug.TIME) }
+ {'generation_time'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'sql_queries_in'|@translate} {$debug.SQL_TIME}) -
+ {/if}
+
+ {* Please, do not remove this copyright. If you really want to,
+ contact us on http://piwigo.org to find a solution on how
+ to show the origin of the script...
+ *}
+
+ {'powered_by'|@translate}
+
+ Piwigo
+ {$VERSION}
+ {if isset($CONTACT_MAIL)}
+ -
+
Flop25 Style
+ -
+
Tango Icon
+ - {'send_mail'|@translate}
+
{'Webmaster'|@translate}
+ {/if}
+
+
+{if isset($footer_elements)}
+{foreach from=$footer_elements item=v}
+{$v}
+{/foreach}
+{/if}
+
+
+{if isset($debug.QUERIES_LIST)}{$debug.QUERIES_LIST}{/if}
+
[{$COMMENT_COUNT}] {'comments_title'|@translate}
+ ++ + + +
+ {/if} +{$comment.AUTHOR} - {$comment.DATE}
+ +