www-ubuntu-us-tn

Merge lp:~mac9416/www-ubuntu-us-tn/trunk into lp:www-ubuntu-us-tn

  1. trunk
  2. Merge into trunk
Proposed by Christopher Lunsford
Status: Rejected
Rejected by: Christopher Lunsford
Proposed branch: lp:~mac9416/www-ubuntu-us-tn/trunk
Merge into: lp:www-ubuntu-us-tn
Diff against target: None lines
To merge this branch: bzr merge lp:~mac9416/www-ubuntu-us-tn/trunk
Reviewer Review Type Date Requested Status
Christopher Lunsford (community) Needs Fixing
Review via email: mp+11489@code.launchpad.net

This proposal supersedes a proposal from 2009-09-09.

To post a comment you must log in.
Revision history for this message
mac9416 (mac9416) wrote : Posted in a previous version of this proposal

Improved sidebars, corrected background color, and added a theme control panel for quick editing of announcement and footer text.

Revision history for this message
mac9416 (mac9416) wrote : Posted in a previous version of this proposal

Clarification: I did all that in the Wordpress theme. ;-)

On Wed, Sep 9, 2009 at 1:10 PM, mac9416<email address hidden> wrote:
> mac9416 has proposed merging lp:~mac9416/www-ubuntu-us-tn/trunk into lp:www-ubuntu-us-tn.
>
> Requested reviews:
>    TennesseeTeam (tennessee.team)
>
> Improved sidebars, corrected background color, and added a theme control panel for quick editing of announcement and footer text.
> --
> https://code.launchpad.net/~mac9416/www-ubuntu-us-tn/trunk/+merge/11459
> You are the owner of lp:~mac9416/www-ubuntu-us-tn/trunk.
>

Revision history for this message
Christopher Lunsford (binarymutant) wrote : Posted in a previous version of this proposal

Can you review my changes first, I've added wordpress to the repo under news/ and moved your theme into the correct wordpress directory

review: Needs Resubmitting
Revision history for this message
mac9416 (mac9416) wrote :

Hey, Christopher, I've lost track of what's going on. I see that
nothing has been merged into www-ubuntu-us-tn. Could you try and
update me as to where we are? Thanks :-)

On Wed, Sep 9, 2009 at 7:35 PM, Christopher
Lunsford<email address hidden> wrote:
> Christopher Lunsford has proposed merging lp:~mac9416/www-ubuntu-us-tn/trunk into lp:www-ubuntu-us-tn.
>
>
> --
> https://code.launchpad.net/~mac9416/www-ubuntu-us-tn/trunk/+merge/11489
> You are the owner of lp:~mac9416/www-ubuntu-us-tn/trunk.
>

Revision history for this message
Christopher Lunsford (binarymutant) wrote :

There are some issues regarding maintainer-ship and code reviewing
practices that need to be resolved first please see
http://ubuntuforums.org/showthread.php?t=1260940
for now I will merge all the proposed changes but these issues need be
resolved quickly, sorry for the delay

On Wed, Sep 9, 2009 at 10:33 PM, mac9416 <email address hidden> wrote:
> Hey, Christopher, I've lost track of what's going on. I see that
> nothing has been merged into www-ubuntu-us-tn. Could you try and
> update me as to where we are? Thanks :-)
>
> On Wed, Sep 9, 2009 at 7:35 PM, Christopher
> Lunsford<email address hidden> wrote:
>> Christopher Lunsford has proposed merging lp:~mac9416/www-ubuntu-us-tn/trunk into lp:www-ubuntu-us-tn.
>>
>>
>> --
>> https://code.launchpad.net/~mac9416/www-ubuntu-us-tn/trunk/+merge/11489
>> You are the owner of lp:~mac9416/www-ubuntu-us-tn/trunk.
>>
> --
> https://code.launchpad.net/~mac9416/www-ubuntu-us-tn/trunk/+merge/11489
> You proposed lp:~mac9416/www-ubuntu-us-tn/trunk for merging.
>

Revision history for this message
Christopher Lunsford (binarymutant) wrote :

alrighty, please pull the new changes that have wordpress added in the repo, the wp-theme/ubuntu-us-tn/ folder is now in news/wp-content/themes/

review: Needs Fixing

Unmerged revisions

17. By mac9416

WP theme: stopped content bg from seperating from footer bg

16. By mac9416

Merged with latest revisions

15. By mac9416

WP theme: random code cleanup

14. By mac9416

WP theme: added theme control panel

13. By mac9416

WP theme: improved sidebars

12. By mac9416

WP theme: changed content background color

11. By mac9416

Added Wordpress theme

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'wp-theme'
2=== added directory 'wp-theme/ubuntu-us-tn'
3=== added file 'wp-theme/ubuntu-us-tn/404.php'
4--- wp-theme/ubuntu-us-tn/404.php 1970-01-01 00:00:00 +0000
5+++ wp-theme/ubuntu-us-tn/404.php 2009-09-08 13:09:12 +0000
6@@ -0,0 +1,12 @@
7+<?php get_header(); ?>
8+
9+<?php get_sidebar(); ?>
10+
11+<div class="text">
12+
13+ <h1 class="title">Not Found</h1>
14+ <p>The page you are looking is not here..</p>
15+
16+</div>
17+
18+<?php get_footer(); ?>
19\ No newline at end of file
20
21=== added file 'wp-theme/ubuntu-us-tn/archive.php'
22--- wp-theme/ubuntu-us-tn/archive.php 1970-01-01 00:00:00 +0000
23+++ wp-theme/ubuntu-us-tn/archive.php 2009-09-08 13:09:12 +0000
24@@ -0,0 +1,68 @@
25+<?php get_header(); ?>
26+
27+<?php get_sidebar(); ?>
28+<div id="content"><a name="content"></a>
29+<?php if (have_posts()) : ?>
30+
31+ <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
32+<?php /* If this is a category archive */ if (is_category()) { ?>
33+ <h2 class="pagetitle">Archive for the &#8216;<?php echo single_cat_title(); ?>&#8217; Category</h2>
34+
35+ <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
36+ <h2 class="pagetitle">Archive for <?php the_time('F jS, Y'); ?></h2>
37+
38+ <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
39+ <h2 class="pagetitle">Archive for <?php the_time('F, Y'); ?></h2>
40+
41+ <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
42+ <h2 class="pagetitle">Archive for <?php the_time('Y'); ?></h2>
43+
44+ <?php /* If this is an author archive */ } elseif (is_author()) { ?>
45+ <h2 class="pagetitle">Author Archive</h2>
46+
47+ <?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
48+ <h2 class="pagetitle">Blog Archives</h2>
49+
50+ <?php } ?>
51+
52+ <?php while (have_posts()) : the_post(); ?>
53+<div class="post" id="post-<?php the_ID(); ?>">
54+<div class="date">
55+<?php the_time('M'); ?><br /><span class="day"><?php the_time('d'); ?></span></div>
56+<div class="title">
57+<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
58+
59+<div class="sub"><span>Posted by <?php the_author(); ?> under <?php the_category(', '); ?></span></div>
60+
61+</div>
62+<div class="cover">
63+<div class="entry">
64+ <?php the_content('Read the rest of this entry &raquo;'); ?>
65+
66+</div>
67+
68+</div>
69+<div class="postinfo">
70+ <div class="edit"><?php edit_post_link('Edit this entry', '&#124; ', ''); ?> </div>
71+ <div class="com"><?php comments_popup_link('ADD COMMENTS', '1 COMMENT', '% COMMENTS'); ?></div>
72+</div>
73+
74+
75+</div>
76+ <?php endwhile; ?>
77+
78+ <div class="navigation">
79+ <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
80+ <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
81+ </div>
82+
83+ <?php else : ?>
84+
85+ <h1 class="title">Not Found</h1>
86+ <p>Sorry, but you are looking for something that isn't here.</p>
87+
88+ <?php endif; ?>
89+
90+</div>
91+
92+<?php get_footer(); ?>
93\ No newline at end of file
94
95=== added file 'wp-theme/ubuntu-us-tn/comments.php'
96--- wp-theme/ubuntu-us-tn/comments.php 1970-01-01 00:00:00 +0000
97+++ wp-theme/ubuntu-us-tn/comments.php 2009-09-08 13:09:12 +0000
98@@ -0,0 +1,100 @@
99+<?php // Do not delete these lines
100+ if ('comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
101+ die ('Please do not load this page directly. Thanks!');
102+
103+ if (!empty($post->post_password)) { // if there's a password
104+ if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) { // and it doesn't match the cookie
105+ ?>
106+
107+ <p class="nocomments">This post is password protected. Enter the password to view comments.<p>
108+
109+ <?php
110+ return;
111+ }
112+ }
113+
114+ /* This variable is for alternating comment background */
115+ $oddcomment = 'alt';
116+?>
117+
118+<!-- You can start editing here. -->
119+
120+<div class="comments" id="comments">
121+
122+<?php if ($comments) : ?>
123+ <ol>
124+
125+ <?php foreach ($comments as $comment) : ?>
126+
127+ <li class="<?php echo $oddcomment; ?>" id="comment-<?php comment_ID() ?>">
128+ <strong><?php comment_author_link() ?></strong> Said,
129+ <?php if ($comment->comment_approved == '0') : ?>
130+ <p><em>Your comment is awaiting moderation.</em></p>
131+ <?php endif; ?>
132+
133+ <?php comment_text() ?>
134+
135+ </li>
136+
137+ <?php /* Changes every other comment to a different class */
138+ if ('alt' == $oddcomment) $oddcomment = '';
139+ else $oddcomment = 'alt';
140+ ?>
141+
142+ <?php endforeach; /* end for each comment */ ?>
143+
144+ </ol>
145+
146+ <?php else : // this is displayed if there are no comments so far ?>
147+
148+ <?php if ('open' == $post->comment_status) : ?>
149+ <!-- If comments are open, but there are no comments. -->
150+
151+ <?php else : // comments are closed ?>
152+ <!-- If comments are closed. -->
153+ <p class="nocomments">Comments are closed.</p>
154+
155+ <?php endif; ?>
156+<?php endif; ?>
157+
158+
159+<?php if ('open' == $post->comment_status) : ?>
160+
161+<h2 id="respond">Add A Comment</h2>
162+
163+<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
164+<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php the_permalink(); ?>">logged in</a> to post a comment.</p>
165+<?php else : ?>
166+
167+<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
168+
169+<?php if ( $user_ID ) : ?>
170+
171+<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="Log out of this account">Logout &raquo;</a></p>
172+
173+<?php else : ?>
174+
175+<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" /> <label for="author"><small>Name <?php if ($req) echo "(required)"; ?></small></label></p>
176+
177+<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" /> <label for="email"><small>Mail (will not be published) <?php if ($req) echo "(required)"; ?></small></label></p>
178+
179+<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" /> <label for="url"><small>Website</small></label></p>
180+
181+<?php endif; ?>
182+
183+<!--<p><small><strong>XHTML:</strong> You can use these tags: <?php echo allowed_tags(); ?></small></p>-->
184+
185+<p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>
186+
187+<p><input name="submit" type="submit" id="submit" tabindex="5" value="Post" />
188+<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
189+</p>
190+<?php do_action('comment_form', $post->ID); ?>
191+
192+</form>
193+
194+<?php endif; // If registration required and not logged in ?>
195+
196+<?php endif; // if you delete this the sky will fall on your head ?>
197+
198+</div>
199\ No newline at end of file
200
201=== added file 'wp-theme/ubuntu-us-tn/footer.php'
202--- wp-theme/ubuntu-us-tn/footer.php 1970-01-01 00:00:00 +0000
203+++ wp-theme/ubuntu-us-tn/footer.php 2009-09-09 21:17:31 +0000
204@@ -0,0 +1,16 @@
205+<?php
206+global $options;
207+foreach ($options as $value) {
208+ if (get_settings( $value['id'] ) === FALSE) { $$value['id'] = $value['std']; } else { $$value['id'] = get_settings( $value['id'] ); }
209+}
210+?>
211+<div class="clear"></div>
212+ </div>
213+
214+<div id="footer">
215+<div id="footer"><?php print($ubuntu_us_tn_footer_phrase); ?></div>
216+</div>
217+
218+</div>
219+</body>
220+</html>
221
222=== added file 'wp-theme/ubuntu-us-tn/functions.php'
223--- wp-theme/ubuntu-us-tn/functions.php 1970-01-01 00:00:00 +0000
224+++ wp-theme/ubuntu-us-tn/functions.php 2009-09-09 17:59:24 +0000
225@@ -0,0 +1,189 @@
226+<?php
227+if ( function_exists('register_sidebar') )
228+ register_sidebar(array('name'=>'Sidebar'));
229+
230+if ( !is_admin() ) wp_deregister_script('jquery');
231+?>
232+<?php
233+/* Function used to list pings separated from the comments */
234+function list_pings($comment, $args, $depth) {
235+ $GLOBALS['comment'] = $comment;
236+?>
237+ <li id="comment-<?php comment_ID(); ?>" class="ping"><?php comment_author_link(); ?>
238+<?php } ?>
239+<?php
240+$themename = "Ubuntu-US-TN";
241+$shortname = "ubuntu_us_tn";
242+$options = array (
243+array( "name" => "Theme Options",
244+ "type" => "title"),
245+
246+array( "type" => "open"),
247+
248+array( "name" => "Announcement Text",
249+ "desc" => "Choose some the text that will appear at the top of the page. Leave empty for noe.",
250+ "id" => $shortname."_announcement_text",
251+ "type" => "text",
252+ "std" => "Announcement here!"),
253+
254+array( "name" => "Footer Phrase",
255+ "desc" => "Choose the phrase that will appear at the bottom of the page. Use the <tt>br</tt> tag to force the line break.",
256+ "id" => $shortname."_footer_phrase",
257+ "type" => "text",
258+ "std" => "Powered by Wordpress"),
259+
260+array( "type" => "close")
261+
262+);
263+
264+
265+function mytheme_add_admin() {
266+
267+ global $themename, $shortname, $options;
268+
269+ if ( $_GET['page'] == basename(__FILE__) ) {
270+
271+ if ( 'save' == $_REQUEST['action'] ) {
272+
273+ foreach ($options as $value) {
274+ update_option( $value['id'], $_REQUEST[ $value['id'] ] ); }
275+
276+ foreach ($options as $value) {
277+ if( isset( $_REQUEST[ $value['id'] ] ) ) { update_option( $value['id'], $_REQUEST[ $value['id'] ] ); } else { delete_option( $value['id'] ); } }
278+
279+ header("Location: themes.php?page=functions.php&saved=true");
280+ die;
281+
282+ } else if( 'reset' == $_REQUEST['action'] ) {
283+
284+ foreach ($options as $value) {
285+ delete_option( $value['id'] ); }
286+
287+ header("Location: themes.php?page=functions.php&reset=true");
288+ die;
289+
290+ }
291+ }
292+
293+ add_theme_page($themename." Options", "".$themename." Options", 'edit_themes', basename(__FILE__), 'mytheme_admin');
294+
295+}
296+
297+function mytheme_admin() {
298+
299+ global $themename, $shortname, $options;
300+
301+ if ( $_REQUEST['saved'] ) echo '<div id="message" class="updated fade"><p><strong>'.$themename.' settings saved.</strong></p></div>';
302+ if ( $_REQUEST['reset'] ) echo '<div id="message" class="updated fade"><p><strong>'.$themename.' settings reset.</strong></p></div>';
303+
304+?>
305+<div class="wrap">
306+<h2><?php echo $themename; ?> settings</h2>
307+
308+<form method="post">
309+
310+<?php foreach ($options as $value) {
311+switch ( $value['type'] ) {
312+
313+case "open":
314+?>
315+<table width="100%" border="0" style="background-color:#eef5fb; padding:10px;">
316+
317+<?php break;
318+
319+case "close":
320+?>
321+
322+</table><br />
323+
324+<?php break;
325+
326+case "title":
327+?>
328+<table width="100%" border="0" style="background-color:#dceefc; padding:5px 10px;"><tr>
329+ <td colspan="2"><h3 style="font-family:Georgia,'Times New Roman',Times,serif;"><?php echo $value['name']; ?></h3></td>
330+</tr>
331+
332+<?php break;
333+
334+case 'text':
335+?>
336+
337+<tr>
338+ <td width="20%" rowspan="2" valign="middle"><strong><?php echo $value['name']; ?></strong></td>
339+ <td width="80%"><input style="width:400px;" name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>" type="<?php echo $value['type']; ?>" value="<?php if ( get_settings( $value['id'] ) != "") { echo get_settings( $value['id'] ); } else { echo $value['std']; } ?>" /></td>
340+</tr>
341+
342+<tr>
343+ <td><small><?php echo $value['desc']; ?></small></td>
344+</tr><tr><td colspan="2" style="margin-bottom:5px;border-bottom:1px dotted #000000;">&nbsp;</td></tr><tr><td colspan="2">&nbsp;</td></tr>
345+
346+<?php
347+break;
348+
349+case 'textarea':
350+?>
351+
352+<tr>
353+ <td width="20%" rowspan="2" valign="middle"><strong><?php echo $value['name']; ?></strong></td>
354+ <td width="80%"><textarea name="<?php echo $value['id']; ?>" style="width:400px; height:200px;" type="<?php echo $value['type']; ?>" cols="" rows=""><?php if ( get_settings( $value['id'] ) != "") { echo get_settings( $value['id'] ); } else { echo $value['std']; } ?></textarea></td>
355+
356+</tr>
357+
358+<tr>
359+ <td><small><?php echo $value['desc']; ?></small></td>
360+</tr><tr><td colspan="2" style="margin-bottom:5px;border-bottom:1px dotted #000000;">&nbsp;</td></tr><tr><td colspan="2">&nbsp;</td></tr>
361+
362+<?php
363+break;
364+
365+case 'select':
366+?>
367+<tr>
368+ <td width="20%" rowspan="2" valign="middle"><strong><?php echo $value['name']; ?></strong></td>
369+ <?php $isOptionSelected = false; ?>
370+ <td width="80%"><select style="width:240px;" name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>"><?php foreach ($value['options'] as $option) { ?><option<?php if ( get_settings( $value['id'] ) == $option) { echo ' selected="selected"'; $isOptionSelected = true; } elseif ($option == $value['std'] && !$isOptionSelected ) { echo ' selected="selected"'; } ?>><?php echo $option; ?></option><?php } ?></select></td>
371+</tr>
372+
373+<tr>
374+ <td><small><?php echo $value['desc']; ?></small></td>
375+</tr><tr><td colspan="2" style="margin-bottom:5px;border-bottom:1px dotted #000000;">&nbsp;</td></tr><tr><td colspan="2">&nbsp;</td></tr>
376+
377+<?php
378+break;
379+
380+case "checkbox":
381+?>
382+ <tr>
383+ <td width="20%" rowspan="2" valign="middle"><strong><?php echo $value['name']; ?></strong></td>
384+ <td width="80%"><? if(get_settings($value['id'])){ $checked = "checked=\"checked\""; }else{ $checked = ""; } ?>
385+ <input type="checkbox" name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>" value="true" <?php echo $checked; ?> />
386+ </td>
387+ </tr>
388+
389+ <tr>
390+ <td><small><?php echo $value['desc']; ?></small></td>
391+ </tr><tr><td colspan="2" style="margin-bottom:5px;border-bottom:1px dotted #000000;">&nbsp;</td></tr><tr><td colspan="2">&nbsp;</td></tr>
392+
393+<?php break;
394+
395+}
396+}
397+?>
398+
399+<p class="submit">
400+<input name="save" type="submit" value="Save changes" />
401+<input type="hidden" name="action" value="save" />
402+</p>
403+</form>
404+<form method="post">
405+<p class="submit">
406+<input name="reset" type="submit" value="Reset" />
407+<input type="hidden" name="action" value="reset" />
408+</p>
409+</form>
410+
411+<?php
412+}
413+
414+add_action('admin_menu', 'mytheme_add_admin'); ?>
415
416=== added file 'wp-theme/ubuntu-us-tn/header.php'
417--- wp-theme/ubuntu-us-tn/header.php 1970-01-01 00:00:00 +0000
418+++ wp-theme/ubuntu-us-tn/header.php 2009-09-09 21:17:31 +0000
419@@ -0,0 +1,34 @@
420+<?php
421+global $options;
422+foreach ($options as $value) {
423+ if (get_settings( $value['id'] ) === FALSE) { $$value['id'] = $value['std']; } else { $$value['id'] = get_settings( $value['id'] ); }
424+}
425+?>
426+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
427+<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
428+<head profile="http://gmpg.org/xfn/11">
429+<link rel="icon" href="favicon.ico" type="image/x-icon">
430+<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
431+<title><?php bloginfo('name'); ?> <?php if ( is_single() ) { ?> &raquo; Blog Archive <?php } ?> <?php wp_title(); ?></title>
432+<meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats -->
433+<link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="all" />
434+<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> RSS Feed" href="<?php bloginfo('rss2_url'); ?>" />
435+<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
436+
437+ <?php wp_get_archives('type=monthly&format=link'); ?>
438+ <?php //comments_popup_script(); // off by default ?>
439+ <?php wp_head(); ?>
440+</head>
441+<body>
442+<div id="wrapper">
443+<div id="top">
444+ <a href="<?php bloginfo('siteurl');?>/"><img alt="Ubuntu Tennessee" src="<?php bloginfo('stylesheet_directory'); ?>/images/tnbanner.png" /></a>
445+</div>
446+ <div id="menu">
447+ <ul>
448+ <?php if (is_page()) { $highlight = "page_item"; } else {$highlight = "page_item current_page_item"; } ?>
449+ <?php wp_list_pages('exclude='.get_page_by_title('Sitemap')->ID.','.get_page_by_title('Our Logo')->ID.'&sort_column=menu_order&depth=1&title_li='); ?>
450+ </ul>
451+ </div>
452+<div class="content">
453+<div id="announcement"><h3><?php print($ubuntu_us_tn_announcement_text); ?></h3></div>
454
455=== added directory 'wp-theme/ubuntu-us-tn/images'
456=== added file 'wp-theme/ubuntu-us-tn/images/blank.gif'
457Binary files wp-theme/ubuntu-us-tn/images/blank.gif 1970-01-01 00:00:00 +0000 and wp-theme/ubuntu-us-tn/images/blank.gif 2009-09-08 13:09:12 +0000 differ
458=== added file 'wp-theme/ubuntu-us-tn/images/tnbanner.png'
459Binary files wp-theme/ubuntu-us-tn/images/tnbanner.png 1970-01-01 00:00:00 +0000 and wp-theme/ubuntu-us-tn/images/tnbanner.png 2009-09-08 13:09:12 +0000 differ
460=== added file 'wp-theme/ubuntu-us-tn/index.php'
461--- wp-theme/ubuntu-us-tn/index.php 1970-01-01 00:00:00 +0000
462+++ wp-theme/ubuntu-us-tn/index.php 2009-09-08 13:09:12 +0000
463@@ -0,0 +1,38 @@
464+<?php get_header(); ?>
465+<?php get_sidebar(); ?>
466+<div id="content"><a name="content"></a>
467+<?php if (have_posts()) : ?>
468+
469+<?php while (have_posts()) : the_post(); ?>
470+<div class="post" id="post-<?php the_ID(); ?>">
471+<div class="title">
472+<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
473+
474+</div>
475+<div class="cover">
476+<div class="entry">
477+ <?php the_content('Read the rest of this entry &raquo;'); ?>
478+</div>
479+</div>
480+</div>
481+ <?php endwhile; ?>
482+
483+ <div class="navigation">
484+ <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
485+ <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
486+ </div>
487+
488+ <?php else : ?>
489+
490+ <div class="post">
491+ <h1 class="title">Not Found</h1>
492+ <p>YOU are looking for something that ISN'T HERE.</p>
493+ </div>
494+
495+ <?php endif; ?>
496+
497+</div>
498+
499+<?php get_sidebar(); ?>
500+
501+<?php get_footer(); ?>
502
503=== added file 'wp-theme/ubuntu-us-tn/page.php'
504--- wp-theme/ubuntu-us-tn/page.php 1970-01-01 00:00:00 +0000
505+++ wp-theme/ubuntu-us-tn/page.php 2009-09-08 13:09:12 +0000
506@@ -0,0 +1,27 @@
507+<?php get_header(); ?>
508+
509+<?php get_sidebar(); ?>
510+
511+<div id="content"><a name="content"></a>
512+<?php if (have_posts()) : ?>
513+
514+<?php while (have_posts()) : the_post(); ?>
515+<div class="post" id="post-<?php the_ID(); ?>">
516+<div class="title">
517+<!--<h1><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h1>-->
518+
519+</div>
520+<div class="cover">
521+<div class="entry">
522+ <?php the_content('Read the rest of this entry &raquo;'); ?>
523+
524+</div>
525+
526+</div>
527+<div class="postinfo"></div>
528+</div>
529+ <?php endwhile; endif; ?>
530+
531+</div>
532+
533+<?php get_footer(); ?>
534\ No newline at end of file
535
536=== added file 'wp-theme/ubuntu-us-tn/screenshot.gif'
537Binary files wp-theme/ubuntu-us-tn/screenshot.gif 1970-01-01 00:00:00 +0000 and wp-theme/ubuntu-us-tn/screenshot.gif 2009-09-08 13:09:12 +0000 differ
538=== added file 'wp-theme/ubuntu-us-tn/search.php'
539--- wp-theme/ubuntu-us-tn/search.php 1970-01-01 00:00:00 +0000
540+++ wp-theme/ubuntu-us-tn/search.php 2009-09-08 13:09:12 +0000
541@@ -0,0 +1,49 @@
542+<?php get_header(); ?>
543+
544+<?php get_sidebar(); ?>
545+
546+<div id="content"><a name="content"></a>
547+<?php if (have_posts()) : ?>
548+ <h2 class="pagetitle">Search Results</h2>
549+<?php while (have_posts()) : the_post(); ?>
550+<div class="post" id="post-<?php the_ID(); ?>">
551+<div class="date">
552+<?php the_time('M'); ?><br /><span class="day"><?php the_time('d'); ?></span></div>
553+<div class="title">
554+<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
555+
556+<div class="sub"><span>Posted by <?php the_author(); ?> under <?php the_category(', '); ?></span></div>
557+
558+</div>
559+<div class="cover">
560+<div class="entry">
561+ <?php the_content('Read the rest of this entry &raquo;'); ?>
562+
563+</div>
564+
565+</div>
566+<div class="postinfo">
567+ <div class="edit"><?php edit_post_link('Edit this entry', '&#124; ', ''); ?> </div>
568+ <div class="com"><?php comments_popup_link('ADD COMMENTS', '1 COMMENT', '% COMMENTS'); ?></div>
569+</div>
570+
571+
572+
573+</div>
574+ <?php endwhile; ?>
575+
576+ <div class="navigation">
577+ <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
578+ <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
579+ </div>
580+
581+ <?php else : ?>
582+
583+ <h1 class="title">Not Found</h1>
584+ <p>Sorry, no post matched your criteria. Try a different search?</p>
585+
586+ <?php endif; ?>
587+
588+</div>
589+
590+<?php get_footer(); ?>
591\ No newline at end of file
592
593=== added file 'wp-theme/ubuntu-us-tn/sidebar.php'
594--- wp-theme/ubuntu-us-tn/sidebar.php 1970-01-01 00:00:00 +0000
595+++ wp-theme/ubuntu-us-tn/sidebar.php 2009-09-09 01:44:01 +0000
596@@ -0,0 +1,16 @@
597+<?php if ( is_dynamic_sidebar() ) : ?>
598+<div class="boxes">
599+<div class="lbox">
600+ <h3>Quick Links</h3>
601+ <ul>
602+ <li>Launchpad</li>
603+ <li>etc.</li>
604+ <li>etc.</li>
605+ </ul>
606+</div>
607+<div class="rbox">
608+ <h3>Rbox</h3>
609+ <p>Do something with me!</p>
610+</div>
611+</div>
612+<?php endif; ?>
613\ No newline at end of file
614
615=== added file 'wp-theme/ubuntu-us-tn/single.php'
616--- wp-theme/ubuntu-us-tn/single.php 1970-01-01 00:00:00 +0000
617+++ wp-theme/ubuntu-us-tn/single.php 2009-09-08 13:09:12 +0000
618@@ -0,0 +1,35 @@
619+<?php get_header(); ?>
620+
621+<?php get_sidebar(); ?>
622+<div id="content"><a name="content"></a>
623+<?php if (have_posts()) : ?>
624+
625+<?php while (have_posts()) : the_post(); ?>
626+<div class="post" id="post-<?php the_ID(); ?>">
627+<div class="title">
628+<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
629+
630+</div>
631+<div class="cover">
632+<div class="entry">
633+ <?php the_content('Read the rest of this entry &raquo;'); ?>
634+</div>
635+</div>
636+<div class="postinfo">
637+ <div class="alignleft"><?php previous_post_link('&laquo; %link') ?></div>
638+ <div class="alignright"><?php next_post_link('%link &raquo;') ?></div>
639+</div>
640+
641+
642+</div>
643+<?php comments_template(); ?>
644+ <?php endwhile; else: ?>
645+
646+ <h1 class="title">Not Found</h1>
647+ <p>I'm Sorry, YOU are looking for something that ISN'T HERE. </p>
648+
649+<?php endif; ?>
650+
651+</div>
652+
653+<?php get_footer(); ?>
654\ No newline at end of file
655
656=== added file 'wp-theme/ubuntu-us-tn/style.css'
657--- wp-theme/ubuntu-us-tn/style.css 1970-01-01 00:00:00 +0000
658+++ wp-theme/ubuntu-us-tn/style.css 2009-09-09 01:44:01 +0000
659@@ -0,0 +1,163 @@
660+/*
661+Theme Name: Ubuntu-US-TN
662+Description: 2-column Ubuntu-esque theme
663+Author: mac9416
664+*/
665+
666+body {
667+ margin: 0;
668+ padding-top: 10px;
669+ padding-bottom: 10px;
670+ padding-left: 15px;
671+ padding-right: 15px;
672+ background-color: #DCD4B0;
673+ font-family: serif;
674+ font-size: 13px;
675+ }
676+img {
677+ border: 0;
678+ }
679+blockquote {
680+ padding-left: 10px;
681+ color: #555;
682+ font-style: normal;
683+ }
684+
685+/* The Wrapper */
686+
687+#wrapper {
688+ padding-left: 20px;
689+ padding-right: 20px;
690+ margin: 0 auto;
691+ }
692+
693+/* The Top */
694+
695+#top {
696+ height: 210px;
697+ margin: auto;
698+ background-color: #F1F1DD;
699+ border-radius-topleft: 15px;
700+ border-radius-topright: 15px;
701+ -webkit-border-top-right-radius: 15px;
702+ -webkit-border-top-left-radius: 15px;
703+ -moz-border-radius-topleft: 15px;
704+ -moz-border-radius-topright: 15px;
705+ }
706+#top img {
707+ display: block;
708+ padding-top: 5px;
709+ margin-left: auto;
710+ margin-right: auto;
711+ border: none;
712+ }
713+
714+#announcement {
715+ display: block;
716+ width: 100%;
717+ background-color: #F5CD2E;
718+ text-align: center;
719+ margin: 0px;
720+ padding: 0px;
721+ font-weight: bold;
722+}
723+
724+.content {
725+ background-color: #F1F1DD;
726+ padding-top: 25px;
727+ padding-left: 20px;
728+ padding-right: 20px;
729+ min-height: 350px;
730+ }
731+
732+/* The Menu */
733+
734+#menu {
735+ display: block;
736+ width: 100%;
737+ margin: 0px;
738+ }
739+#menu ul {
740+ margin: 0px;
741+ list-style-type: none;
742+ width: auto;
743+ float: left;
744+ }
745+#menu ul li{
746+ display: block;
747+ float: left;
748+ margin: 0 0 0 2px;
749+ width: auto;
750+ }
751+#menu ul li a{
752+ display: block;
753+ float: left;
754+ color: #D3000E;
755+ text-align: center;
756+ text-decoration: none;
757+ padding: 5px 10px 0 10px;
758+ width: auto;
759+ font-family: sans-serif;
760+ font-size: 14pt;
761+ font-weight: bold;
762+ }
763+#menu ul li a:hover,#menu ul li.current_page_item a {
764+ color: #FF6209;
765+ text-align: center;
766+ }
767+
768+#content {
769+ margin: auto;
770+ width: 60%;
771+ }
772+
773+/* The Sidebar */
774+.boxes h1, .boxes h2, .boxes h3{
775+ margin: 0;
776+ background-color: #808080;
777+ -moz-border-radius: 5px;
778+ padding: 3px;
779+ }
780+.lbox {
781+ float: left;
782+ width: 16%;
783+ font-family: sans-serif;
784+ }
785+.rbox {
786+ float: right;
787+ width: 16%;
788+ font-family: sans-serif;
789+ }
790+/* --- FOOTER --- */
791+
792+#footer {
793+ color: white;
794+ background-color: #2f2f2f;
795+ font-size: 8pt;
796+ font-weight: normal;
797+ text-align: center;
798+ border-radius-bottomleft: 15px;
799+ border-radius-bottomright: 15px;
800+ -webkit-border-bottom-right-radius: 15px;
801+ -webkit-border-bottom-left-radius: 15px;
802+ -moz-border-radius-bottomleft: 15px;
803+ -moz-border-radius-bottomright: 15px;
804+ }
805+
806+/* The Page Title */
807+
808+h2.pagetitle {
809+ padding: 0;
810+ margin: 0 0 20px 0;
811+ font-size: 25px;
812+ text-align: center;
813+ }
814+
815+.alignright {
816+ float: right;
817+ width: auto;
818+ }
819+.alignleft {
820+ float: left;
821+ width: auto;
822+}
823\ No newline at end of file

Subscribers

People subscribed via source and target branches