From b77ab38cf3c2c7ce82c292ec18e985d007309d47 Mon Sep 17 00:00:00 2001 From: Stepan Tanasiychuk Date: Sun, 9 Oct 2011 23:12:55 +0300 Subject: [PATCH 01/23] fixed html on main page. html is now valid --- templates/skin/new-jquery/footer.tpl | 2 +- templates/skin/new-jquery/header.tpl | 48 ++++++++++++++-------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/templates/skin/new-jquery/footer.tpl b/templates/skin/new-jquery/footer.tpl index bb2a1541..bd195e7f 100644 --- a/templates/skin/new-jquery/footer.tpl +++ b/templates/skin/new-jquery/footer.tpl @@ -11,7 +11,7 @@ diff --git a/templates/skin/new-jquery/header.tpl b/templates/skin/new-jquery/header.tpl index f6b60936..1f339716 100644 --- a/templates/skin/new-jquery/header.tpl +++ b/templates/skin/new-jquery/header.tpl @@ -1,12 +1,12 @@ - + - + {hook run='html_head_begin'} - + {$sHtmlTitle} - - + + @@ -18,33 +18,33 @@ {if $aHtmlRssAlternate} {/if} - + {if $bRefreshToHome} {/if} - - {$aHtmlHeadFiles.js} - - From 9b9d436043c041ad99f8d4128fcc165fd348e8db Mon Sep 17 00:00:00 2001 From: Stepan Tanasiychuk Date: Sun, 9 Oct 2011 23:26:48 +0300 Subject: [PATCH 02/23] fixed comments html. replaced name attributes to id --- templates/skin/new-jquery/comment.tpl | 24 ++-- templates/skin/new-jquery/comment_list.tpl | 18 +-- templates/skin/new-jquery/comment_tree.tpl | 133 ++++++++++----------- 3 files changed, 85 insertions(+), 90 deletions(-) diff --git a/templates/skin/new-jquery/comment.tpl b/templates/skin/new-jquery/comment.tpl index 35e6808e..de2c3bad 100644 --- a/templates/skin/new-jquery/comment.tpl +++ b/templates/skin/new-jquery/comment.tpl @@ -3,12 +3,12 @@
{if !$oComment->getDelete() or $bOneComment or ($oUserCurrent and $oUserCurrent->isAdministrator())} - - - + + +
- - + +
{if $oComment->isBad()} - - - {if $oComment->getTargetType()!='talk'} + + + {if $oComment->getTargetType()!='talk'}
{if $oComment->getRating()>0}+{/if}{$oComment->getRating()}
{/if} - - + + -{else} +{else} {$aLang.comment_was_delete} {/if} {if $oUserCurrent} -{/if} +{/if}
\ No newline at end of file diff --git a/templates/skin/new-jquery/comment_list.tpl b/templates/skin/new-jquery/comment_list.tpl index a927b30a..26405422 100644 --- a/templates/skin/new-jquery/comment_list.tpl +++ b/templates/skin/new-jquery/comment_list.tpl @@ -3,28 +3,28 @@ {assign var="oUser" value=$oComment->getUser()} {assign var="oTopic" value=$oComment->getTarget()} {assign var="oBlog" value=$oTopic->getBlog()} - - + +
{$oTopic->getTitle()|escape:'html'} / {$oBlog->getTitle()|escape:'html'} {$oTopic->getCountComment()}
- +
{if $oComment->getRating()>0}+{/if}{$oComment->getRating()}
- -
+ +
{if $oComment->isBad()}
{$oComment->getText()}
{else} {$oComment->getText()} - {/if} + {/if}
- - + +
- {/foreach} + {/foreach}
{include file='paging.tpl' aPaging="$aPaging"} \ No newline at end of file diff --git a/templates/skin/new-jquery/comment_tree.tpl b/templates/skin/new-jquery/comment_tree.tpl index 22c5793a..9b7fc6cc 100644 --- a/templates/skin/new-jquery/comment_tree.tpl +++ b/templates/skin/new-jquery/comment_tree.tpl @@ -6,46 +6,43 @@
{/if} - +

{$aLang.comment_title} ({$iCountComment})

{if $sTargetType=='topic'} - RSS + RSS {/if} {$aLang.comment_collapse} / {$aLang.comment_expand}
- - -
{assign var="nesting" value="-1"} {foreach from=$aComments item=oComment name=rublist} {assign var="cmtlevel" value=$oComment->getLevel()} - + {if $cmtlevel>$oConfig->GetValue('module.comment.max_tree')} {assign var="cmtlevel" value=$oConfig->GetValue('module.comment.max_tree')} {/if} - - {if $nesting < $cmtlevel} - {elseif $nesting > $cmtlevel} + + {if $nesting < $cmtlevel} + {elseif $nesting > $cmtlevel} {section name=closelist1 loop=$nesting-$cmtlevel+1}
{/section} {elseif not $smarty.foreach.rublist.first} {/if} - +
- + {include file='comment.tpl'} - + {assign var="nesting" value=$cmtlevel} {if $smarty.foreach.rublist.last} - {section name=closelist2 loop=$nesting+1}
{/section} + {section name=closelist2 loop=$nesting+1}{/section} {/if} {/foreach} - - + + {include file='comment_paging.tpl' aPagingCmt=$aPagingCmt} {if $bAllowNewComment} @@ -54,69 +51,69 @@ {if $oUserCurrent}

{$sNoticeCommentAdd}

- + {if $oConfig->GetValue('view.tinymce')} - + {literal} - {/literal} {else} {include file='window_load_img.tpl' sToLoad='form_comment_text'} - {/if} - +
{if $oUserCurrent} - + {/if} - +
@@ -129,6 +126,4 @@ {else} {$aLang.comment_unregistered} {/if} -{/if} - - +{/if} \ No newline at end of file From 86cae78dc57ada37fd64da4fad3c6572acf79bb0 Mon Sep 17 00:00:00 2001 From: Stepan Tanasiychuk Date: Sun, 9 Oct 2011 23:39:24 +0300 Subject: [PATCH 03/23] fixed comments html for authenticated users. fixed html in window for load img --- templates/skin/new-jquery/comment_tree.tpl | 2 +- templates/skin/new-jquery/window_load_img.tpl | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/skin/new-jquery/comment_tree.tpl b/templates/skin/new-jquery/comment_tree.tpl index 9b7fc6cc..8debae33 100644 --- a/templates/skin/new-jquery/comment_tree.tpl +++ b/templates/skin/new-jquery/comment_tree.tpl @@ -114,7 +114,7 @@ {/if} - + diff --git a/templates/skin/new-jquery/window_load_img.tpl b/templates/skin/new-jquery/window_load_img.tpl index 9bf4ccc1..ee58124f 100644 --- a/templates/skin/new-jquery/window_load_img.tpl +++ b/templates/skin/new-jquery/window_load_img.tpl @@ -1,8 +1,8 @@ - +

{$aLang.uploadimg}

+

{hook run="uploadimg_source"}

- - From a0feecdf07e37b052b7899202201c605cb70c647 Mon Sep 17 00:00:00 2001 From: Stepan Tanasiychuk Date: Sun, 9 Oct 2011 23:56:53 +0300 Subject: [PATCH 04/23] list of blogs. moved inline styles from html to grid.css --- templates/skin/new-jquery/blog_list.tpl | 10 +++++----- templates/skin/new-jquery/css/grid.css | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/templates/skin/new-jquery/blog_list.tpl b/templates/skin/new-jquery/blog_list.tpl index 77a2fb4d..1a16e805 100644 --- a/templates/skin/new-jquery/blog_list.tpl +++ b/templates/skin/new-jquery/blog_list.tpl @@ -1,13 +1,13 @@ - - {if $oUserCurrent}{/if} - - + + {if $oUserCurrent}{/if} + + - + {foreach from=$aBlogs item=oBlog} {assign var="oUserOwner" value=$oBlog->getOwner()} diff --git a/templates/skin/new-jquery/css/grid.css b/templates/skin/new-jquery/css/grid.css index 0484ec33..60cbe89f 100644 --- a/templates/skin/new-jquery/css/grid.css +++ b/templates/skin/new-jquery/css/grid.css @@ -117,12 +117,15 @@ .blog-list-table { } .blog-list-table tbody { color: #999; } +.blog-list-table td.blog-join-leave, .blog-list-table td.blog-readers-count, .blog-list-table td.blog-rating { text-align: center; width: 60px; } +.blog-list-table td.blog-join-leave { width: 100px; } .blog-list-table td .avatar { float: left; position: relative; top: 2px; } .blog-list-table td .title { font-size: 18px; line-height: 22px; } .blog-list-table td .user { font-weight: bold; color: #999; background: url(../images/icons.gif) 0 -108px no-repeat; } .blog-list-table td .private { position: relative; top: 2px; } .blog-list-table td p { margin-bottom: 0; color: #999; } + /* User profile */ .user-profile { margin-bottom: 20px; overflow: hidden; zoom: 1; position: relative; } .user-profile .avatar { float: left; margin-right: 15px; } From 019b7ff117f546242595f3a9a8e3d118d7f52004 Mon Sep 17 00:00:00 2001 From: Stepan Tanasiychuk Date: Sun, 9 Oct 2011 23:58:06 +0300 Subject: [PATCH 05/23] fixed indent and CS in main.css --- templates/skin/new-jquery/css/main.css | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/templates/skin/new-jquery/css/main.css b/templates/skin/new-jquery/css/main.css index 44031ab6..d8991cf8 100644 --- a/templates/skin/new-jquery/css/main.css +++ b/templates/skin/new-jquery/css/main.css @@ -1,23 +1,13 @@ -body { - font: 12px/18px Tahoma, Arial, Sans-Serif; - color: #333; - background: #F7F8F9; -} +body { font: 12px/18px Tahoma, Arial, Sans-Serif; color: #333; background: #F7F8F9; } h1, h2, h3, h4, h5, h6 { font: normal 18px Verdana, Arial, Sans-Serif; line-height: 1.3em; margin-bottom: 0.3em; color: #333; } h2 { font-size: 22px; margin-bottom: 10px; } h2 span { color: #6EC80D; } h3 { font-size: 18px; } -a { color: #70AAE0; } -a:hover { text-decoration: none; } +a { color: #70AAE0; } +a:hover { text-decoration: none; } a.dashed { text-decoration: none; border-bottom: 1px dashed #70AAE0; } -p { margin-bottom: 18px; } - - - - - - +p { margin-bottom: 18px; } \ No newline at end of file From 231f970e937c75ebb71093d986e6d6e6db654957 Mon Sep 17 00:00:00 2001 From: Stepan Tanasiychuk Date: Sun, 9 Oct 2011 23:56:53 +0300 Subject: [PATCH 06/23] list of blogs. moved inline styles from html to grid.css --- templates/skin/new-jquery/blog_list.tpl | 8 ++++---- templates/skin/new-jquery/css/grid.css | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/templates/skin/new-jquery/blog_list.tpl b/templates/skin/new-jquery/blog_list.tpl index 1a16e805..85bcf1d3 100644 --- a/templates/skin/new-jquery/blog_list.tpl +++ b/templates/skin/new-jquery/blog_list.tpl @@ -12,14 +12,14 @@ {foreach from=$aBlogs item=oBlog} {assign var="oUserOwner" value=$oBlog->getOwner()} - {if $oUserCurrent} - {/if} - - + + {/foreach} diff --git a/templates/skin/new-jquery/css/grid.css b/templates/skin/new-jquery/css/grid.css index 60cbe89f..726ade28 100644 --- a/templates/skin/new-jquery/css/grid.css +++ b/templates/skin/new-jquery/css/grid.css @@ -116,6 +116,9 @@ .blog .blog-wrapper .user-list li img { display: block; margin: 0 auto 2px; } .blog-list-table { } +.blog-list-table thead td.blog-join-leave, .blog-list-table thead td.blog-readers-count, .blog-list-table thead td.blog-rating { text-align: center; width: 60px; } +.blog-list-table thead td.blog-join-leave { width: 100px; } +.blog-list-table tbody td.blog-join-leave, .blog-list-table tbody td.blog-readers-count, .blog-list-table tbody td.blog-rating { text-align: center; } .blog-list-table tbody { color: #999; } .blog-list-table td.blog-join-leave, .blog-list-table td.blog-readers-count, .blog-list-table td.blog-rating { text-align: center; width: 60px; } .blog-list-table td.blog-join-leave { width: 100px; } From ce49307c7f21f3c98b72d5959feb923b47962e8c Mon Sep 17 00:00:00 2001 From: Stepan Tanasiychuk Date: Mon, 10 Oct 2011 00:40:09 +0300 Subject: [PATCH 07/23] list of peoples. moved inline styles from html to common.css --- .../new-jquery/actions/ActionPeople/index.tpl | 18 ++++---- templates/skin/new-jquery/css/common.css | 41 ++++++++++--------- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/templates/skin/new-jquery/actions/ActionPeople/index.tpl b/templates/skin/new-jquery/actions/ActionPeople/index.tpl index 988223c0..3fb6734c 100644 --- a/templates/skin/new-jquery/actions/ActionPeople/index.tpl +++ b/templates/skin/new-jquery/actions/ActionPeople/index.tpl @@ -1,6 +1,6 @@ {include file='header.tpl' menu='people'} - +

{$aLang.user_list} ({$aStat.count_all})

    @@ -12,20 +12,20 @@
{$aLang.blogs_title}{$aLang.blog_join_leave}{$aLang.blogs_readers}{$aLang.blogs_rating}{$aLang.blogs_title}{$aLang.blog_join_leave}{$aLang.blogs_readers}{$aLang.blogs_rating}
+ {$oBlog->getTitle()|escape:'html'} {if $oBlog->getType()=='close'}[x]{/if}

{$aLang.blogs_owner}: {$oUserOwner->getLogin()}

 + {if $oUserCurrent->getId()!=$oBlog->getOwnerId() and $oBlog->getType()=='open'}
{else} @@ -27,8 +27,8 @@ {/if} 		{$oBlog->getCountUser()}{$oBlog->getRating()}{$oBlog->getCountUser()}{$oBlog->getRating()}
- - - + + + - + {foreach from=$aUsersRating item=oUser} - - - + + + - {/foreach} + {/foreach}
{$aLang.user}{$aLang.user_skill}{$aLang.user_rating}{$aLang.user_skill}{$aLang.user_rating}
{$oUser->getLogin()}{$oUser->getSkill()}{$oUser->getRating()}{$oUser->getSkill()}{$oUser->getRating()}
{else} diff --git a/templates/skin/new-jquery/css/common.css b/templates/skin/new-jquery/css/common.css index bc072cb1..78bbb7b2 100644 --- a/templates/skin/new-jquery/css/common.css +++ b/templates/skin/new-jquery/css/common.css @@ -85,27 +85,30 @@ .join { width: 10px; height: 10px; background: url(../images/icons.gif) no-repeat 0 -250px; cursor: pointer; } .join.active { background-position: -10px -250px; } -.table { width: 100%; margin-bottom: 15px; } -.table td { padding: 5px; } -.table tr.active td { background: #F1FCEF; } -.table thead td { background: #F0F1F1; font-weight: bold; } -.table tbody td { padding: 5px; border-bottom: 1px solid #ddd; font-size: 11px; } +table { width: 100%; margin-bottom: 15px; } +table td { padding: 5px; } +table tr.active td { background: #F1FCEF; } +table thead td { background: #F0F1F1; font-weight: bold; } +table tbody td { padding: 5px; border-bottom: 1px solid #ddd; font-size: 11px; } -.table.table-people { } -.table.table-people .avatar { vertical-align: middle; margin-right: 7px; } -.table.table-people td { padding: 5px 10px; vertical-align: middle; } -.table.table-people .username { font-weight: bold; color: #999; } -.table.table-people .strength { font-weight: bold; color: #70AAE0; } -.table.table-people .date { color: #999; } -.table.table-people .rating strong { font-weight: bold; color: #fff; background: #FF68CF; padding: 5px 10px; } +table.table-people { } +table.table-people td { padding: 5px 10px; vertical-align: middle; } +table.table-people td.user-skill, table.table-people td.user-rating { text-align: center; } +table.table-people td.user-skill { width: 60px; } +table.table-people td.user-rating { width: 80px; } +table.table-people .avatar { vertical-align: middle; margin-right: 7px; } +table.table-people .username { font-weight: bold; color: #999; } +table.table-people .strength { font-weight: bold; color: #70AAE0; } +table.table-people .date { color: #999; } +table.table-people .rating strong { font-weight: bold; color: #fff; background: #FF68CF; padding: 5px 10px; } -.table.table-talk tbody td { color: #999; } -.table.table-talk td { padding: 5px; } -.table.table-talk td .username { padding-left: 13px; background: url(../images/icons.gif) 0 -108px no-repeat; margin-right: 5px; text-decoration: none;} -.table.table-talk td .username.inactive { color: #bbb; } -.table.table-talk a.favourite { float: left; width: 10px; height: 8px; background: url(../images/icons.gif) -40px -40px no-repeat; } -.table.table-talk a.favourite.active { background-position: -50px -40px; } -.table.table-talk a.favourite:hover { background-position: -50px -40px; } +table.table-talk tbody td { color: #999; } +table.table-talk td { padding: 5px; } +table.table-talk td .username { padding-left: 13px; background: url(../images/icons.gif) 0 -108px no-repeat; margin-right: 5px; text-decoration: none;} +table.table-talk td .username.inactive { color: #bbb; } +table.table-talk a.favourite { float: left; width: 10px; height: 8px; background: url(../images/icons.gif) -40px -40px no-repeat; } +table.table-talk a.favourite.active { background-position: -50px -40px; } +table.table-talk a.favourite:hover { background-position: -50px -40px; } .right { float: right; } span.green { color: #008000; } \ No newline at end of file From 671592372dbacc0fe6a7af62c269fc32a534a553 Mon Sep 17 00:00:00 2001 From: Stepan Tanasiychuk Date: Mon, 10 Oct 2011 00:48:45 +0300 Subject: [PATCH 08/23] removed "text/javascript" from script tag --- .../new-jquery/actions/ActionBlog/add.tpl | 86 +++++++-------- .../new-jquery/actions/ActionLink/add.tpl | 2 +- .../new-jquery/actions/ActionPhotoset/add.tpl | 100 +++++++++--------- .../new-jquery/actions/ActionQuestion/add.tpl | 2 +- .../new-jquery/actions/ActionTalk/add.tpl | 78 +++++++------- .../new-jquery/actions/ActionTopic/add.tpl | 80 +++++++------- .../skin/new-jquery/block.streamConfig.tpl | 2 +- .../skin/new-jquery/block.userfeedUsers.tpl | 2 +- templates/skin/new-jquery/topic_photoset.tpl | 14 +-- 9 files changed, 183 insertions(+), 183 deletions(-) diff --git a/templates/skin/new-jquery/actions/ActionBlog/add.tpl b/templates/skin/new-jquery/actions/ActionBlog/add.tpl index 508976ef..7ba06999 100644 --- a/templates/skin/new-jquery/actions/ActionBlog/add.tpl +++ b/templates/skin/new-jquery/actions/ActionBlog/add.tpl @@ -13,49 +13,49 @@ {if $oConfig->GetValue('view.tinymce')} - + - {else} {include file='window_load_img.tpl' sToLoad='topic_text'} - {/if} @@ -79,10 +79,10 @@ {$aLang.blog_create_type_open_notice}

-


diff --git a/templates/skin/new-jquery/actions/ActionLink/add.tpl b/templates/skin/new-jquery/actions/ActionLink/add.tpl index cdc98015..5a6e14ed 100644 --- a/templates/skin/new-jquery/actions/ActionLink/add.tpl +++ b/templates/skin/new-jquery/actions/ActionLink/add.tpl @@ -25,7 +25,7 @@ {/foreach}

- + - {else} {include file='window_load_img.tpl' sToLoad='topic_text'} - {/if} -