[geeklog-cvs] geeklog: Merged with upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Mon Apr 30 15:19:27 EDT 2012
changeset 8663:44a1b9f0a399
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/44a1b9f0a399
user: Rouslan Placella <rouslan at placella.com>
date: Mon Apr 30 20:18:07 2012 +0100
description:
Merged with upstream
diffstat:
public_html/admin/install/config-install.php | 2 +-
public_html/docs/english/config.html | 2 +-
public_html/layout/denim/functions.php | 9 +++++++--
public_html/layout/denim/header.thtml | 3 +--
public_html/layout/denim/images/search.png | Bin
public_html/layout/denim/style.css | 14 ++++++++++++++
public_html/layout/denim/style_rtl.css | 14 ++++++++++++++
public_html/layout/newpro/functions.php | 4 +++-
public_html/layout/professional/functions.php | 4 +++-
public_html/layout/professional_css/functions.php | 4 +++-
public_html/lib-common.php | 8 ++++++--
sql/updates/mssql_1.8.1_to_2.0.0.php | 2 +-
sql/updates/mysql_1.8.1_to_2.0.0.php | 2 +-
sql/updates/pgsql_1.8.1_to_2.0.0.php | 2 +-
system/classes/scripts.class.php | 19 ++++++++++++++-----
system/lib-comment.php | 11 +++++++----
16 files changed, 77 insertions(+), 23 deletions(-)
diffs (truncated from 350 to 300 lines):
diff -r c1a239e3f7f6 -r 44a1b9f0a399 public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php Mon Apr 30 20:17:34 2012 +0100
+++ b/public_html/admin/install/config-install.php Mon Apr 30 20:18:07 2012 +0100
@@ -425,7 +425,7 @@
$c->add('tab_topics', NULL, 'tab', 7, 45, NULL, 0, TRUE, $me, 45);
$c->add('fs_breadcrumbs', NULL, 'fieldset', 7, 45, NULL, 0, TRUE, $me, 45);
- $c->add('multiple_breadcrumbs', 1, 'select', 7, 45, 0, 2000, TRUE, $me, 45);
+ $c->add('multiple_breadcrumbs', 0, 'select', 7, 45, 0, 2000, TRUE, $me, 45);
$c->add('disable_breadcrumbs_topics', 0, 'select', 7, 45, 0, 2010, TRUE, $me, 45);
$c->add('disable_breadcrumbs_articles', 0, 'select', 7, 45, 0, 2020, TRUE, $me, 45);
$c->add('disable_breadcrumbs_plugins', 0, 'select', 7, 45, 0, 2030, TRUE, $me, 45);
diff -r c1a239e3f7f6 -r 44a1b9f0a399 public_html/docs/english/config.html
--- a/public_html/docs/english/config.html Mon Apr 30 20:17:34 2012 +0100
+++ b/public_html/docs/english/config.html Mon Apr 30 20:18:07 2012 +0100
@@ -1666,7 +1666,7 @@
<th style="width:63%">Description</th></tr>
<tr>
<td valign="top"><a name="desc_multiple_breadcrumbs">multiple_breadcrumbs</a></td>
- <td valign="top">true</td>
+ <td valign="top">false</td>
<td valign="top">Set this to <code>true</code> to allow multiple breadcrumbs to display if available.</td></tr>
<tr>
<td valign="top"><a name="desc_disable_breadcrumbs_topics">disable_breadcrumbs_topics</a></td>
diff -r c1a239e3f7f6 -r 44a1b9f0a399 public_html/layout/denim/functions.php
--- a/public_html/layout/denim/functions.php Mon Apr 30 20:17:34 2012 +0100
+++ b/public_html/layout/denim/functions.php Mon Apr 30 20:18:07 2012 +0100
@@ -46,7 +46,7 @@
{
return array(
'image_type' => 'png',
- 'doctype' => 'html401strict'
+ 'doctype' => 'xhtml10transitional'
);
}
@@ -58,7 +58,12 @@
global $_CONF, $LANG_DIRECTION;
$cssfile = ($LANG_DIRECTION == 'rtl') ? '/style_rtl.css' : '/style.css';
- return array('/layout/' . $_CONF['theme'] . $cssfile);
+ return array(
+ array(
+ 'file' => '/layout/' . $_CONF['theme'] . $cssfile,
+ 'attributes' => array('media' => 'screen')
+ )
+ );
}
/**
diff -r c1a239e3f7f6 -r 44a1b9f0a399 public_html/layout/denim/header.thtml
--- a/public_html/layout/denim/header.thtml Mon Apr 30 20:17:34 2012 +0100
+++ b/public_html/layout/denim/header.thtml Mon Apr 30 20:18:07 2012 +0100
@@ -13,7 +13,6 @@
<!-- Favicons -->
<link rel="shortcut icon" href="{layout_url}/images/favicon.ico"{xhtml}>
-<link rel="apple-touch-icon" href="{layout_url}/images/apple-touch-icon.png">
<!-- <meta http-equiv="Pragma" content="no-cache"{xhtml}> -->
<link rel="start contents" href="{site_url}"{xhtml}>
@@ -62,6 +61,6 @@
<!-- Center Block Container -->
<div id="centerblocks">
<div id="main-content">
- <p class="welcome_msg">{welcome_msg_jp} {datetime}</p>
+ <p class="welcome_msg">{welcome_msg} {datetime}</p>
<!-- } header.thtml -->
diff -r c1a239e3f7f6 -r 44a1b9f0a399 public_html/layout/denim/images/search.png
Binary file public_html/layout/denim/images/search.png has changed
diff -r c1a239e3f7f6 -r 44a1b9f0a399 public_html/layout/denim/style.css
--- a/public_html/layout/denim/style.css Mon Apr 30 20:17:34 2012 +0100
+++ b/public_html/layout/denim/style.css Mon Apr 30 20:18:07 2012 +0100
@@ -1408,6 +1408,12 @@
line-height: 1.5em;
}
+input[type="text"].search {
+ background: url(images/search.png) 3px center no-repeat #FFF;
+ padding-left: 24px;
+ width: 120px;
+ color: #999;
+}
/*--------------------------------------
Login Form
@@ -2430,6 +2436,10 @@
width: 85%;
}
+#text_editor dd.description {
+ margin-left: 15%;
+}
+
#admin-storyeditor-introtext,
#admin-storyeditor-bodytext {
width: 98%;
@@ -3057,6 +3067,10 @@
line-height: 1.8em;
color: #336699;
}
+
+ #text_editor dd.description {
+ margin-left: 0;
+ }
}
diff -r c1a239e3f7f6 -r 44a1b9f0a399 public_html/layout/denim/style_rtl.css
--- a/public_html/layout/denim/style_rtl.css Mon Apr 30 20:17:34 2012 +0100
+++ b/public_html/layout/denim/style_rtl.css Mon Apr 30 20:18:07 2012 +0100
@@ -1412,6 +1412,12 @@
line-height: 1.5em;
}
+input[type="text"].search {
+ background: url(images/search.png) 127px center no-repeat #FFF;
+ padding-right: 24px;
+ width: 120px;
+ color: #999;
+}
/*--------------------------------------
Login Form
@@ -2434,6 +2440,10 @@
width: 85%;
}
+#text_editor dd.description {
+ margin-right: 15%;
+}
+
#admin-storyeditor-introtext,
#admin-storyeditor-bodytext {
width: 98%;
@@ -3061,6 +3071,10 @@
line-height: 1.8em;
color: #336699;
}
+
+ #text_editor dd.description {
+ margin-right: 0;
+ }
}
diff -r c1a239e3f7f6 -r 44a1b9f0a399 public_html/layout/newpro/functions.php
--- a/public_html/layout/newpro/functions.php Mon Apr 30 20:17:34 2012 +0100
+++ b/public_html/layout/newpro/functions.php Mon Apr 30 20:18:07 2012 +0100
@@ -57,7 +57,9 @@
{
global $_CONF, $LANG_DIRECTION;
return array(
- '/layout/' . $_CONF['theme'] . '/style.css.php?dir=' . $LANG_DIRECTION
+ array(
+ 'file' => '/layout/' . $_CONF['theme'] . '/style.css.php?dir=' . $LANG_DIRECTION
+ )
);
}
diff -r c1a239e3f7f6 -r 44a1b9f0a399 public_html/layout/professional/functions.php
--- a/public_html/layout/professional/functions.php Mon Apr 30 20:17:34 2012 +0100
+++ b/public_html/layout/professional/functions.php Mon Apr 30 20:18:07 2012 +0100
@@ -57,7 +57,9 @@
{
global $_CONF, $LANG_DIRECTION;
return array(
- '/layout/' . $_CONF['theme'] . '/style.css'
+ array(
+ 'file' => '/layout/' . $_CONF['theme'] . '/style.css'
+ )
);
}
diff -r c1a239e3f7f6 -r 44a1b9f0a399 public_html/layout/professional_css/functions.php
--- a/public_html/layout/professional_css/functions.php Mon Apr 30 20:17:34 2012 +0100
+++ b/public_html/layout/professional_css/functions.php Mon Apr 30 20:18:07 2012 +0100
@@ -57,7 +57,9 @@
{
global $_CONF, $LANG_DIRECTION;
return array(
- '/layout/' . $_CONF['theme'] . '/style.css'
+ array(
+ 'file' => '/layout/' . $_CONF['theme'] . '/style.css'
+ )
);
}
diff -r c1a239e3f7f6 -r 44a1b9f0a399 public_html/lib-common.php
--- a/public_html/lib-common.php Mon Apr 30 20:17:34 2012 +0100
+++ b/public_html/lib-common.php Mon Apr 30 20:18:07 2012 +0100
@@ -424,8 +424,12 @@
/* Include scripts on behalf of the theme */
$func = "theme_css_" . $_CONF['theme'];
if (function_exists($func)) {
- foreach ($func() as $file) {
- $_SCRIPTS->setCssFile(md5($file), $file);
+ foreach ($func() as $info) {
+ $file = $info['file'];
+ $name = md5($file);
+ $constant = (!empty($info['constant'])) ? $info['constant'] : true;
+ $attributes = (!empty($info['attributes'])) ? $info['attributes'] : array();
+ $_SCRIPTS->setCssFile($name, $file, $constant, $attributes);
}
}
$func = "theme_js_libs_" . $_CONF['theme'];
diff -r c1a239e3f7f6 -r 44a1b9f0a399 sql/updates/mssql_1.8.1_to_2.0.0.php
--- a/sql/updates/mssql_1.8.1_to_2.0.0.php Mon Apr 30 20:17:34 2012 +0100
+++ b/sql/updates/mssql_1.8.1_to_2.0.0.php Mon Apr 30 20:18:07 2012 +0100
@@ -100,7 +100,7 @@
// Breadcrumbs
$c->add('tab_topics', NULL, 'tab', 7, 45, NULL, 0, TRUE, $me, 45);
$c->add('fs_breadcrumbs', NULL, 'fieldset', 7, 45, NULL, 0, TRUE, $me, 45);
- $c->add('multiple_breadcrumbs', 1, 'select', 7, 45, 0, 2000, TRUE, $me, 45);
+ $c->add('multiple_breadcrumbs', 0, 'select', 7, 45, 0, 2000, TRUE, $me, 45);
$c->add('disable_breadcrumbs_topics', 0, 'select', 7, 45, 0, 2010, TRUE, $me, 45);
$c->add('disable_breadcrumbs_articles', 0, 'select', 7, 45, 0, 2020, TRUE, $me, 45);
$c->add('disable_breadcrumbs_plugins', 0, 'select', 7, 45, 0, 2030, TRUE, $me, 45);
diff -r c1a239e3f7f6 -r 44a1b9f0a399 sql/updates/mysql_1.8.1_to_2.0.0.php
--- a/sql/updates/mysql_1.8.1_to_2.0.0.php Mon Apr 30 20:17:34 2012 +0100
+++ b/sql/updates/mysql_1.8.1_to_2.0.0.php Mon Apr 30 20:18:07 2012 +0100
@@ -98,7 +98,7 @@
// Breadcrumbs
$c->add('tab_topics', NULL, 'tab', 7, 45, NULL, 0, TRUE, $me, 45);
$c->add('fs_breadcrumbs', NULL, 'fieldset', 7, 45, NULL, 0, TRUE, $me, 45);
- $c->add('multiple_breadcrumbs', 1, 'select', 7, 45, 0, 2000, TRUE, $me, 45);
+ $c->add('multiple_breadcrumbs', 0, 'select', 7, 45, 0, 2000, TRUE, $me, 45);
$c->add('disable_breadcrumbs_topics', 0, 'select', 7, 45, 0, 2010, TRUE, $me, 45);
$c->add('disable_breadcrumbs_articles', 0, 'select', 7, 45, 0, 2020, TRUE, $me, 45);
$c->add('disable_breadcrumbs_plugins', 0, 'select', 7, 45, 0, 2030, TRUE, $me, 45);
diff -r c1a239e3f7f6 -r 44a1b9f0a399 sql/updates/pgsql_1.8.1_to_2.0.0.php
--- a/sql/updates/pgsql_1.8.1_to_2.0.0.php Mon Apr 30 20:17:34 2012 +0100
+++ b/sql/updates/pgsql_1.8.1_to_2.0.0.php Mon Apr 30 20:18:07 2012 +0100
@@ -100,7 +100,7 @@
// Breadcrumbs
$c->add('tab_topics', NULL, 'tab', 7, 45, NULL, 0, TRUE, $me, 45);
$c->add('fs_breadcrumbs', NULL, 'fieldset', 7, 45, NULL, 0, TRUE, $me, 45);
- $c->add('multiple_breadcrumbs', 1, 'select', 7, 45, 0, 2000, TRUE, $me, 45);
+ $c->add('multiple_breadcrumbs', 0, 'select', 7, 45, 0, 2000, TRUE, $me, 45);
$c->add('disable_breadcrumbs_topics', 0, 'select', 7, 45, 0, 2010, TRUE, $me, 45);
$c->add('disable_breadcrumbs_articles', 0, 'select', 7, 45, 0, 2020, TRUE, $me, 45);
$c->add('disable_breadcrumbs_plugins', 0, 'select', 7, 45, 0, 2030, TRUE, $me, 45);
diff -r c1a239e3f7f6 -r 44a1b9f0a399 system/classes/scripts.class.php
--- a/system/classes/scripts.class.php Mon Apr 30 20:17:34 2012 +0100
+++ b/system/classes/scripts.class.php Mon Apr 30 20:18:07 2012 +0100
@@ -339,6 +339,7 @@
}
$this->css_files[$name]['file'] = $file;
+ $this->css_files[$name]['extra'] = '';
$this->css_files[$name]['constant'] = false;
$this->css_files[$name]['load'] = $load;
@@ -351,11 +352,12 @@
* @param $name name of CSS file
* @param $file location of file relative to public_html directory. Include '/' at beginning
* @param $constant Future use. Set to true if file is planned to be loaded all the time (Caching/Compression)
+ * @param $attributes (optional) array of extra attributes
* @access public
* @return boolean
*
- */
- public function setCSSFile($name, $file, $constant = true) {
+ */
+ public function setCSSFile($name, $file, $constant = true, $attributes = array()) {
global $_CONF;
@@ -379,13 +381,19 @@
return false;
}
+ $extra = '';
+ foreach ($attributes as $key => $value) {
+ $extra .= " $key=\"$value\"";
+ }
+
$this->css_files[$name]['name'] = $name;
$this->css_files[$name]['file'] = $file;
+ $this->css_files[$name]['extra'] = $extra;
$this->css_files[$name]['constant'] = $constant;
$this->css_files[$name]['load'] = true;
return true;
- }
+ }
/**
* Returns header code (JavaScript and CSS) to include in the Head of the webpage
@@ -405,14 +413,15 @@
// Set CSS Files
foreach ($this->css_files as $file) {
if ($file['load'] && isset($file['file'])) {
- $csslink = '<link rel="stylesheet" type="text/css" href="' . $_CONF['site_url'] . $file['file'] . '" ' . XHTML . '>' . LB;
+ $csslink = '<link rel="stylesheet" type="text/css" href="'
+ . $_CONF['site_url'] . $file['file'] . '"' . $file['extra'] . XHTML . '>' . LB;
if (isset($file['name']) && $file['name'] == 'theme') { // load theme css first
$headercode = $csslink . $headercode;
} else {
More information about the geeklog-cvs
mailing list