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

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
=== added directory 'wp-theme'
=== added directory 'wp-theme/ubuntu-us-tn'
=== added file 'wp-theme/ubuntu-us-tn/404.php'
--- wp-theme/ubuntu-us-tn/404.php 1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/404.php 2009-09-08 13:09:12 +0000
@@ -0,0 +1,12 @@
1<?php get_header(); ?>
2
3<?php get_sidebar(); ?>
4
5<div class="text">
6
7 <h1 class="title">Not Found</h1>
8 <p>The page you are looking is not here..</p>
9
10</div>
11
12<?php get_footer(); ?>
0\ No newline at end of file13\ No newline at end of file
114
=== added file 'wp-theme/ubuntu-us-tn/archive.php'
--- wp-theme/ubuntu-us-tn/archive.php 1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/archive.php 2009-09-08 13:09:12 +0000
@@ -0,0 +1,68 @@
1<?php get_header(); ?>
2
3<?php get_sidebar(); ?>
4<div id="content"><a name="content"></a>
5<?php if (have_posts()) : ?>
6
7 <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
8<?php /* If this is a category archive */ if (is_category()) { ?>
9 <h2 class="pagetitle">Archive for the &#8216;<?php echo single_cat_title(); ?>&#8217; Category</h2>
10
11 <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
12 <h2 class="pagetitle">Archive for <?php the_time('F jS, Y'); ?></h2>
13
14 <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
15 <h2 class="pagetitle">Archive for <?php the_time('F, Y'); ?></h2>
16
17 <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
18 <h2 class="pagetitle">Archive for <?php the_time('Y'); ?></h2>
19
20 <?php /* If this is an author archive */ } elseif (is_author()) { ?>
21 <h2 class="pagetitle">Author Archive</h2>
22
23 <?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
24 <h2 class="pagetitle">Blog Archives</h2>
25
26 <?php } ?>
27
28 <?php while (have_posts()) : the_post(); ?>
29<div class="post" id="post-<?php the_ID(); ?>">
30<div class="date">
31<?php the_time('M'); ?><br /><span class="day"><?php the_time('d'); ?></span></div>
32<div class="title">
33<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
34
35<div class="sub"><span>Posted by <?php the_author(); ?> under <?php the_category(', '); ?></span></div>
36
37</div>
38<div class="cover">
39<div class="entry">
40 <?php the_content('Read the rest of this entry &raquo;'); ?>
41
42</div>
43
44</div>
45<div class="postinfo">
46 <div class="edit"><?php edit_post_link('Edit this entry', '&#124; ', ''); ?> </div>
47 <div class="com"><?php comments_popup_link('ADD COMMENTS', '1 COMMENT', '% COMMENTS'); ?></div>
48</div>
49
50
51</div>
52 <?php endwhile; ?>
53
54 <div class="navigation">
55 <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
56 <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
57 </div>
58
59 <?php else : ?>
60
61 <h1 class="title">Not Found</h1>
62 <p>Sorry, but you are looking for something that isn't here.</p>
63
64 <?php endif; ?>
65
66</div>
67
68<?php get_footer(); ?>
0\ No newline at end of file69\ No newline at end of file
170
=== added file 'wp-theme/ubuntu-us-tn/comments.php'
--- wp-theme/ubuntu-us-tn/comments.php 1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/comments.php 2009-09-08 13:09:12 +0000
@@ -0,0 +1,100 @@
1<?php // Do not delete these lines
2 if ('comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
3 die ('Please do not load this page directly. Thanks!');
4
5 if (!empty($post->post_password)) { // if there's a password
6 if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) { // and it doesn't match the cookie
7 ?>
8
9 <p class="nocomments">This post is password protected. Enter the password to view comments.<p>
10
11 <?php
12 return;
13 }
14 }
15
16 /* This variable is for alternating comment background */
17 $oddcomment = 'alt';
18?>
19
20<!-- You can start editing here. -->
21
22<div class="comments" id="comments">
23
24<?php if ($comments) : ?>
25 <ol>
26
27 <?php foreach ($comments as $comment) : ?>
28
29 <li class="<?php echo $oddcomment; ?>" id="comment-<?php comment_ID() ?>">
30 <strong><?php comment_author_link() ?></strong> Said,
31 <?php if ($comment->comment_approved == '0') : ?>
32 <p><em>Your comment is awaiting moderation.</em></p>
33 <?php endif; ?>
34
35 <?php comment_text() ?>
36
37 </li>
38
39 <?php /* Changes every other comment to a different class */
40 if ('alt' == $oddcomment) $oddcomment = '';
41 else $oddcomment = 'alt';
42 ?>
43
44 <?php endforeach; /* end for each comment */ ?>
45
46 </ol>
47
48 <?php else : // this is displayed if there are no comments so far ?>
49
50 <?php if ('open' == $post->comment_status) : ?>
51 <!-- If comments are open, but there are no comments. -->
52
53 <?php else : // comments are closed ?>
54 <!-- If comments are closed. -->
55 <p class="nocomments">Comments are closed.</p>
56
57 <?php endif; ?>
58<?php endif; ?>
59
60
61<?php if ('open' == $post->comment_status) : ?>
62
63<h2 id="respond">Add A Comment</h2>
64
65<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
66<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>
67<?php else : ?>
68
69<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
70
71<?php if ( $user_ID ) : ?>
72
73<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>
74
75<?php else : ?>
76
77<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>
78
79<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>
80
81<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>
82
83<?php endif; ?>
84
85<!--<p><small><strong>XHTML:</strong> You can use these tags: <?php echo allowed_tags(); ?></small></p>-->
86
87<p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>
88
89<p><input name="submit" type="submit" id="submit" tabindex="5" value="Post" />
90<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
91</p>
92<?php do_action('comment_form', $post->ID); ?>
93
94</form>
95
96<?php endif; // If registration required and not logged in ?>
97
98<?php endif; // if you delete this the sky will fall on your head ?>
99
100</div>
0\ No newline at end of file101\ No newline at end of file
1102
=== added file 'wp-theme/ubuntu-us-tn/footer.php'
--- wp-theme/ubuntu-us-tn/footer.php 1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/footer.php 2009-09-09 21:17:31 +0000
@@ -0,0 +1,16 @@
1<?php
2global $options;
3foreach ($options as $value) {
4 if (get_settings( $value['id'] ) === FALSE) { $$value['id'] = $value['std']; } else { $$value['id'] = get_settings( $value['id'] ); }
5}
6?>
7<div class="clear"></div>
8 </div>
9
10<div id="footer">
11<div id="footer"><?php print($ubuntu_us_tn_footer_phrase); ?></div>
12</div>
13
14</div>
15</body>
16</html>
017
=== added file 'wp-theme/ubuntu-us-tn/functions.php'
--- wp-theme/ubuntu-us-tn/functions.php 1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/functions.php 2009-09-09 17:59:24 +0000
@@ -0,0 +1,189 @@
1<?php
2if ( function_exists('register_sidebar') )
3 register_sidebar(array('name'=>'Sidebar'));
4
5if ( !is_admin() ) wp_deregister_script('jquery');
6?>
7<?php
8/* Function used to list pings separated from the comments */
9function list_pings($comment, $args, $depth) {
10 $GLOBALS['comment'] = $comment;
11?>
12 <li id="comment-<?php comment_ID(); ?>" class="ping"><?php comment_author_link(); ?>
13<?php } ?>
14<?php
15$themename = "Ubuntu-US-TN";
16$shortname = "ubuntu_us_tn";
17$options = array (
18array( "name" => "Theme Options",
19 "type" => "title"),
20
21array( "type" => "open"),
22
23array( "name" => "Announcement Text",
24 "desc" => "Choose some the text that will appear at the top of the page. Leave empty for noe.",
25 "id" => $shortname."_announcement_text",
26 "type" => "text",
27 "std" => "Announcement here!"),
28
29array( "name" => "Footer Phrase",
30 "desc" => "Choose the phrase that will appear at the bottom of the page. Use the <tt>br</tt> tag to force the line break.",
31 "id" => $shortname."_footer_phrase",
32 "type" => "text",
33 "std" => "Powered by Wordpress"),
34
35array( "type" => "close")
36
37);
38
39
40function mytheme_add_admin() {
41
42 global $themename, $shortname, $options;
43
44 if ( $_GET['page'] == basename(__FILE__) ) {
45
46 if ( 'save' == $_REQUEST['action'] ) {
47
48 foreach ($options as $value) {
49 update_option( $value['id'], $_REQUEST[ $value['id'] ] ); }
50
51 foreach ($options as $value) {
52 if( isset( $_REQUEST[ $value['id'] ] ) ) { update_option( $value['id'], $_REQUEST[ $value['id'] ] ); } else { delete_option( $value['id'] ); } }
53
54 header("Location: themes.php?page=functions.php&saved=true");
55 die;
56
57 } else if( 'reset' == $_REQUEST['action'] ) {
58
59 foreach ($options as $value) {
60 delete_option( $value['id'] ); }
61
62 header("Location: themes.php?page=functions.php&reset=true");
63 die;
64
65 }
66 }
67
68 add_theme_page($themename." Options", "".$themename." Options", 'edit_themes', basename(__FILE__), 'mytheme_admin');
69
70}
71
72function mytheme_admin() {
73
74 global $themename, $shortname, $options;
75
76 if ( $_REQUEST['saved'] ) echo '<div id="message" class="updated fade"><p><strong>'.$themename.' settings saved.</strong></p></div>';
77 if ( $_REQUEST['reset'] ) echo '<div id="message" class="updated fade"><p><strong>'.$themename.' settings reset.</strong></p></div>';
78
79?>
80<div class="wrap">
81<h2><?php echo $themename; ?> settings</h2>
82
83<form method="post">
84
85<?php foreach ($options as $value) {
86switch ( $value['type'] ) {
87
88case "open":
89?>
90<table width="100%" border="0" style="background-color:#eef5fb; padding:10px;">
91
92<?php break;
93
94case "close":
95?>
96
97</table><br />
98
99<?php break;
100
101case "title":
102?>
103<table width="100%" border="0" style="background-color:#dceefc; padding:5px 10px;"><tr>
104 <td colspan="2"><h3 style="font-family:Georgia,'Times New Roman',Times,serif;"><?php echo $value['name']; ?></h3></td>
105</tr>
106
107<?php break;
108
109case 'text':
110?>
111
112<tr>
113 <td width="20%" rowspan="2" valign="middle"><strong><?php echo $value['name']; ?></strong></td>
114 <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>
115</tr>
116
117<tr>
118 <td><small><?php echo $value['desc']; ?></small></td>
119</tr><tr><td colspan="2" style="margin-bottom:5px;border-bottom:1px dotted #000000;">&nbsp;</td></tr><tr><td colspan="2">&nbsp;</td></tr>
120
121<?php
122break;
123
124case 'textarea':
125?>
126
127<tr>
128 <td width="20%" rowspan="2" valign="middle"><strong><?php echo $value['name']; ?></strong></td>
129 <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>
130
131</tr>
132
133<tr>
134 <td><small><?php echo $value['desc']; ?></small></td>
135</tr><tr><td colspan="2" style="margin-bottom:5px;border-bottom:1px dotted #000000;">&nbsp;</td></tr><tr><td colspan="2">&nbsp;</td></tr>
136
137<?php
138break;
139
140case 'select':
141?>
142<tr>
143 <td width="20%" rowspan="2" valign="middle"><strong><?php echo $value['name']; ?></strong></td>
144 <?php $isOptionSelected = false; ?>
145 <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>
146</tr>
147
148<tr>
149 <td><small><?php echo $value['desc']; ?></small></td>
150</tr><tr><td colspan="2" style="margin-bottom:5px;border-bottom:1px dotted #000000;">&nbsp;</td></tr><tr><td colspan="2">&nbsp;</td></tr>
151
152<?php
153break;
154
155case "checkbox":
156?>
157 <tr>
158 <td width="20%" rowspan="2" valign="middle"><strong><?php echo $value['name']; ?></strong></td>
159 <td width="80%"><? if(get_settings($value['id'])){ $checked = "checked=\"checked\""; }else{ $checked = ""; } ?>
160 <input type="checkbox" name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>" value="true" <?php echo $checked; ?> />
161 </td>
162 </tr>
163
164 <tr>
165 <td><small><?php echo $value['desc']; ?></small></td>
166 </tr><tr><td colspan="2" style="margin-bottom:5px;border-bottom:1px dotted #000000;">&nbsp;</td></tr><tr><td colspan="2">&nbsp;</td></tr>
167
168<?php break;
169
170}
171}
172?>
173
174<p class="submit">
175<input name="save" type="submit" value="Save changes" />
176<input type="hidden" name="action" value="save" />
177</p>
178</form>
179<form method="post">
180<p class="submit">
181<input name="reset" type="submit" value="Reset" />
182<input type="hidden" name="action" value="reset" />
183</p>
184</form>
185
186<?php
187}
188
189add_action('admin_menu', 'mytheme_add_admin'); ?>
0190
=== added file 'wp-theme/ubuntu-us-tn/header.php'
--- wp-theme/ubuntu-us-tn/header.php 1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/header.php 2009-09-09 21:17:31 +0000
@@ -0,0 +1,34 @@
1<?php
2global $options;
3foreach ($options as $value) {
4 if (get_settings( $value['id'] ) === FALSE) { $$value['id'] = $value['std']; } else { $$value['id'] = get_settings( $value['id'] ); }
5}
6?>
7<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
8<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
9<head profile="http://gmpg.org/xfn/11">
10<link rel="icon" href="favicon.ico" type="image/x-icon">
11<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
12<title><?php bloginfo('name'); ?> <?php if ( is_single() ) { ?> &raquo; Blog Archive <?php } ?> <?php wp_title(); ?></title>
13<meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats -->
14<link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="all" />
15<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> RSS Feed" href="<?php bloginfo('rss2_url'); ?>" />
16<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
17
18 <?php wp_get_archives('type=monthly&format=link'); ?>
19 <?php //comments_popup_script(); // off by default ?>
20 <?php wp_head(); ?>
21</head>
22<body>
23<div id="wrapper">
24<div id="top">
25 <a href="<?php bloginfo('siteurl');?>/"><img alt="Ubuntu Tennessee" src="<?php bloginfo('stylesheet_directory'); ?>/images/tnbanner.png" /></a>
26</div>
27 <div id="menu">
28 <ul>
29 <?php if (is_page()) { $highlight = "page_item"; } else {$highlight = "page_item current_page_item"; } ?>
30 <?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='); ?>
31 </ul>
32 </div>
33<div class="content">
34<div id="announcement"><h3><?php print($ubuntu_us_tn_announcement_text); ?></h3></div>
035
=== added directory 'wp-theme/ubuntu-us-tn/images'
=== added file 'wp-theme/ubuntu-us-tn/images/blank.gif'
1Binary 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 differ36Binary 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
=== added file 'wp-theme/ubuntu-us-tn/images/tnbanner.png'
2Binary 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 differ37Binary 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
=== added file 'wp-theme/ubuntu-us-tn/index.php'
--- wp-theme/ubuntu-us-tn/index.php 1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/index.php 2009-09-08 13:09:12 +0000
@@ -0,0 +1,38 @@
1<?php get_header(); ?>
2<?php get_sidebar(); ?>
3<div id="content"><a name="content"></a>
4<?php if (have_posts()) : ?>
5
6<?php while (have_posts()) : the_post(); ?>
7<div class="post" id="post-<?php the_ID(); ?>">
8<div class="title">
9<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
10
11</div>
12<div class="cover">
13<div class="entry">
14 <?php the_content('Read the rest of this entry &raquo;'); ?>
15</div>
16</div>
17</div>
18 <?php endwhile; ?>
19
20 <div class="navigation">
21 <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
22 <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
23 </div>
24
25 <?php else : ?>
26
27 <div class="post">
28 <h1 class="title">Not Found</h1>
29 <p>YOU are looking for something that ISN'T HERE.</p>
30 </div>
31
32 <?php endif; ?>
33
34</div>
35
36<?php get_sidebar(); ?>
37
38<?php get_footer(); ?>
039
=== added file 'wp-theme/ubuntu-us-tn/page.php'
--- wp-theme/ubuntu-us-tn/page.php 1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/page.php 2009-09-08 13:09:12 +0000
@@ -0,0 +1,27 @@
1<?php get_header(); ?>
2
3<?php get_sidebar(); ?>
4
5<div id="content"><a name="content"></a>
6<?php if (have_posts()) : ?>
7
8<?php while (have_posts()) : the_post(); ?>
9<div class="post" id="post-<?php the_ID(); ?>">
10<div class="title">
11<!--<h1><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h1>-->
12
13</div>
14<div class="cover">
15<div class="entry">
16 <?php the_content('Read the rest of this entry &raquo;'); ?>
17
18</div>
19
20</div>
21<div class="postinfo"></div>
22</div>
23 <?php endwhile; endif; ?>
24
25</div>
26
27<?php get_footer(); ?>
0\ No newline at end of file28\ No newline at end of file
129
=== added file 'wp-theme/ubuntu-us-tn/screenshot.gif'
2Binary 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 differ30Binary 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
=== added file 'wp-theme/ubuntu-us-tn/search.php'
--- wp-theme/ubuntu-us-tn/search.php 1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/search.php 2009-09-08 13:09:12 +0000
@@ -0,0 +1,49 @@
1<?php get_header(); ?>
2
3<?php get_sidebar(); ?>
4
5<div id="content"><a name="content"></a>
6<?php if (have_posts()) : ?>
7 <h2 class="pagetitle">Search Results</h2>
8<?php while (have_posts()) : the_post(); ?>
9<div class="post" id="post-<?php the_ID(); ?>">
10<div class="date">
11<?php the_time('M'); ?><br /><span class="day"><?php the_time('d'); ?></span></div>
12<div class="title">
13<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
14
15<div class="sub"><span>Posted by <?php the_author(); ?> under <?php the_category(', '); ?></span></div>
16
17</div>
18<div class="cover">
19<div class="entry">
20 <?php the_content('Read the rest of this entry &raquo;'); ?>
21
22</div>
23
24</div>
25<div class="postinfo">
26 <div class="edit"><?php edit_post_link('Edit this entry', '&#124; ', ''); ?> </div>
27 <div class="com"><?php comments_popup_link('ADD COMMENTS', '1 COMMENT', '% COMMENTS'); ?></div>
28</div>
29
30
31
32</div>
33 <?php endwhile; ?>
34
35 <div class="navigation">
36 <div class="alignleft"><?php next_posts_link('&laquo; Previous Entries') ?></div>
37 <div class="alignright"><?php previous_posts_link('Next Entries &raquo;') ?></div>
38 </div>
39
40 <?php else : ?>
41
42 <h1 class="title">Not Found</h1>
43 <p>Sorry, no post matched your criteria. Try a different search?</p>
44
45 <?php endif; ?>
46
47</div>
48
49<?php get_footer(); ?>
0\ No newline at end of file50\ No newline at end of file
151
=== added file 'wp-theme/ubuntu-us-tn/sidebar.php'
--- wp-theme/ubuntu-us-tn/sidebar.php 1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/sidebar.php 2009-09-09 01:44:01 +0000
@@ -0,0 +1,16 @@
1<?php if ( is_dynamic_sidebar() ) : ?>
2<div class="boxes">
3<div class="lbox">
4 <h3>Quick Links</h3>
5 <ul>
6 <li>Launchpad</li>
7 <li>etc.</li>
8 <li>etc.</li>
9 </ul>
10</div>
11<div class="rbox">
12 <h3>Rbox</h3>
13 <p>Do something with me!</p>
14</div>
15</div>
16<?php endif; ?>
0\ No newline at end of file17\ No newline at end of file
118
=== added file 'wp-theme/ubuntu-us-tn/single.php'
--- wp-theme/ubuntu-us-tn/single.php 1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/single.php 2009-09-08 13:09:12 +0000
@@ -0,0 +1,35 @@
1<?php get_header(); ?>
2
3<?php get_sidebar(); ?>
4<div id="content"><a name="content"></a>
5<?php if (have_posts()) : ?>
6
7<?php while (have_posts()) : the_post(); ?>
8<div class="post" id="post-<?php the_ID(); ?>">
9<div class="title">
10<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
11
12</div>
13<div class="cover">
14<div class="entry">
15 <?php the_content('Read the rest of this entry &raquo;'); ?>
16</div>
17</div>
18<div class="postinfo">
19 <div class="alignleft"><?php previous_post_link('&laquo; %link') ?></div>
20 <div class="alignright"><?php next_post_link('%link &raquo;') ?></div>
21</div>
22
23
24</div>
25<?php comments_template(); ?>
26 <?php endwhile; else: ?>
27
28 <h1 class="title">Not Found</h1>
29 <p>I'm Sorry, YOU are looking for something that ISN'T HERE. </p>
30
31<?php endif; ?>
32
33</div>
34
35<?php get_footer(); ?>
0\ No newline at end of file36\ No newline at end of file
137
=== added file 'wp-theme/ubuntu-us-tn/style.css'
--- wp-theme/ubuntu-us-tn/style.css 1970-01-01 00:00:00 +0000
+++ wp-theme/ubuntu-us-tn/style.css 2009-09-09 01:44:01 +0000
@@ -0,0 +1,163 @@
1/*
2Theme Name: Ubuntu-US-TN
3Description: 2-column Ubuntu-esque theme
4Author: mac9416
5*/
6
7body {
8 margin: 0;
9 padding-top: 10px;
10 padding-bottom: 10px;
11 padding-left: 15px;
12 padding-right: 15px;
13 background-color: #DCD4B0;
14 font-family: serif;
15 font-size: 13px;
16 }
17img {
18 border: 0;
19 }
20blockquote {
21 padding-left: 10px;
22 color: #555;
23 font-style: normal;
24 }
25
26/* The Wrapper */
27
28#wrapper {
29 padding-left: 20px;
30 padding-right: 20px;
31 margin: 0 auto;
32 }
33
34/* The Top */
35
36#top {
37 height: 210px;
38 margin: auto;
39 background-color: #F1F1DD;
40 border-radius-topleft: 15px;
41 border-radius-topright: 15px;
42 -webkit-border-top-right-radius: 15px;
43 -webkit-border-top-left-radius: 15px;
44 -moz-border-radius-topleft: 15px;
45 -moz-border-radius-topright: 15px;
46 }
47#top img {
48 display: block;
49 padding-top: 5px;
50 margin-left: auto;
51 margin-right: auto;
52 border: none;
53 }
54
55#announcement {
56 display: block;
57 width: 100%;
58 background-color: #F5CD2E;
59 text-align: center;
60 margin: 0px;
61 padding: 0px;
62 font-weight: bold;
63}
64
65.content {
66 background-color: #F1F1DD;
67 padding-top: 25px;
68 padding-left: 20px;
69 padding-right: 20px;
70 min-height: 350px;
71 }
72
73/* The Menu */
74
75#menu {
76 display: block;
77 width: 100%;
78 margin: 0px;
79 }
80#menu ul {
81 margin: 0px;
82 list-style-type: none;
83 width: auto;
84 float: left;
85 }
86#menu ul li{
87 display: block;
88 float: left;
89 margin: 0 0 0 2px;
90 width: auto;
91 }
92#menu ul li a{
93 display: block;
94 float: left;
95 color: #D3000E;
96 text-align: center;
97 text-decoration: none;
98 padding: 5px 10px 0 10px;
99 width: auto;
100 font-family: sans-serif;
101 font-size: 14pt;
102 font-weight: bold;
103 }
104#menu ul li a:hover,#menu ul li.current_page_item a {
105 color: #FF6209;
106 text-align: center;
107 }
108
109#content {
110 margin: auto;
111 width: 60%;
112 }
113
114/* The Sidebar */
115.boxes h1, .boxes h2, .boxes h3{
116 margin: 0;
117 background-color: #808080;
118 -moz-border-radius: 5px;
119 padding: 3px;
120 }
121.lbox {
122 float: left;
123 width: 16%;
124 font-family: sans-serif;
125 }
126.rbox {
127 float: right;
128 width: 16%;
129 font-family: sans-serif;
130 }
131/* --- FOOTER --- */
132
133#footer {
134 color: white;
135 background-color: #2f2f2f;
136 font-size: 8pt;
137 font-weight: normal;
138 text-align: center;
139 border-radius-bottomleft: 15px;
140 border-radius-bottomright: 15px;
141 -webkit-border-bottom-right-radius: 15px;
142 -webkit-border-bottom-left-radius: 15px;
143 -moz-border-radius-bottomleft: 15px;
144 -moz-border-radius-bottomright: 15px;
145 }
146
147/* The Page Title */
148
149h2.pagetitle {
150 padding: 0;
151 margin: 0 0 20px 0;
152 font-size: 25px;
153 text-align: center;
154 }
155
156.alignright {
157 float: right;
158 width: auto;
159 }
160.alignleft {
161 float: left;
162 width: auto;
163}
0\ No newline at end of file164\ No newline at end of file

Subscribers

People subscribed via source and target branches