Merge lp:~ronnie.vd.c/ubuntu-nl-artwork/light-smf-theme into lp:ubuntu-nl-artwork/website-theme

[Ronnie]

Icons from Thomas - Partly cleaned HTML/CSS - Less table structure in boardlayout - Wider white border

[Ronnie (ronnie.vd.c)]

review: Approve

=== modified file 'BoardIndex.template.php'
--- BoardIndex.template.php	2010-08-16 07:54:50 +0000
+++ BoardIndex.template.php	2010-09-08 13:30:58 +0000
@@ -6,8 +6,7 @@
 	global $context, $settings, $options, $txt, $scripturl, $modSettings;
 
 	echo '
-	<div id="boardindex_table">
-		<table class="table_list">';
+	<div id="boardindex_table" class="table_list">';
 
 	/* Each category in categories is made up of:
 	id, href, link, name, is_collapsed (is it collapsed?), can_collapse (is it okay if it is?),
@@ -20,30 +19,26 @@
 			continue;
 
 		echo '
-			<tbody class="smf-cat-header">
-				<tr>
-					<td colspan="4" class="catbg"><span class="left"></span>';
+		<div class="smf-cat">
+			<div class="smf-cat-header shadow round">
+				<div class="catbg">
+					<span class="left"></span>';
 
 		// If this category even can collapse, show a link to collapse it.
 		if ($category['can_collapse'])
 			echo '
-						<a class="collapse" href="', $category['collapse_href'], '">', $category['collapse_image'], '</a>';
+					<a class="collapse" href="', $category['collapse_href'], '">', $category['collapse_image'], '</a>';
 
 		if (!$context['user']['is_guest'] && !empty($category['show_unread']))
 			echo '
-						<a class="unreadlink" href="', $scripturl, '?action=unread;c=', $category['id'], '">', $txt['view_unread_category'], '</a>';
+					<a class="unreadlink" href="', $scripturl, '?action=unread;c=', $category['id'], '">', $txt['view_unread_category'], '</a>';
 
 		echo '
 						', $category['link'], '
-					</td>
-				</tr>
-			</tbody>
-			<tbody class="smf-cat-divider">
-				<tr>
-					<td colspan="4"></td>
-				</tr>
-			</tbody>
-			<tbody class="smf-content">';
+				</div>
+			</div>
+
+			<div class="smf-cat-content"><table>';
 
 		// Assuming the category hasn't been collapsed...
 		if (!$category['is_collapsed'])
@@ -135,31 +130,27 @@
 
 						$children[] = $child['new'] ? '<strong>' . $child['link'] . '</strong>' : $child['link'];
 					}
-					echo '
-					<tr>
-						<td colspan="3" class="children windowbg">
-							<strong>', $txt['parent_boards'], '</strong>: ', implode(', ', $children), '
-						</td>
-					</tr>';
+						echo '
+				<tr>
+					<td colspan="3" class="children windowbg">
+						<strong>', $txt['parent_boards'], '</strong>: ', implode(', ', $children), '
+					</td>
+				</tr>';
 				}
 			}
 		}
 		echo '
-			</tbody>
-			<tbody class="divider">
-				<tr>
-					<td colspan="4"></td>
-				</tr>
-			</tbody>';
+			</table></div>
+		</div>';
 	}
 	echo '
-		</table>
-	</div>';
+	</div>
 
+	<section class="main-content">';
 	if ($context['user']['is_logged'])
 	{
 		echo '
-	<div id="posting_icons" class="align_left">';
+	<div id="posting_icons">';
 
 		// Mark read button.
 		$mark_read_button = array(
@@ -181,13 +172,15 @@
 	else
 	{
 		echo '
-	<div id="posting_icons" class="flow_hidden">
+	<div id="posting_icons">
 		<ul class="reset">
 			<li class="align_left"><img src="', $settings['images_url'], '/new_none.png" alt="" /> ', $txt['old_posts'], '</li>
 			<li class="align_left"><img src="', $settings['images_url'], '/new_redirect.png" alt="" /> ', $txt['redirect_board'], '</li>
 		</ul>
 	</div>';
 	}
+	echo'
+	</section>';
 
 	template_info_center();
 }
@@ -326,7 +319,7 @@
 
 	// "Users online" - in order of activity.
 	echo '
-	<div class="forum_stat_item">
+		<div class="forum_stat_item">
 			<div class="title_barIC">
 				<h4 class="titlebg">
 					<span class="ie6_header floatleft">
@@ -372,8 +365,7 @@
 				', $txt['most_online_today'], ': <strong>', comma_format($modSettings['mostOnlineToday']), '</strong>.
 				', $txt['most_online_ever'], ': ', comma_format($modSettings['mostOnline']), ' (', timeformat($modSettings['mostDate']), ')
 			</p>
-		</div>
-	</div>';
+		</div>';
 
 	// If they are logged in, but statistical information is off... show a personal message bar.
 	if ($context['user']['is_logged'] && !$settings['show_stats_index'])
@@ -393,13 +385,13 @@
 				<span class="smalltext">
 					', $txt['you_have'], ' ', comma_format($context['user']['messages']), ' ', $context['user']['messages'] == 1 ? $txt['message_lowercase'] : $txt['msg_alert_messages'], '.... ', $txt['click'], ' <a href="', $scripturl, '?action=pm">', $txt['here'], '</a> ', $txt['to_view'], '
 				</span>
-			</p>';
+			</p>
+		</div>';
 	}
 
 	echo '
-		</div>
 	</article>
-	<div class="divide"></div>';
+	<hr class="divide" />';
 
 	// Info center collapse object.
 	echo '

=== modified file 'css/default.css'
--- css/default.css	2010-09-05 16:07:22 +0000
+++ css/default.css	2010-09-08 13:30:58 +0000
@@ -470,82 +470,85 @@
 /*-  Forum Decoration
 -------------------------------------------------------------------------------------------------------- */
 
-.forum-title                                                                                    { text-align: center; margin-bottom: 24px; }
-
-.forum-news                                                                                     { color: #333; font-size:0.9em; line-height: 1.2em; }
-.forum-news-header                                                                              { color: #333; font-weight:bold; }
-.forum-news-content                                                                             { color: #333; margin-left: 24px; }
-.forum-news-content a                                                                           { color: #333; }
-.forum-news-content a:hover                                                                     { color: #DD4814; }
-
-.table_list                                                                                     { width: 100%; }
-.table_list a											{ color: #DD4814; }
-.table_list a:hover										{ text-shadow: 1px 1px 2px #ccc; }
-
-.smf-header-divide										{ -moz-box-shadow: 0px 2px 2px  #dfdfdf; -webkit-box-shadow: 0px 1px 1px #ccc; }
-
-.smf-cat-header a 										{ color: #333; }
-.smf-cat-header	tr td										{ padding-left: 10px; }
-.smf-cat-header tr,
-.table_grid thead                                                                               { background-color: #F7F7F7; -moz-border-radius: 4px; -webkit-border-radius: 4px; -moz-box-shadow: 0px 2px 5px  #dfdfdf; -webkit-box-shadow: 0px 1px 1px #ccc;}
-.unreadlink											{ float: right; margin-right: 12px; font-size: 0.65em; }
-.forum_stat_item										{ display: inline-block; width: 455px;}
-
-.subject											{ color: #333333; font-size: 16px; }
-<<<<<<< TREE
-=======
-.subject a											{ color: #DD4814; }
-.subject a:hover										{ text-shadow: 1px 1px 2px #ccc; }
->>>>>>> MERGE-SOURCE
-
-.smf-cat-divider										{ height: 10px; }
-.smf-board-content										{ height: 60px; margin-top: 0px; }
-.info-desc 											{ padding: 0px; line-height: 1em; }
-
-.buttonlist, 
-.pagesection											{ float: left; }
-.buttonlist li											{ background-color: #F7F7F7; padding: 5px 0px; -moz-box-shadow: 2px 2px 1px #DFDFDF; margin: 0 5px; -moz-border-radius: 5px; }
-.buttonlist li:hover										{ background-color: #EFEFEF; }
+.shadow,
+.buttonlist ul li				{ -moz-box-shadow: 0px 2px 5px  #dfdfdf; -webkit-box-shadow: 0px 2px 5px #dfdfdf; }
+.round,
+.buttonlist ul li				{ -moz-border-radius: 4px; -webkit-border-radius: 4px; }
+
+/* Forum Global */
+.forum-title					{ text-align: center; margin-bottom: 24px; }
+
+.forum-news					{ color: #333; font-size:0.9em; line-height: 1.2em; }
+.forum-news-header				{ color: #333; font-weight:bold; }
+.forum-news-content				{ color: #333; margin-left: 24px; }
+.forum-news-content a				{ color: #333; }
+.forum-news-content a:hover			{ color: #DD4814; }
+
+.smf-header-divide				{ -moz-box-shadow: 0px 2px 2px  #dfdfdf; -webkit-box-shadow: 0px 1px 1px #ccc; }
+
+.login-register a				{ color: #333; }
+.login-register a:hover				{ color: #DD4814; }
+
+#linktree					{ margin-bottom: 12px; }
+.linktree-link,
+.linktree-link:visited				{ color: #DD4814; }
+
+/* Boardindex global */
+#posting_icons					{ float: left; }
+.mark_read					{ float: right; }
+
+/* Category overview - index */
+.smf-cat-header,
+.smf-cat-content				{ clear:both; float:left; margin:5px 10px; padding:0px 10px; width:920px;  }
+.smf-cat-header a 				{ color: #333; }
+.smf-cat-header,
+.table_grid thead				{ background-color: #F7F7F7; }
+.smf-cat-content a				{ color: #DD4814; }
+.smf-cat-content a:hover			{ text-shadow: 1px 1px 2px #ccc; }
+.unreadlink					{ float: right; margin-right: 12px; font-size: 0.65em; }
+
+/* Overview of boards in the category */
+.forum_stat_item				{ display: inline-block; width: 455px;}
+
+.subject					{ color: #333333; font-size: 16px; }
+.subject a					{ color: #DD4814; }
+.subject a:hover				{ text-shadow: 1px 1px 2px #ccc; }
+
+.smf-board-content				{ height: 60px; margin-top: 0px; }
+.info-desc 					{ padding: 0px; line-height: 1em; }
+
+.buttonlist li					{ display: inline; background-color: #F7F7F7; padding: 5px 10px;  margin: 0 5px; }
+.buttonlist li:hover				{ background-color: #EFEFEF; }
+
 .buttonlist a,
-.pagesection a 											{ color: #333; padding: 2px 3px; }
+.pagesection a					{ color: #333; padding: 2px 3px; }
 .buttonlist a:hover,
-.pagesection a:hover										{ color: #DD4814; }
-.pagelinks											{ font-size: 0.70em;  }
-.buttonlist											{ float: none; display: block; }
-.buttonlist ul li 										{ list-style: none; display: inline;  }
-
-.table_grid thead a { font-size: 0.75em; color: #DD4814; }
-
-/* Total width should be 960px */
-.icon                                                                                           { vertical-align: top; }
-.info												{ width: 550px; }
-.stats												{ width: 80px; }
-.lastpost											{ width: 275px; font-size: 14px; }
-.lastpost a											{ color: #DD4814; }
-.lastpost a:hover									{ text-shadow: 1px 1px 2px #ccc; }
-
-.icon a img 											{ margin-top: 5px; }
-//.info a											{ color: #333; font-weight: bold; font-size: 14px; }
-
-.reportlinks a											{ color: #333333; }
-
-#posting_icons li										{ display: inline-block; }
-
-//.catbg a                                              					{ color: #DD4814; }
-//smf-board-content										{ margin-top: 5px; }
-
-.login-register a                                                                               { color: #333; }
-.login-register a:hover                                                                         { color: #DD4814; }
-
-#linktree                                                                                       { margin-bottom: 12px; }
-.linktree-link,
-.linktree-link:visited                                                                          { color: #DD4814; }
+
+.pagesection a:hover				{ color: #DD4814; }
+.pagelinks					{ font-size: 0.70em;  }
+
+
+
+/* Total width should be 920px */
+.icon						{ vertical-align: top; }
+.info						{ width: 550px; }
+.stats						{ width: 80px; }
+.lastpost					{ width: 275px; font-size: 14px; }
+.lastpost a					{ color: #DD4814; }
+.lastpost a:hover				{ text-shadow: 1px 1px 2px #ccc; }
+
+.icon a img					{ margin-top: 5px; }
+//.info a					{ color: #333; font-weight: bold; font-size: 14px; }
+
+.reportlinks a					{ color: #333333; }
+
+#posting_icons li				{ display: inline-block; }
 
 .forum-title-link,
-.forum-title-link:visited                                                                       { color:#333; }
+.forum-title-link:visited			{ color:#333; }
 .forum-title-link:hover,
 .forum-title-link:active,
-.forum-title-link:focus                                                                         { color:#DD4814; text-shadow: 1px 1px 2px #999; }
+.forum-title-link:focus				{ color:#DD4814; text-shadow: 1px 1px 2px #999; }
 
 /* KuZeKo [e-mail]
 -------------------------------------------------------------------------------------------------------- */

=== modified file 'images/collapse.gif'
Binary files images/collapse.gif	2010-08-13 17:32:54 +0000 and images/collapse.gif	2010-09-08 13:30:58 +0000 differ
=== modified file 'images/expand.gif'
Binary files images/expand.gif	2010-08-13 17:32:54 +0000 and images/expand.gif	2010-09-08 13:30:58 +0000 differ
=== modified file 'images/icons/info.gif'
Binary files images/icons/info.gif	2010-08-01 07:34:15 +0000 and images/icons/info.gif	2010-09-08 13:30:58 +0000 differ
=== modified file 'images/icons/online.gif'
Binary files images/icons/online.gif	2010-08-01 07:34:15 +0000 and images/icons/online.gif	2010-09-08 13:30:58 +0000 differ
=== modified file 'images/new_none.png'
Binary files images/new_none.png	2010-09-05 18:08:48 +0000 and images/new_none.png	2010-09-08 13:30:58 +0000 differ
=== modified file 'images/new_redirect.png'
Binary files images/new_redirect.png	2010-08-01 07:34:15 +0000 and images/new_redirect.png	2010-09-08 13:30:58 +0000 differ
=== modified file 'images/new_some.png'
Binary files images/new_some.png	2010-09-05 18:08:48 +0000 and images/new_some.png	2010-09-08 13:30:58 +0000 differ
=== modified file 'images/off.png'
Binary files images/off.png	2010-09-05 18:08:48 +0000 and images/off.png	2010-09-08 13:30:58 +0000 differ
=== modified file 'images/on.png'
Binary files images/on.png	2010-09-05 18:08:48 +0000 and images/on.png	2010-09-08 13:30:58 +0000 differ
=== modified file 'index.template.php'
--- index.template.php	2010-09-05 10:44:08 +0000
+++ index.template.php	2010-09-08 13:30:58 +0000
@@ -215,9 +215,8 @@
         </aside>';
         
         echo'
-        <section id="main-section">
-                <div class="container" >
-                <section id="content">
+        <section id="main-section"><div class="container" >
+                <section id="content-header">
                         <section id="forum-header">
                                 <h1 class="forum-title">
                                         <a class="forum-title-link" href="', $scripturl, '">', empty($context['header_logo_url_html_safe']) ? $context['forum_name'] : '<img src="' . $context['header_logo_url_html_safe'] . '" alt="' . $context['forum_name'] . '" />', '</a>
@@ -314,24 +313,24 @@
                         // Show the navigation tree.
                         theme_linktree();
         echo'
-                </section>
-                <hr class="divide" />';
+        	</section>
+        	<hr class="divide" />';
 
         // The main content should go here.
         echo '
-                <div id="content_section"><div class="frame">
-	                <div id="main_content_section">';
+        	<section id="content-main">';
 }
 
 function template_body_below()
 {
 global $context, $settings, $options, $scripturl, $txt, $modSettings;
 echo '
-                        </div>
-                </div></div>
-        </div>
-	</section>
-	<hr class="divide" />';
+			
+                </section>
+                <hr class="divide" />
+        </div></section>
+        <hr class="divide" />
+	';
 
 	// The new thema's footer
 	echo '