[geeklog-cvs] geeklog: Merged with upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Mon Apr 23 19:08:15 EDT 2012
changeset 8609:083646b91a97
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/083646b91a97
user: dengen
date: Wed Apr 18 20:57:01 2012 +0900
description:
Merged with upstream
diffstat:
public_html/layout/newpro/README | 2 +
public_html/layout/newpro/archivestorytext.thtml | 7 +-
public_html/layout/newpro/css/layout.css | 154 +-
public_html/layout/newpro/css/story.css | 59 +-
public_html/layout/newpro/featuredstorytext.thtml | 7 +-
public_html/layout/newpro/footer.thtml | 22 +-
public_html/layout/newpro/functions.php | 124 +-
public_html/layout/newpro/header.thtml | 22 +-
public_html/layout/newpro/javascript/fix_html.js | 27 +
public_html/layout/newpro/storytext.thtml | 7 +-
public_html/layout/professional/functions.php | 122 +-
public_html/layout/professional_css/functions.php | 122 +-
public_html/lib-common.php | 16788 ++++++++++---------
13 files changed, 8957 insertions(+), 8506 deletions(-)
diffs (truncated from 17770 to 300 lines):
diff -r 8ef3b42af54f -r 083646b91a97 public_html/layout/newpro/README
--- a/public_html/layout/newpro/README Sun Apr 15 14:07:15 2012 +0900
+++ b/public_html/layout/newpro/README Wed Apr 18 20:57:01 2012 +0900
@@ -79,6 +79,8 @@
| +css ----------------- Images for ProfessionalCSS_en
|
+javascript ------------ JavaScript
+ | |
+ | +fix_html.js --------- Geeklog body Class Attribute
|
+README ---------------- 'ProfessionalCSS_en' README(this file)
|
diff -r 8ef3b42af54f -r 083646b91a97 public_html/layout/newpro/archivestorytext.thtml
--- a/public_html/layout/newpro/archivestorytext.thtml Sun Apr 15 14:07:15 2012 +0900
+++ b/public_html/layout/newpro/archivestorytext.thtml Wed Apr 18 20:57:01 2012 +0900
@@ -11,6 +11,10 @@
<li>{edit_icon}</li>
</ul>
+ <div style="clear:both"></div>
+
+ <span class="story_image">{story_anchortag_and_image}</span>
+
<ul class="status">
<li>{story_date}</li>
<li>
@@ -27,8 +31,9 @@
</li>
</ul>
+ <div style="clear:both"></div>
+
<div class="story_introtext">
- <span class="story_image">{story_anchortag_and_image}</span>
{story_text_no_br}
</div>
diff -r 8ef3b42af54f -r 083646b91a97 public_html/layout/newpro/css/layout.css
--- a/public_html/layout/newpro/css/layout.css Sun Apr 15 14:07:15 2012 +0900
+++ b/public_html/layout/newpro/css/layout.css Wed Apr 18 20:57:01 2012 +0900
@@ -3,6 +3,25 @@
Authors : Fumito Arakawa as Phize (http://phize.net/) and Geeklog Japanese
Rouslan Placella <rouslan at placella.com>
Description : Basic layout style.
+ JavaScript enabled
+ * Always set 'js_on'
+ * 3 Column ( Left Block * Center Block * Right Block)...left-center-right
+ * 2 Column ( Left Block * Center Block)...left-center
+ * 2 Column ( Center Block * Right Block)...center-right
+ * 1 Column ( Center Block)...center
+
+ JavaScript Disenabled: HTML body class attribute is always 3 Column
+ * Always set 'js_off'
+
+ Block Width:
+ * Container Width = 100%
+ * Site Width[W] = 960px
+ * Left Block Width[L] = 180px
+ * Right Block Width[R] = 180px
+ * Center Block Width(3 Column ) = [W] - [L] - [R] = 600px = 580px + left padding 10px + right padding 10px
+ * Center Block Width(2 Column ) = [W] - [L] = 780px = 770px + left padding 10px
+ * Center Block Width(2 Column ) = [W] - [R] = 780px = 770px + right padding 10px
+ * Center Block Width(1 Column ) = [W] = 960px
Apply : storytext.thtml, storybodytext.thtml
featuredstorytext.thtml, featuredstorybodytext.thtml
@@ -154,30 +173,141 @@
Include contents Block level elements(div#leftblocks, div#centerblocks, div#rightblocks)
--------------------------------------*/
-div#container table#wrapper {
- width: 100%;
+div#container div#wrapper {
+ overflow: visible; /* Adjust floating element */
+ width: 100%;
+ margin: 0 auto;
+ padding: 0 0 8px;
}
-div#container table#wrapper td {
- padding: 0;
+/* Content generated by the float clear */
+div#container div#wrapper:after {
+ content: "";
+ display: block;
+ clear: both;
+ height: 1px;
+ overflow: hidden;
}
-div#container div#rightblocks {
- width: 180px;
+/* Win IE 6(Adjust floating element) { \*/
+* html div#container div#wrapper {
+ height: 1%;
+ overflow: visible;
+}
+/* } Win IE 6(Adjust floating element) */
+
+/* JavaScript Enabled* 3 Column ( Left Block* Center Block* Right Block) Wrapper */
+body.left-center-right div#container div#wrapper {
}
-div#container td#centerblocks-wrapper {
- width: 100%;
+/* JavaScript Enabled* 2 Column ( Left Block* Center Block) Wrapper */
+body.left-center div#container div#wrapper {
}
-div#container div#centerblocks {
- width: 100%;
+/* JavaScript Enabled* 2 Column ( Center Block* Right Block) Wrapper */
+body.center-right div#container div#wrapper {
}
-div#container div#leftblocks {
- width: 180px;
+/* JavaScript Enabled* 1 Column ( Center Block) Wrapper */
+body.center div#container div#wrapper {
}
+/* JavaScript Disenabled Wrapper */
+body.js_off div#container div#wrapper {
+}
+
+
+
+/*--------------------------------------
+ Left Block Container
+ display if Left Block is appeared.
+--------------------------------------*/
+
+div#container div#wrapper div#leftblocks {
+ overflow: auto;
+ float: {left};
+ width: 180px; /* Left Block Width[L] */
+ margin-{right}: 780px; /* Right Margin = Site All Width[W] - Left Block Width[L] */
+ padding: 0;
+}
+
+/* JavaScript Disenabled Left Block Container */
+body.js_off div#container div#wrapper div#leftblocks {
+ float: {left};
+ margin-{right}: -180px; /* Right Margin = -( Left Block Width[L]) */
+}
+
+/*--------------------------------------
+ Center Block Container
+ div#centerblocks is always display.
+--------------------------------------*/
+
+div#container div#wrapper div#centerblocks {
+ overflow: visible;
+}
+
+div#container div#wrapper div#centerblocks-content {
+ padding: 0 8px;
+}
+
+/* JavaScript Enabled* 3 Column ( Left Block* Center Block* Right Block) Center Block Container */
+body.left-center-right div#container div#wrapper div#centerblocks {
+ float: {left};
+ width: 580px; /* Center Block Width = Site All Width[W] - Left Block Width[L] - Right Block Width[R] - Right Padding - Left Padding */
+ margin-{left}: -770px; /* Left Margin = -( Site All Width[W] - Left Block Width[L]) - 10px */
+}
+
+/* JavaScript Enabled* 2 Column ( Left Block* Center Block) Center Block Container */
+body.left-center div#container div#wrapper div#centerblocks {
+ float: {left};
+ width: 770px; /* Center Block Width = Site All Width[W] - Left Block Width[L] - Right Padding - Left Padding */
+ margin-{left}: -770px; /* Left Margin = -( Site All Width[W] - Left Block Width[L]) */
+}
+
+/* JavaScript Enabled* 2 Column ( Center Block* Right Block) Center Block Container */
+body.center-right div#container div#wrapper div#centerblocks {
+ float: {left};
+ width: 770px; /* Site All Width[W] - Right Block Width[R] - Right Padding - Left Padding */
+ margin-{right}: 180px; /* Right Margin = Right Block Width[R] */
+}
+
+/* JavaScript Enabled* 1 Column ( Center Block) Center Block Container */
+body.center div#container div#wrapper div#centerblocks {
+ width: 960px; /* Center Block Width = Site All Width[W] - Right Padding - Left Padding */
+ margin: 0;
+ padding: 0;
+}
+
+/* JavaScript Disenabled Center Block Container */
+body.js_off div#container div#wrapper div#centerblocks {
+ display: inline; /* Win IE 6(Float Left Right Margin is too wide) */
+ float: {left};
+ width: 580px; /* Center Block Width = Site All Width[W] - Left Block Width[L] - Right Block Width[R] - Right Padding - Left Padding */
+ margin-{left}: 190px; /* Left Margin = Left Block Width[L] */
+}
+
+
+
+/*--------------------------------------
+ Right Block Container
+ div#rightblocks display if Right Block is appeared.
+--------------------------------------*/
+
+div#container div#wrapper div#rightblocks {
+ overflow: auto;
+ float: {left};
+ width: 180px; /* Right Block Width[R] */
+ margin-{left}: -180px; /* Left Margin = -( Right Block Width[R]) */
+}
+
+/* JavaScript Disenabled Right Block Container */
+body.js_off div#container div#wrapper div#rightblocks {
+ float: {right};
+ margin: 0;
+}
+
+
+
/*--------------------------------------
Footer Container
--------------------------------------*/
diff -r 8ef3b42af54f -r 083646b91a97 public_html/layout/newpro/css/story.css
--- a/public_html/layout/newpro/css/story.css Sun Apr 15 14:07:15 2012 +0900
+++ b/public_html/layout/newpro/css/story.css Wed Apr 18 20:57:01 2012 +0900
@@ -15,14 +15,14 @@
/* Container */
div#centerblocks div.storytext {
- margin: 0 0 2em 0;
- padding: 0;
- border-bottom: 1px solid #E7E7E7;
+ margin: 0 0 1em 0;
+ padding: 0 0 1em;
+ border-bottom: 1px solid #ccc;
}
/* Story Title */
div#centerblocks div.storytext h2 {
- float: left;
+ float: {left};
margin: 0 0 1em 0;
padding: 0;
font-size: 110%;
@@ -32,10 +32,10 @@
/* Icon(email to friends, print, pdf) */
div#centerblocks div.storytext ul.icon {
list-style-type: none;
- float: right;
+ float: {right};
margin: 0;
padding: 0;
- text-align: right;
+ text-align: {right};
}
div#centerblocks div.storytext ul.icon li{
@@ -48,9 +48,10 @@
div#centerblocks div.storytext ul.status {
list-style-position: outside;
list-style-type: none;
- clear: both;
margin: 0 0 1em 0;
+ margin-{left}: 1em;
padding: 0;
+ float: {left};
}
div#centerblocks div.storytext ul.status li {
@@ -83,8 +84,8 @@
}
/* Topic Icon */
-div#centerblocks div.storytext div.story_introtext span.story_image {
- float: right;
+div#centerblocks div.storytext span.story_image {
+ float: {left};
width: 48px;
height: 48px;
margin: 0;
@@ -128,14 +129,14 @@
/* Container */
div#centerblocks div.featuredstorytext {
- margin: 0 0 2em 0;
- padding: 0;
- border-bottom: 1px solid #E7E7E7;
+ margin: 0 0 1em 0;
+ padding: 0 0 1em;
+ border-bottom: 1px solid #ccc;
}
/* Story Title */
div#centerblocks div.featuredstorytext h2 {
- float: left;
+ float: {left};
margin: 0 0 1em 0;
padding: 0;
font-size: 110%;
@@ -145,10 +146,10 @@
/* Icon(email to friends, print, pdf) */
div#centerblocks div.featuredstorytext ul.icon {
More information about the geeklog-cvs
mailing list