aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/category_cats.inc.php15
-rw-r--r--template-common/layout.css7
-rw-r--r--template/yoga/default-layout.css35
-rw-r--r--template/yoga/layout.css5
-rw-r--r--template/yoga/popuphelp.css22
5 files changed, 35 insertions, 49 deletions
diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php
index 68b0ec4c2..80efcd184 100644
--- a/include/category_cats.inc.php
+++ b/include/category_cats.inc.php
@@ -163,16 +163,14 @@ SELECT
MIN(date_creation) AS date_creation_min,
MAX(date_creation) AS date_creation_max
FROM '.IMAGE_CATEGORY_TABLE.'
- INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
- ON category_id = cat_id and user_id = '.$user['id'].'
INNER JOIN '.IMAGES_TABLE.' ON image_id = id
- WHERE category_id IN ('.implode(',', $category_ids).')
+ WHERE category_id IN ('.implode(',', $category_ids).')
'.get_sql_condition_FandF
(
array
(
'visible_categories' => 'category_id',
- 'visible_images' => 'image_id'
+ 'visible_images' => 'id'
),
'AND'
).'
@@ -186,7 +184,6 @@ SELECT
'to' => $row['date_creation_max'],
);
}
- // echo '<pre>'; print_r($dates_of_category); echo '</pre>';
}
}
@@ -263,8 +260,8 @@ if (count($categories) > 0)
'<br />'
),
'DESCRIPTION' =>
- trigger_event('render_category_literal_description',
- trigger_event('render_category_description',
+ trigger_event('render_category_literal_description',
+ trigger_event('render_category_description',
@$category['comment'])),
'NAME' => $name,
)
@@ -276,11 +273,11 @@ if (count($categories) > 0)
{
$from = $dates_of_category[ $category['id'] ]['from'];
$to = $dates_of_category[ $category['id'] ]['to'];
-
+
if (!empty($from))
{
$info = '';
-
+
if ($from == $to)
{
$info = format_date($from);
diff --git a/template-common/layout.css b/template-common/layout.css
deleted file mode 100644
index 31b9b4784..000000000
--- a/template-common/layout.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/* $Id$ */
-
-/* template css */
-@import "default-layout.css";
-/* Override properties with import local file */
-@import "local-layout.css";
-
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 2b43bc5bc..010b914ab 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -215,11 +215,6 @@ FORM.properties SPAN.property {
padding: 0;
}
-BODY#thePopuphelpPage #copyright {
- color: green;
- display: none;
-}
-
FORM#addComment FIELDSET LABEL {
clear: both;
}
@@ -252,7 +247,7 @@ UL.tagSelection LI {
}
#fullTagCloud {
- font-size: 140%;
+ font-size: 120%;
text-align: justify;
padding: 0;
margin: 1em 2em 1em 2em;
@@ -263,12 +258,34 @@ UL.tagSelection LI {
white-space: nowrap;
}
-#content #fullTagCloud {
- font-size: 120%;
-}
.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 #theHeader P {
+ 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;
+}
diff --git a/template/yoga/layout.css b/template/yoga/layout.css
index fdc3ca664..348ea2f4c 100644
--- a/template/yoga/layout.css
+++ b/template/yoga/layout.css
@@ -5,10 +5,11 @@
@import "content.css";
@import "thumbnails.css";
@import "picture.css";
-@import "popuphelp.css";
@import "default-layout.css";
/* Override properties with import local file */
@import "local-layout.css";
/* common css */
-@import "../../template-common/layout.css";
+@import "../../template-common/default-layout.css";
+/* Override properties with import local file */
+@import "../../template-common/local-layout.css";
diff --git a/template/yoga/popuphelp.css b/template/yoga/popuphelp.css
deleted file mode 100644
index b61b7952d..000000000
--- a/template/yoga/popuphelp.css
+++ /dev/null
@@ -1,22 +0,0 @@
-BODY#thePopuphelpPage #copyright {
- display: none;
-}
-
-BODY#thePopuphelpPage #theHeader P {
- 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;
-}