Changeset 1085
- Timestamp:
- 02/02/10 11:32:18 (3 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
-
. (modified) (1 prop)
-
content/admin_themes/admin_default/sidebar.php (modified) (1 diff)
-
content/plugins/categories/categories.php (modified) (3 diffs)
-
content/plugins/comments/comments.php (modified) (1 diff)
-
content/plugins/comments_widget/comments_widget.php (modified) (1 diff)
-
content/plugins/media_select/media_select.php (modified) (1 diff)
-
content/plugins/tags/css/tags.css (modified) (1 diff)
-
content/plugins/tags/tags.php (modified) (2 diffs)
-
content/plugins/vote/vote.php (modified) (1 diff)
-
content/themes/default-blues/header.php (modified) (3 diffs)
-
content/themes/shibuya/css/style.css (modified) (3 diffs)
-
content/themes/shibuya/footer.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/1.0 merged: 1082-1084
- Property svn:mergeinfo changed
-
trunk/content/admin_themes/admin_default/sidebar.php
r1081 r1085 32 32 33 33 <ul id="sidebar" class='accordion <?php echo $h->vars['admin_sidebar_layout']; ?>'> 34 <li><a class="home" href="<?php echo $h->url(array(), 'admin'); ?>"><?php echo $h->lang["admin_theme_main_admin_home"]; ?></a></li>34 <li><a class="home" href="<?php echo $h->url(array(), 'admin'); ?>"><?php echo $h->lang["admin_theme_main_admin_home"]; ?></a></li> 35 35 <?php if ($h->currentUser->loggedIn == true) { ?> 36 36 <li><a href="<?php echo BASEURL; ?>admin_index.php?page=admin_account"><?php echo $h->lang["admin_theme_account"]; ?></a></li> -
trunk/content/plugins/categories/categories.php
r1081 r1085 246 246 247 247 echo " " . $h->lang["sb_base_post_in"] . " "; 248 echo "<a href='" . $h->url(array('category'=>$h->post->category)) . "'>" . $cat_name . "</a> </li>\n";248 echo "<a href='" . $h->url(array('category'=>$h->post->category)) . "'>" . $cat_name . "</a>\n"; 249 249 } 250 250 } … … 331 331 } 332 332 } 333 $output .= " </li></ul>";333 $output .= ""; 334 334 return $output; 335 335 } 336 336 $output .= "</li></ul>"; 337 337 return $output; 338 338 } … … 355 355 356 356 $category = stripslashes(html_entity_decode(urldecode($category->category_name), ENT_QUOTES,'UTF-8')); 357 $output .= '<li><a href="' . $h->url(array('category'=>$link)) .'">' . $category . "</a>\n"; 357 $output .= '<li><a href="' . $h->url(array('category'=>$link)) .'">' . $category . "</a>\n"; 358 358 359 359 return $output; -
trunk/content/plugins/comments/comments.php
r1081 r1085 417 417 if (!$h->currentUser->loggedIn) { 418 418 echo "<div class='comment_form_off'>"; 419 echo "<a href='" . BASEURL . "index.php?page=login& return=" . $return . "'>";419 echo "<a href='" . BASEURL . "index.php?page=login&return=" . $return . "'>"; 420 420 echo $h->lang['comments_please_login'] . "</a></div>"; 421 421 return false; -
trunk/content/plugins/comments_widget/comments_widget.php
r1081 r1085 83 83 $output .= $title; 84 84 $output .= "<a href='" . $h->url(array('page'=>'rss_comments')) . "' title='" . $anchor_title . "'>\n"; 85 $output .= "<img src='" . BASEURL . "content/themes/" . THEME . "images/rss_16.png' >\n</a>"; // RSS icon85 $output .= "<img src='" . BASEURL . "content/themes/" . THEME . "images/rss_16.png' alt='rss' />\n</a>"; // RSS icon 86 86 $output .= "</h2>\n"; 87 87 -
trunk/content/plugins/media_select/media_select.php
r1081 r1085 200 200 echo "<li><a href='#'>" . $h->lang['media_select'] . "</a>\n"; 201 201 echo "<ul class='children'>\n"; 202 echo "<li><a href='" . $h->url(array('media'=>'text')) . "'>" . $h->lang['media_select_text'] . "</a> \n";203 echo "<li><a href='" . $h->url(array('media'=>'video')) . "'>" . $h->lang['media_select_videos'] . "</a> \n";204 echo "<li><a href='" . $h->url(array('media'=>'image')) . "'>" . $h->lang['media_select_images'] . "</a> \n";202 echo "<li><a href='" . $h->url(array('media'=>'text')) . "'>" . $h->lang['media_select_text'] . "</a></li>\n"; 203 echo "<li><a href='" . $h->url(array('media'=>'video')) . "'>" . $h->lang['media_select_videos'] . "</a></li>\n"; 204 echo "<li><a href='" . $h->url(array('media'=>'image')) . "'>" . $h->lang['media_select_images'] . "</a></li>\n"; 205 205 echo "</ul></li>"; 206 206 } -
trunk/content/plugins/tags/css/tags.css
r1081 r1085 4 4 5 5 .tags_link { padding-left: 1.5em; background-image: url(content/themes/default/images/tags.png); } 6 .show_tags ul li {float:left; margin-right:0.6em;} 7 .clear {clear:both; height:0.1em;} -
trunk/content/plugins/tags/tags.php
r1081 r1085 145 145 if (!$raw) { 146 146 echo "<div class='show_tags' style='display: none;'>\n"; 147 echo "<ul> " . $h->lang["tags_list"] . " \n";147 echo "<ul><li>" . $h->lang["tags_list"] . "</li>"; 148 148 } 149 149 150 150 foreach ($tags as $tag) { 151 echo "< a href='" . $h->url(array('tag' => str_replace(' ', '_', trim($tag)))) . "'>" . trim($tag) . "</a> \n";151 echo "<li><a href='" . $h->url(array('tag' => str_replace(' ', '_', trim($tag)))) . "'>" . trim($tag) . "</a></li>"; 152 152 } 153 153 … … 155 155 echo "</ul>\n"; 156 156 echo "</div>\n"; 157 echo "<div class='clear'> </div>\n"; 157 158 } 158 159 } -
trunk/content/plugins/vote/vote.php
r1081 r1085 231 231 $return = $h->cage->get->testUri('return'); // use existing return parameter 232 232 } 233 $h->vars['vote_login_url'] = BASEURL . "index.php?page=login& return=" . $return;233 $h->vars['vote_login_url'] = BASEURL . "index.php?page=login&return=" . $return; 234 234 $h->displayTemplate('vote_button', 'vote', NULL, false); 235 235 } -
trunk/content/themes/default-blues/header.php
r1081 r1085 82 82 <!-- NAVIGATION --> 83 83 <ul> 84 <?php if ($h->pageName == 'index') { $status = " id='navigation_active'"; } else { $status = ""; } ?>84 <?php if ($h->pageName == 'index') { $status = "class='navigation_active'"; } else { $status = ""; } ?> 85 85 <li <?php echo $status; ?>><a <?php echo $status; ?> href="<?php echo BASEURL; ?>"><?php echo $h->lang["main_theme_navigation_home"]; ?></a></li> 86 86 … … 89 89 <?php 90 90 if ($h->currentUser->loggedIn) { ?> 91 <?php if (($h->pageType == 'user') && ($h->vars['user']->id == $h->currentUser->id)) { $status = " id='navigation_active'"; } else { $status = ""; } ?>91 <?php if (($h->pageType == 'user') && ($h->vars['user']->id == $h->currentUser->id)) { $status = "class='navigation_active'"; } else { $status = ""; } ?> 92 92 <li <?php echo $status; ?>><a <?php echo $status; ?> href='<?php echo $h->url(array('user' => $h->currentUser->name)); ?>' title='<?php echo $h->lang["users_profile"]; ?>'> 93 93 <?php echo "My Settings"; ?> … … 99 99 100 100 if ($h->currentUser->loggedIn == true) { 101 if ($h->pageName == 'admin') { $status = " id='navigation_active'"; } else { $status = ""; }101 if ($h->pageName == 'admin') { $status = "class='navigation_active'"; } else { $status = ""; } 102 102 echo "<li " . $status . "><a " . $status . " href='" . $h->url(array(), 'admin') . "'>" . $h->lang["main_theme_navigation_admin"] . "</a></li>"; 103 103 104 if ($h->pageName == 'logout') { $status = " id='navigation_active'"; } else { $status = ""; }104 if ($h->pageName == 'logout') { $status = "class='navigation_active'"; } else { $status = ""; } 105 105 echo "<li " . $status . "><a " . $status . " href='" . $h->url(array('page'=>'admin_logout'), 'admin') . "'>" . $h->lang["main_theme_navigation_logout"] . "</a></li>"; 106 106 } else { 107 if ($h->pageName == 'login') { $status = " id='navigation_active'"; } else { $status = ""; }107 if ($h->pageName == 'login') { $status = "class='navigation_active'"; } else { $status = ""; } 108 108 echo "<li " . $status . "><a " . $status . " href='" . $h->url(array(), 'admin') . "'>" . $h->lang["main_theme_navigation_login"] . "</a></li>"; 109 109 } -
trunk/content/themes/shibuya/css/style.css
r1081 r1085 6 6 html, body { min-height:101%; /*Firefox scrollbar fix*/ background:#FFFFFF none repeat scroll 0 0; color:#000000;} 7 7 8 body { 9 /* background: transparent url(/content/themes/default/images/bg-gradient.png) repeat-x;*/ 8 body { 10 9 color: #666; 11 10 font-family: Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif; … … 155 154 background-color: #ffcc00; 156 155 border: 0.1em solid #fff; 157 margin: 1.5em 0 0. 5em 0;156 margin: 1.5em 0 0.8em 0; 158 157 padding-left: 0.5em; 159 158 text-align: left; … … 165 164 166 165 .debug { font-size: 0.8em; } 166 167 #ft .hotaru_logo {float:left;} 168 #ft .W3C {float:right; margin-right: 1em; } -
trunk/content/themes/shibuya/footer.php
r1081 r1085 30 30 31 31 <div id="ft"> 32 < ?php33 $h->pluginHook('footer');32 <div class="hotaru_logo"> 33 <?php 34 34 35 35 // Link to forums... … … 38 38 39 39 $h->showQueriesAndTime(); 40 40 41 ?> 42 </div> 43 <div class="W3C"> 44 <p> 45 <a href="http://validator.w3.org/check?uri=referer"><img 46 src="http://www.w3.org/Icons/valid-xhtml10" 47 alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a> 48 </p> 49 </div> 50 41 51 </div> <!-- close "ft" --> 52 53 <?php $h->pluginHook('footer'); ?> 54 42 55 </div> <!-- close "yui-t7 first" --> 43 56
Note: See TracChangeset
for help on using the changeset viewer.