[geeklog-cvs] geeklog: Merge
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Tue Mar 13 10:03:08 EDT 2012
changeset 8535:6fb6b0c3fa7f
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/6fb6b0c3fa7f
user: Tom <websitemaster at cogeco.net>
date: Tue Mar 13 09:58:07 2012 -0400
description:
Merge
diffstat:
public_html/admin/database.php | 2 +-
public_html/layout/newpro/README | 2 -
public_html/layout/newpro/admin/topic/listitem.thtml | 2 -
public_html/layout/newpro/css/admin.css | 21 -
public_html/layout/newpro/css/admin/block.css | 2 -
public_html/layout/newpro/css/admin/common.css | 2 -
public_html/layout/newpro/css/admin/configuration.css | 2 -
public_html/layout/newpro/css/admin/group.css | 2 -
public_html/layout/newpro/css/admin/lists.css | 2 -
public_html/layout/newpro/css/admin/moderation.css | 2 -
public_html/layout/newpro/css/admin/plugins.css | 2 -
public_html/layout/newpro/css/admin/story.css | 2 -
public_html/layout/newpro/css/admin/topic.css | 2 -
public_html/layout/newpro/css/admin/trackback.css | 2 -
public_html/layout/newpro/css/admin/user.css | 2 -
public_html/layout/newpro/css/article/article.css | 2 -
public_html/layout/newpro/css/block.css | 21 +-
public_html/layout/newpro/css/comment/comment.css | 2 -
public_html/layout/newpro/css/common.css | 4 +-
public_html/layout/newpro/css/compatible.css | 15 +-
public_html/layout/newpro/css/default.css | 2 -
public_html/layout/newpro/css/form.css | 33 +-
public_html/layout/newpro/css/layout.css | 264 ++++---------
public_html/layout/newpro/css/navbar/navbar.css | 10 +-
public_html/layout/newpro/css/option.css | 2 -
public_html/layout/newpro/css/plugin.css | 13 -
public_html/layout/newpro/css/plugin/japanize.css | 2 -
public_html/layout/newpro/css/plugin/sitecalendar.css | 2 -
public_html/layout/newpro/css/preferences/preferences.css | 4 +-
public_html/layout/newpro/css/search/search.css | 2 -
public_html/layout/newpro/css/stats/stats.css | 2 -
public_html/layout/newpro/css/story.css | 2 -
public_html/layout/newpro/css/submit/submit.css | 2 -
public_html/layout/newpro/css/tooltips/tooltips.css | 2 -
public_html/layout/newpro/css/trackback/trackback.css | 2 -
public_html/layout/newpro/css/users/users.css | 2 -
public_html/layout/newpro/footer.thtml | 23 +-
public_html/layout/newpro/functions.php | 6 +-
public_html/layout/newpro/header.thtml | 35 +-
public_html/layout/newpro/images/css/bg.png | Bin
public_html/layout/newpro/images/css/bg_header.gif | Bin
public_html/layout/newpro/images/css/bg_header.png | Bin
public_html/layout/newpro/images/css/bg_message_title.gif | Bin
public_html/layout/newpro/images/css/bg_message_title.png | Bin
public_html/layout/newpro/images/css/menu_bg.png | Bin
public_html/layout/newpro/images/css/menu_bg_active.png | Bin
public_html/layout/newpro/images/css/search.png | Bin
public_html/layout/newpro/images/logo.png | Bin
public_html/layout/newpro/javascript/fix_html.js | 27 -
public_html/layout/newpro/javascript/search.js | 18 +
public_html/layout/newpro/leftblocks.thtml | 23 +-
public_html/layout/newpro/style.css | 42 --
public_html/layout/newpro/style.css.php | 88 ++++
public_html/layout/newpro/users/profile.thtml | 4 +-
system/classes/story.class.php | 41 +-
system/lib-user.php | 24 +-
56 files changed, 312 insertions(+), 458 deletions(-)
diffs (truncated from 1476 to 300 lines):
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/admin/database.php
--- a/public_html/admin/database.php Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/admin/database.php Tue Mar 13 09:58:07 2012 -0400
@@ -411,7 +411,7 @@
$retval = false;
if ($_DB_dbms == 'mysql') {
- $result = DB_query("SHOW TABLE TYPES");
+ $result = DB_query("SHOW STORAGE ENGINES");
$numEngines = DB_numRows($result);
for ($i = 0; $i < $numEngines; $i++) {
$A = DB_fetchArray($result);
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/README
--- a/public_html/layout/newpro/README Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/README Tue Mar 13 09:58:07 2012 -0400
@@ -79,8 +79,6 @@
| +css ----------------- Images for ProfessionalCSS_en
|
+javascript ------------ JavaScript
- | |
- | +fix_html.js --------- Geeklog body Class Attribute
|
+README ---------------- 'ProfessionalCSS_en' README(this file)
|
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/admin/topic/listitem.thtml
--- a/public_html/layout/newpro/admin/topic/listitem.thtml Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/admin/topic/listitem.thtml Tue Mar 13 09:58:07 2012 -0400
@@ -1,12 +1,10 @@
<!-- admin/topic/listitem.thtml { -->
-{begin_row}
<li>
<a href="{site_admin_url}/topic.php?mode=edit&tid={topic_id}">{image_tag}</a>
<a href="{site_admin_url}/topic.php?mode=edit&tid={topic_id}">{topic_name}</a>
{default_topic} ({topic_access})
</li>
-{end_row}
<!-- } admin/topic/listitem.thtml -->
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/css/admin.css
--- a/public_html/layout/newpro/css/admin.css Tue Mar 13 09:25:11 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
- at charset "utf-8";
-
-/*==============================================================================
- Title : Import for admin
- Author : Fumito Arakawa as Phize (http://phize.net/) and Geeklog Japanese
- Description : Import css for admin.
-==============================================================================*/
-
-
-
- at import url("admin/common.css"); /* Common style */
- at import url("admin/block.css"); /* Block editor style */
- at import url("admin/group.css"); /* Group editor style */
- at import url("admin/lists.css"); /* Block editor style */
- at import url("admin/moderation.css"); /* List style */
- at import url("admin/plugins.css"); /* Plugin editor style */
- at import url("admin/story.css"); /* Story editor style */
- at import url("admin/topic.css"); /* Topic editor style */
- at import url("admin/trackback.css"); /* Trackback editor style */
- at import url("admin/user.css"); /* User editor style */
- at import url("admin/configuration.css"); /* Configuration editor style */
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/css/admin/block.css
--- a/public_html/layout/newpro/css/admin/block.css Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/css/admin/block.css Tue Mar 13 09:58:07 2012 -0400
@@ -1,5 +1,3 @@
- at charset "utf-8";
-
/*==============================================================================
Title : Block Editor Style (for Admin)
Author : Fumito Arakawa as Phize (http://phize.net/) and Geeklog Japanese
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/css/admin/common.css
--- a/public_html/layout/newpro/css/admin/common.css Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/css/admin/common.css Tue Mar 13 09:58:07 2012 -0400
@@ -1,5 +1,3 @@
- at charset "utf-8";
-
/*==============================================================================
Title : Common Style (for Admin)
Author : Fumito Arakawa as Phize (http://phize.net/) and Geeklog Japanese
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/css/admin/configuration.css
--- a/public_html/layout/newpro/css/admin/configuration.css Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/css/admin/configuration.css Tue Mar 13 09:58:07 2012 -0400
@@ -1,5 +1,3 @@
- at charset "utf-8";
-
/*==============================================================================
Title : Configration Style (for admin)
Author : Hiromi Ikeda as Jiro & Fumito Arakawa as Phize (http://phize.net/) and Geeklog Japanese
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/css/admin/group.css
--- a/public_html/layout/newpro/css/admin/group.css Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/css/admin/group.css Tue Mar 13 09:58:07 2012 -0400
@@ -1,5 +1,3 @@
- at charset "utf-8";
-
/*==============================================================================
Title : Group Editor Style (for admin)
Author : Fumito Arakawa as Phize (http://phize.net/) and Geeklog Japanese
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/css/admin/lists.css
--- a/public_html/layout/newpro/css/admin/lists.css Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/css/admin/lists.css Tue Mar 13 09:58:07 2012 -0400
@@ -1,5 +1,3 @@
- at charset "utf-8";
-
/*==============================================================================
Title : List Style (for admin)
Author : Fumito Arakawa as Phize (http://phize.net/) and Geeklog Japanese
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/css/admin/moderation.css
--- a/public_html/layout/newpro/css/admin/moderation.css Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/css/admin/moderation.css Tue Mar 13 09:58:07 2012 -0400
@@ -1,5 +1,3 @@
- at charset "utf-8";
-
/*==============================================================================
Title : Moderation Page Style (Admin Page)
Author : Fumito Arakawa as Phize (http://phize.net/) and Geeklog Japanese
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/css/admin/plugins.css
--- a/public_html/layout/newpro/css/admin/plugins.css Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/css/admin/plugins.css Tue Mar 13 09:58:07 2012 -0400
@@ -1,5 +1,3 @@
- at charset "utf-8";
-
/*==============================================================================
Title : Plugin Page Style (Admin Page)
Author : Fumito Arakawa as Phize (http://phize.net/) and Geeklog Japanese
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/css/admin/story.css
--- a/public_html/layout/newpro/css/admin/story.css Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/css/admin/story.css Tue Mar 13 09:58:07 2012 -0400
@@ -1,5 +1,3 @@
- at charset "utf-8";
-
/*==============================================================================
Title : Story Editor Style (Admin Page)
Author : Fumito Arakawa as Phize (http://phize.net/) and Geeklog Japanese
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/css/admin/topic.css
--- a/public_html/layout/newpro/css/admin/topic.css Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/css/admin/topic.css Tue Mar 13 09:58:07 2012 -0400
@@ -1,5 +1,3 @@
- at charset "utf-8";
-
/*==============================================================================
Title : Topic Editor Style (Admin Page)
Author : Fumito Arakawa as Phize (http://phize.net/) and Geeklog Japanese
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/css/admin/trackback.css
--- a/public_html/layout/newpro/css/admin/trackback.css Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/css/admin/trackback.css Tue Mar 13 09:58:07 2012 -0400
@@ -1,5 +1,3 @@
- at charset "utf-8";
-
/*==============================================================================
Title : Trackback Page Style (Admin Page)
Author : Fumito Arakawa as Phize (http://phize.net/) and Geeklog Japanese
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/css/admin/user.css
--- a/public_html/layout/newpro/css/admin/user.css Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/css/admin/user.css Tue Mar 13 09:58:07 2012 -0400
@@ -1,5 +1,3 @@
- at charset "utf-8";
-
/*==============================================================================
Title : User Editor Style (Admin Page)
Author : Fumito Arakawa as Phize (http://phize.net/) and Geeklog Japanese
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/css/article/article.css
--- a/public_html/layout/newpro/css/article/article.css Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/css/article/article.css Tue Mar 13 09:58:07 2012 -0400
@@ -1,5 +1,3 @@
- at charset "utf-8";
-
/*==============================================================================
Title : Article Page Style
Author : Fumito Arakawa as Phize (http://phize.net/) and Geeklog Japanese
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/css/block.css
--- a/public_html/layout/newpro/css/block.css Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/css/block.css Tue Mar 13 09:58:07 2012 -0400
@@ -1,5 +1,3 @@
- at charset "utf-8";
-
/*==============================================================================
Title : Block Style
Author : Fumito Arakawa as Phize (http://phize.net/) and Geeklog Japanese
@@ -45,7 +43,18 @@
div#centerblocks div#block-message {
margin: 2em 0;
padding: 0;
- border: 1px solid #000000;
+
+ border: 1px solid #939490;
+
+ -webkit-border-radius: 10px;
+ -moz-border-radius: 10px;
+ border-radius: 10px;
+
+ -webkit-box-shadow: 0px 0px 4px 1px #aaa;
+ -moz-box-shadow: 0px 0px 4px 1px #aaa;
+ box-shadow: 0px 0px 4px 1px #aaa;
+
+ background: #eeeeec url("./images/css/bg_message_title.png") repeat-x scroll 0 0;
}
div#centerblocks div#block-message dl {
@@ -57,16 +66,16 @@
div#centerblocks div#block-message dl dt {
margin: 0;
padding: 8px;
- background: #1A3955 url(../images/css/bg_message_title.gif) repeat-x 0 0;
- color: #FFFFFF;
+ color: #222;
font-weight: bold;
+ text-align: center;
+ line-height: 1.5em;
}
/* Message */
div#centerblocks div#block-message dl dd {
margin: 0;
padding: 8px;
- background: #E7E7E7;
font-weight: bold;
}
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/css/comment/comment.css
--- a/public_html/layout/newpro/css/comment/comment.css Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/css/comment/comment.css Tue Mar 13 09:58:07 2012 -0400
@@ -1,5 +1,3 @@
- at charset "utf-8";
-
/*==============================================================================
Title : Comment Style
Author : Fumito Arakawa as Phize (http://phize.net/) and Geeklog Japanese
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/css/common.css
--- a/public_html/layout/newpro/css/common.css Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/css/common.css Tue Mar 13 09:58:07 2012 -0400
@@ -1,5 +1,3 @@
- at charset "utf-8";
-
/*==============================================================================
Title : Common Style
Author : Fumito Arakawa as Phize (http://phize.net/) and Geeklog Japanese
@@ -363,7 +361,7 @@
margin: 0 0 0.5em 0;
padding: 0 0 0 24px;
border-bottom: 1px solid #000000;
- background: url(../images/icon_info.png) no-repeat 0 0;
+ background: url(./images/icon_info.png) no-repeat 0 0;
font-weight: bold;
}
diff -r 225267dce1cd -r 6fb6b0c3fa7f public_html/layout/newpro/css/compatible.css
--- a/public_html/layout/newpro/css/compatible.css Tue Mar 13 09:25:11 2012 -0400
+++ b/public_html/layout/newpro/css/compatible.css Tue Mar 13 09:58:07 2012 -0400
@@ -1,5 +1,3 @@
- at charset "utf-8";
-
/*==============================================================================
Title : professional compatible Style
Author : dengen - Yoshinori Tahara (http://www.trybase.com/~dengen/log/) and Geeklog Japanese
@@ -104,7 +102,7 @@
}
.ext-link {
background-color: transparent;
- background: url(../images/external.png) center right no-repeat;
+ background: url(./images/external.png) center right no-repeat;
background-attachment: scroll;
padding-right: 13px;
}
@@ -112,7 +110,7 @@
}
.feed-link {
background-color: transparent;
- background: url(../images/feed.png) center right no-repeat;
+ background: url(./images/feed.png) center right no-repeat;
background-attachment: scroll;
padding: 2px 16px 2px 0px;
}
@@ -286,7 +284,14 @@
color:#ffffff;
background:transparent;
}
+.sysmessage {
+ position: relative;
+ margin: 1em 1em 1em 4em;
+}
.sysmessage img {
+ position: absolute;
+ left: -3.1em;
+ top: -0.3em;
border:none;
float:left;
padding-bottom:3px;
@@ -587,7 +592,7 @@
color:blue;
text-align:center;
padding-top:2px;
- background:center url(../navbar/images/button_over.gif);
+ background:center url(./navbar/images/button_over.gif);
background-repeat:repeat-x;
display:block;
height:19px;
More information about the geeklog-cvs
mailing list