[geeklog-cvs] geeklog: Merged with upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Mon Apr 30 14:54:30 EDT 2012
changeset 8661:354b6623b395
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/354b6623b395
user: Tom <websitemaster at cogeco.net>
date: Mon Apr 30 14:53:44 2012 -0400
description:
Merged with upstream
diffstat:
public_html/layout/denim/functions.php | 7 ++++++-
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 ++++++--
system/classes/scripts.class.php | 19 ++++++++++++++-----
9 files changed, 63 insertions(+), 11 deletions(-)
diffs (220 lines):
diff -r 3ddc56d9bb9e -r 354b6623b395 public_html/layout/denim/functions.php
--- a/public_html/layout/denim/functions.php Mon Apr 30 14:36:03 2012 -0400
+++ b/public_html/layout/denim/functions.php Mon Apr 30 14:53:44 2012 -0400
@@ -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 3ddc56d9bb9e -r 354b6623b395 public_html/layout/denim/images/search.png
Binary file public_html/layout/denim/images/search.png has changed
diff -r 3ddc56d9bb9e -r 354b6623b395 public_html/layout/denim/style.css
--- a/public_html/layout/denim/style.css Mon Apr 30 14:36:03 2012 -0400
+++ b/public_html/layout/denim/style.css Mon Apr 30 14:53:44 2012 -0400
@@ -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 3ddc56d9bb9e -r 354b6623b395 public_html/layout/denim/style_rtl.css
--- a/public_html/layout/denim/style_rtl.css Mon Apr 30 14:36:03 2012 -0400
+++ b/public_html/layout/denim/style_rtl.css Mon Apr 30 14:53:44 2012 -0400
@@ -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 3ddc56d9bb9e -r 354b6623b395 public_html/layout/newpro/functions.php
--- a/public_html/layout/newpro/functions.php Mon Apr 30 14:36:03 2012 -0400
+++ b/public_html/layout/newpro/functions.php Mon Apr 30 14:53:44 2012 -0400
@@ -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 3ddc56d9bb9e -r 354b6623b395 public_html/layout/professional/functions.php
--- a/public_html/layout/professional/functions.php Mon Apr 30 14:36:03 2012 -0400
+++ b/public_html/layout/professional/functions.php Mon Apr 30 14:53:44 2012 -0400
@@ -57,7 +57,9 @@
{
global $_CONF, $LANG_DIRECTION;
return array(
- '/layout/' . $_CONF['theme'] . '/style.css'
+ array(
+ 'file' => '/layout/' . $_CONF['theme'] . '/style.css'
+ )
);
}
diff -r 3ddc56d9bb9e -r 354b6623b395 public_html/layout/professional_css/functions.php
--- a/public_html/layout/professional_css/functions.php Mon Apr 30 14:36:03 2012 -0400
+++ b/public_html/layout/professional_css/functions.php Mon Apr 30 14:53:44 2012 -0400
@@ -57,7 +57,9 @@
{
global $_CONF, $LANG_DIRECTION;
return array(
- '/layout/' . $_CONF['theme'] . '/style.css'
+ array(
+ 'file' => '/layout/' . $_CONF['theme'] . '/style.css'
+ )
);
}
diff -r 3ddc56d9bb9e -r 354b6623b395 public_html/lib-common.php
--- a/public_html/lib-common.php Mon Apr 30 14:36:03 2012 -0400
+++ b/public_html/lib-common.php Mon Apr 30 14:53:44 2012 -0400
@@ -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 3ddc56d9bb9e -r 354b6623b395 system/classes/scripts.class.php
--- a/system/classes/scripts.class.php Mon Apr 30 14:36:03 2012 -0400
+++ b/system/classes/scripts.class.php Mon Apr 30 14:53:44 2012 -0400
@@ -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 {
$headercode .= $csslink;
}
}
- }
+ }
// Set JavaScript (do this before file incase variables are needed)
if (isset($this->scripts['header'])) {
More information about the geeklog-cvs
mailing list