[geeklog-cvs] geeklog: Merging changes in professional_css theme with Geeklog.jp

geeklog-cvs at lists.geeklog.net geeklog-cvs at lists.geeklog.net
Mon Mar 21 16:53:03 EDT 2011 

changeset 8193:7621b2840340
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/7621b2840340
user: Rouslan Placella <rouslan at placella.com>
date: Mon Mar 21 20:51:07 2011 +0000
description:
Merging changes in professional_css theme with Geeklog.jp

diffstat:

 public_html/layout/professional_css/admin/config/config_element.thtml      |    9 +-
 public_html/layout/professional_css/admin/config/configuration.thtml       |   11 +-
 public_html/layout/professional_css/admin/config/menu_element.thtml        |    4 +-
 public_html/layout/professional_css/admin/story/storyeditor.thtml          |   16 +-
 public_html/layout/professional_css/admin/story/storyeditor_advanced.thtml |    5 +-
 public_html/layout/professional_css/admin/user/edituser.thtml              |    2 +-
 public_html/layout/professional_css/custom.sample.css                      |   52 ++++-----
 public_html/layout/professional_css/featuredstorytext.thtml                |    1 +
 public_html/layout/professional_css/header.thtml                           |    2 +-
 public_html/layout/professional_css/javascript/confirm.js                  |    4 +-
 public_html/layout/professional_css/javascript/fix_html.js                 |   10 +-
 public_html/layout/professional_css/leftblocks.thtml                       |    6 +-
 public_html/layout/professional_css/lists/inline/item_field.thtml          |    7 +-
 public_html/layout/professional_css/lists/inline/item_row.thtml            |    7 +-
 public_html/layout/professional_css/lists/inline/list.thtml                |    7 +-
 public_html/layout/professional_css/lists/inline/page_limit.thtml          |    7 +-
 public_html/layout/professional_css/lists/inline/page_sort.thtml           |    7 +-
 public_html/layout/professional_css/lists/table/item_field.thtml           |    7 +-
 public_html/layout/professional_css/lists/table/item_row.thtml             |    7 +-
 public_html/layout/professional_css/lists/table/list.thtml                 |    7 +-
 public_html/layout/professional_css/lists/table/page_limit.thtml           |    7 +-
 public_html/layout/professional_css/lists/table/page_sort.thtml            |    7 +-
 public_html/layout/professional_css/loginform.thtml                        |    1 +
 public_html/layout/professional_css/loginform_openid.thtml                 |    1 -
 public_html/layout/professional_css/print.css                              |    2 +-
 public_html/layout/professional_css/professional_css.png                   |    0 
 public_html/layout/professional_css/rightblocks.thtml                      |    7 +-
 public_html/layout/professional_css/style.css                              |   54 +++++-----
 public_html/layout/professional_css/tn_professional_css.png                |    0 
 public_html/layout/professional_css/tooltips/classic.thtml                 |    7 +-
 public_html/layout/professional_css/tooltips/critical.thtml                |    7 +-
 public_html/layout/professional_css/tooltips/help.thtml                    |    7 +-
 public_html/layout/professional_css/tooltips/information.thtml             |    7 +-
 public_html/layout/professional_css/tooltips/warning.thtml                 |    7 +-
 34 files changed, 178 insertions(+), 114 deletions(-)

diffs (truncated from 688 to 300 lines):

diff -r e2c8f5b4b1be -r 7621b2840340 public_html/layout/professional_css/admin/config/config_element.thtml
--- a/public_html/layout/professional_css/admin/config/config_element.thtml	Sun Mar 20 17:47:31 2011 +0100
+++ b/public_html/layout/professional_css/admin/config/config_element.thtml	Mon Mar 21 20:51:07 2011 +0000
@@ -1,9 +1,12 @@
+
+<!-- admin/config/config_element.thtml { -->
+
 <!-- BEGIN validation_error_block -->
 <div class="validation_error_block"><span></span>{validation_error_message}</div>
 <!-- END validation_error_block -->
 
 <!-- BEGIN delete-button -->
-<input type="button" class="del-link" value="x" onclick="gl_cfg_remove(this);"{xhtml}>
+<input type="button" class="del-link button" value="x" onclick="gl_cfg_remove(this);"{xhtml}>
 <!-- END delete-button -->
 
 <!-- BEGIN text-element -->
@@ -50,7 +53,7 @@
 <!-- BEGIN list-element -->
 <tr id="{name}" class="config_name"><td class="alignright" style="vertical-align:top">{display_name} {doc_link} {unset_link}</td>
 <td>
-<input type="button" value="+" onclick="hide_show_tbl(selectChildByID(this.parentNode, 'arr_table'), this);"{xhtml}>
+<input type="button" value="+" onclick="hide_show_tbl(selectChildByID(this.parentNode, 'arr_table'), this);" class="button"{xhtml}>
 {delete}
 <input type="hidden" value="true" name="{name}[placeholder]"{xhtml}>
 <table style="display:none" id="arr_table" class="{arr_table_class_list}">
@@ -73,3 +76,5 @@
 <input type="button" value="{lang_add_element}" class="add_ele_input" onclick="handleAdd(this, '{array_type}', '{arr_name}')"{xhtml}>
 </td></tr>
 <!-- END unkeyed-add-button -->
+
+<!-- } admin/config/config_element.thtml -->
diff -r e2c8f5b4b1be -r 7621b2840340 public_html/layout/professional_css/admin/config/configuration.thtml
--- a/public_html/layout/professional_css/admin/config/configuration.thtml	Sun Mar 20 17:47:31 2011 +0100
+++ b/public_html/layout/professional_css/admin/config/configuration.thtml	Mon Mar 21 20:51:07 2011 +0000
@@ -1,7 +1,10 @@
+
+<!-- /admin/config/configuration.thtml { -->
+
 <form method="post" action="{site_admin_url}/configuration.php" name="group">
-<input type="hidden" value="{open_group}" name="conf_group"{xhtml}>
-<input type="hidden" value="" name="subgroup"{xhtml}>
-<input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
+  <input type="hidden" value="{open_group}" name="conf_group"{xhtml}>
+  <input type="hidden" value="" name="subgroup"{xhtml}>
+  <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
 </form>
 <table>
     <tr>
@@ -60,3 +63,5 @@
         </td>
     </tr>
 </table>
+
+<!-- } /admin/config/configuration.thtml -->
diff -r e2c8f5b4b1be -r 7621b2840340 public_html/layout/professional_css/admin/config/menu_element.thtml
--- a/public_html/layout/professional_css/admin/config/menu_element.thtml	Sun Mar 20 17:47:31 2011 +0100
+++ b/public_html/layout/professional_css/admin/config/menu_element.thtml	Mon Mar 21 20:51:07 2011 +0000
@@ -1,5 +1,5 @@
 
-<!-- /admin/config/menu_element.thtml { -->
+<!-- admin/config/menu_element.thtml { -->
 
 <li><a href="#" onclick='open_group("{group_select_value}");return false;'>{group_display}</a>
     <ul>
@@ -11,4 +11,4 @@
     </ul>
 </li>
 
-<!-- } /admin/config/menu_element.thtml -->
+<!-- } admin/config/menu_element.thtml -->
diff -r e2c8f5b4b1be -r 7621b2840340 public_html/layout/professional_css/admin/story/storyeditor.thtml
--- a/public_html/layout/professional_css/admin/story/storyeditor.thtml	Sun Mar 20 17:47:31 2011 +0100
+++ b/public_html/layout/professional_css/admin/story/storyeditor.thtml	Mon Mar 21 20:51:07 2011 +0000
@@ -135,16 +135,16 @@
       <dd><input type="text" size="40" maxlength="40" value="{story_id}" name="sid" id="admin-storyeditor-sid" class="text"{xhtml}></dd>
 
       <dt{hide_meta}><label for="admin-storyeditor-metadescription">{lang_metadescription}</label></dt>
-      <dd{hide_meta}><textarea cols="80" rows="2" name="meta_description" id="admin-storyeditor-metadescription">{meta_description}</textarea></dd>
+      <dd{hide_meta}><textarea cols="70" rows="2" name="meta_description" id="admin-storyeditor-metadescription">{meta_description}</textarea></dd>
 
       <dt{hide_meta}><label for="admin-storyeditor-metakeywords">{lang_metakeywords}</label></dt>
-      <dd{hide_meta}><textarea cols="80" rows="2" name="meta_keywords" id="admin-storyeditor-metakeywords">{meta_keywords}</textarea></dd>
+      <dd{hide_meta}><textarea cols="70" rows="2" name="meta_keywords" id="admin-storyeditor-metakeywords">{meta_keywords}</textarea></dd>
 
       <dt><label for="admin-storyeditor-introtext">{lang_introtext}</label></dt>
-      <dd><textarea cols="80" rows="12" name="introtext" id="admin-storyeditor-introtext">{story_introtext}</textarea></dd>
+      <dd><textarea cols="70" rows="12" name="introtext" id="admin-storyeditor-introtext">{story_introtext}</textarea></dd>
 
       <dt><label for="admin-storyeditor-bodytext">{lang_bodytext}</label></dt>
-      <dd><textarea cols="80" rows="20" name="bodytext" id="admin-storyeditor-bodytext">{story_bodytext}</textarea></dd>
+      <dd><textarea cols="70" rows="20" name="bodytext" id="admin-storyeditor-bodytext">{story_bodytext}</textarea></dd>
 
       <dt><label for="admin-storyeditor-postmode">{lang_postmode}</label></dt>
       <dd>
@@ -172,9 +172,11 @@
       <dt>{lang_emails}</dt>
       <dd>{story_emails}</dd>
     </dl>
+  </div>
 
-    <hr{xhtml}>
-    
+  <fieldset>
+    <legend>{lang_accessrights}</legend>
+
     <h3>{lang_accessrights}</h3>
 
     <dl>
@@ -189,7 +191,7 @@
       <dd class="description">{lang_perm_key}</dd>
       <dd class="description">{lang_permissions_msg}</dd>
     </dl>
-  </div>  
+  </fieldset>
 
   <ul class="submit">
     <li><input type="submit" value="{lang_save}" name="mode"{xhtml}></li>
diff -r e2c8f5b4b1be -r 7621b2840340 public_html/layout/professional_css/admin/story/storyeditor_advanced.thtml
--- a/public_html/layout/professional_css/admin/story/storyeditor_advanced.thtml	Sun Mar 20 17:47:31 2011 +0100
+++ b/public_html/layout/professional_css/admin/story/storyeditor_advanced.thtml	Mon Mar 21 20:51:07 2011 +0000
@@ -28,10 +28,10 @@
       <dd><input type="text" size="40" maxlength="40" value="{story_id}" name="sid" id="admin-storyeditor_advanced-sid" class="text"{xhtml}></dd>
 
       <dt{hide_meta}><label for="admin-storyeditor-metadescription">{lang_metadescription}</label></dt>
-      <dd{hide_meta}><textarea cols="80" rows="2" name="meta_description" id="admin-storyeditor-metadescription">{meta_description}</textarea></dd>
+      <dd{hide_meta}><textarea name="meta_description" id="admin-storyeditor-metadescription" style="width:95%" rows="2">{meta_description}</textarea></dd>
 
       <dt{hide_meta}><label for="admin-storyeditor-metakeywords">{lang_metakeywords}</label></dt>
-      <dd{hide_meta}><textarea cols="80" rows="2" name="meta_keywords" id="admin-storyeditor-metakeywords">{meta_keywords}</textarea></dd>
+      <dd{hide_meta}><textarea name="meta_keywords" id="admin-storyeditor-metakeywords" style="width:95%" rows="2">{meta_keywords}</textarea></dd>
 
       <dt><label for="admin-storyeditor_advanced-tid">{lang_topic}</label></dt>
       <dd>
@@ -122,6 +122,7 @@
           <textarea cols="45" rows="20" name="bodyhtml" id="bodyhtml">{story_bodytext}</textarea>
         </dd>
       </dl>
+
       <p id="editor_mode" class="description">{lang_allowed_html}</p>
     </div>
   </div>
diff -r e2c8f5b4b1be -r 7621b2840340 public_html/layout/professional_css/admin/user/edituser.thtml
--- a/public_html/layout/professional_css/admin/user/edituser.thtml	Sun Mar 20 17:47:31 2011 +0100
+++ b/public_html/layout/professional_css/admin/user/edituser.thtml	Mon Mar 21 20:51:07 2011 +0000
@@ -54,7 +54,7 @@
       <input type="submit" value="{lang_cancel}" name="mode" class="submit"{xhtml}>
       <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
     </p>
-  </div>
+
 </form>
 
 <!-- } admin/user/edituser.thtml -->
diff -r e2c8f5b4b1be -r 7621b2840340 public_html/layout/professional_css/custom.sample.css
--- a/public_html/layout/professional_css/custom.sample.css	Sun Mar 20 17:47:31 2011 +0100
+++ b/public_html/layout/professional_css/custom.sample.css	Mon Mar 21 20:51:07 2011 +0000
@@ -1,25 +1,23 @@
 @charset "utf-8";
 
 /*==============================================================================
-  タイトル: 
-  è‘—è€
    : 
-  説明    : 
+  Title       : 
+  Author      : 
+  Description : 
 ==============================================================================*/
 
 
 
 /*==============================================================================
-  [INFO] カスタムテーマスタイルシート(雛型)
-         ProfessionalCSSテーマをベースとしたカスタムテーマの作成を補助するCSSファイル(雛型)です。
-         [BASE]部分で、ProfessionalCSSテーマの基本的なスタイルを初期化しています。
-         [CUSTOM]部分で、カスタムテーマのスタイルを定義していきます。
-         サンプルとして、リキッドレイアウトのスタイルのみ定義してあります。
+  [INFO] Custom Style Sheet Sample
+         This is custom style sheet sample of professional_css.
+         [BASE] Reset basic style.
+         [CUSTOM] Set custom theme style for liquid style.
 ==============================================================================*/
 
 /*==============================================================================
-  [BASE] ProfessionalCSSテーマのスタイル初期化
-         ProfessionalCSSテーマの基本的なスタイルを初期化します。
-         (背景色: #FFFFFF, 前景色: #000000)
+  [BASE] Reset basic style.
+         background #FFFFFF, fore color: #000000)
 ==============================================================================*/
 
 /*--------------------------------------
@@ -39,7 +37,7 @@
   width: auto;
 }
 
-/*----- ヘッダ -----*/
+/*----- Header -----*/
 div#container div#header {
   margin: 0;
   padding: 0;
@@ -52,7 +50,7 @@
   padding: 0;
 }
 
-/*----- ナビゲーション -----*/
+/*----- Navigation -----*/
 div#container div#navigation {
   width: 100%;
   background: transparent;
@@ -62,7 +60,7 @@
   width: auto;
 }
 
-/*----- フッタ -----*/
+/*----- Footer -----*/
 div#container div#footer {
   background: transparent;
   color: #000000;
@@ -84,7 +82,7 @@
   color: #ff0000;
 }
 
-/*----- ラッパー -----*/
+/*----- Wrapper -----*/
 body.left-center-right div#container div#wrapper,
 body.left-center div#container div#wrapper,
 body.center-right div#container div#wrapper,
@@ -119,24 +117,22 @@
 
 
 /*==============================================================================
-  [CUSTOM] カスタムテーマスタイル
-           カスタムテーマのスタイルを定義します。
+  [CUSTOM] Set custom theme style for liquid style.
 ==============================================================================*/
 
 /*--------------------------------------
   [CUSTOM] layout.css
-           リキッドレイアウトのサンプルです。
 
-             å¹
(å
¨ä½“)        : 80%
-             最小å¹
(å
¨ä½“)    : 800px
-             最大å¹
(å
¨ä½“)    : 80em
+             Width(All)         : 80%
+             Min Width(All)     : 800px
+             Max Width(All)     : 80em
 
-             å¹
(左ブロック)  : 20%
-             å¹
(中央ブロック): 60%
-             å¹
(右ブロック)  : 20%
+             Width(Left Block)  : 20%
+             Width(Center Block): 60%
+             Width(Right Block) : 20%
 ---------------------------------------*/
 
-/*----- コンテナ -----*/
+/*----- Container -----*/
 div#container {
   width: 80%;
   min-width: 800px;
@@ -144,7 +140,7 @@
   margin: 0 auto;
 }
 
-/*----- 左ブロックコンテナ -----*/
+/*----- Left Block Container -----*/
 div#container div#wrapper div#leftblocks {
   width: 20%;
   margin: 0 80% 0 0;
@@ -154,7 +150,7 @@
   margin: 0 -20% 0 0;
 }
 
-/*----- 中央ブロックコンテナ -----*/
+/*----- Center Block Container -----*/
 body.left-center-right div#container div#wrapper div#centerblocks {
   width: 57%;
   margin: 0 0 0 -80%;
@@ -186,7 +182,7 @@
   padding: 0 1%;
 }
 
-/*----- 右ブロックコンテナ -----*/
+/*----- Right Block Container -----*/
 div#container div#wrapper div#rightblocks {
   width: 20%;
   margin: 0 0 0 -20%;
diff -r e2c8f5b4b1be -r 7621b2840340 public_html/layout/professional_css/featuredstorytext.thtml
--- a/public_html/layout/professional_css/featuredstorytext.thtml	Sun Mar 20 17:47:31 2011 +0100
+++ b/public_html/layout/professional_css/featuredstorytext.thtml	Mon Mar 21 20:51:07 2011 +0000
@@ -1,3 +1,4 @@
+
 <!-- featuredstorytext.thtml { -->
 
 <div class="featuredstorytext">
diff -r e2c8f5b4b1be -r 7621b2840340 public_html/layout/professional_css/header.thtml
--- a/public_html/layout/professional_css/header.thtml	Sun Mar 20 17:47:31 2011 +0100
+++ b/public_html/layout/professional_css/header.thtml	Mon Mar 21 20:51:07 2011 +0000
@@ -50,7 +50,7 @@

More information about the geeklog-cvs mailing list