[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25177 - gnunet-www/GNUnet
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r25177 - gnunet-www/GNUnet |
|
Date: |
Sun, 2 Dec 2012 15:57:05 +0100 |
Author: grothoff
Date: 2012-12-02 15:57:05 +0100 (Sun, 02 Dec 2012)
New Revision: 25177
Modified:
gnunet-www/GNUnet/GNUnet.info
gnunet-www/GNUnet/comment.tpl.php
gnunet-www/GNUnet/node.tpl.php
gnunet-www/GNUnet/page.tpl.php
gnunet-www/GNUnet/template.php
Log:
-attempt to convert to D7
Modified: gnunet-www/GNUnet/GNUnet.info
===================================================================
--- gnunet-www/GNUnet/GNUnet.info 2012-12-02 12:02:38 UTC (rev 25176)
+++ gnunet-www/GNUnet/GNUnet.info 2012-12-02 14:57:05 UTC (rev 25177)
@@ -1,13 +1,13 @@
name = GNUnet
-description = designed by Boxiao Li for Gnunet.org
-engine = phptemplate
+description = GNUnet.org theme designed by Boxiao Li
stylesheets[all][] = style.css
stylesheets[screen][] = ie6.css
stylesheets[print][] = print.css
+features[] = main_menu
+features[] = secondary_menu
-
-version = "0.2"
-core = "6.x"
+version = "0.3"
+core = "7.x"
project = "GNUnet"
datestamp = "1230561927"
Modified: gnunet-www/GNUnet/comment.tpl.php
===================================================================
--- gnunet-www/GNUnet/comment.tpl.php 2012-12-02 12:02:38 UTC (rev 25176)
+++ gnunet-www/GNUnet/comment.tpl.php 2012-12-02 14:57:05 UTC (rev 25177)
@@ -12,7 +12,7 @@
*/
?>
-<div class="comment<?php print($comment->new) ? ' comment-new' : ''; print '
'. $status ?> clear-block">
+<div class="comment<?php print($comment->new) ? ' comment-new' : ''; print '
'. $status ?> clearfix">
<?php print $picture ?>
<h3><?php print $title ?></h3>
<?php if ($comment->new) { ?>
@@ -21,12 +21,12 @@
<div class="content">
<?php print $content ?>
<?php if ($signature) { ?>
- <div class="signature clear-block">
+ <div class="signature clearfix">
<?php print $signature ?>
</div>
<?php } ?>
</div>
- <div class="meta clear-block">
+ <div class="meta clearfix">
<div class="meta-links"><?php print $links ?></div>
<div class="submitted">
<?php //print $submitted ?>
Modified: gnunet-www/GNUnet/node.tpl.php
===================================================================
--- gnunet-www/GNUnet/node.tpl.php 2012-12-02 12:02:38 UTC (rev 25176)
+++ gnunet-www/GNUnet/node.tpl.php 2012-12-02 14:57:05 UTC (rev 25177)
@@ -14,7 +14,7 @@
?>
-<div id="node-<?php print $node->nid ?>" class="node<?php if ($sticky) print '
sticky'; if (!$status) print ' node-unpublished'; ?> clear-block">
+<div id="node-<?php print $node->nid ?>" class="node<?php if ($sticky) print '
sticky'; if (!$status) print ' node-unpublished'; ?> clearfix">
<?php if ($page == 0) { ?>
<h2 class="title"><a href="<?php print $node_url ?>"><?php print $title
?></a></h2>
<?php } ?>
@@ -22,7 +22,7 @@
<?php print $picture ?>
<?php } ?>
<div class="content"><?php print $content ?></div>
- <div class="meta clear-block">
+ <div class="meta clearfix">
<?php if ($links) { ?>
<div class="meta-links"><?php print $links ?></div>
<?php } ?>
Modified: gnunet-www/GNUnet/page.tpl.php
===================================================================
--- gnunet-www/GNUnet/page.tpl.php 2012-12-02 12:02:38 UTC (rev 25176)
+++ gnunet-www/GNUnet/page.tpl.php 2012-12-02 14:57:05 UTC (rev 25177)
@@ -28,12 +28,13 @@
<?php flush(); ?>
<body>
+<?php print render ($page['page_top']); ?>
+
<div id="wrapper">
-<div id="banner" class="clear-block">
- <?php print $search_box ?>
+<div id="banner" class="clearfix">
<?php if ($logo) { ?>
- <a href="<?php print $front_page ?>" title="<?php print t('Home') ?>">
+ <a href="<?php print $front_page; ?>" title="<?php print t('Home') ?>">
<img src="<?php print $logo ?>" alt="<?php print t('Home') ?>"
class="logo" />
</a>
<?php } ?>
@@ -46,35 +47,27 @@
</div>
<div id="menu">
- <?php if (isset($primary_links)) { ?>
- <?php print theme('links', noprob_primary_links(), array('class' =>
'links', 'id' => 'primary-links')) ?>
- <?php } ?>
- <?php if (count(noprob_navigation_links('menu-tertiary-links'))) { ?>
- <?php print theme('links', noprob_navigation_links('menu-tertiary-links'),
array('class' => 'links', 'id' => 'tertiary-links')) ?>
- <?php } ?>
+ <?php if (isset($secondary_menu)) { print theme('links', $secondary_menu,
array('class' => 'links', 'id' => 'subnavlist')); } ?>
+ <?php if (isset($main_menu)){ print theme('links', $main_menu, array('class'
=> 'links', 'id' => 'navlist')) ?>
</div>
-<?php if ($header) { ?>
- <div id="header"><?php print $header ?></div>
-<?php } ?>
+<?php print render ($page['header']) ?>
<table id="middle" border="0" cellpadding="0" cellspacing="0">
<tr>
- <?php if ($left) { ?>
- <td id="sidebar-left" class="sidebar"><?php print $left ?></td>
+ <?php if ($sidebar_first) { ?>
+ <td id="sidebar-first" class="column sidebar"><?php print render
($page['sidebar_first']); ?></td>
<?php } ?>
<td id="main" class="content-<?php print $layout ?>">
- <?php print $breadcrumb ?>
+ <?php print render ($page['breadcrumb']); ?>
<?php if ($title) { ?>
<h2 class="title"><?php print $title ?></h2>
<?php } ?>
<?php if ($tabs) { ?>
<div class="tabs"><?php print $tabs ?></div>
<?php } ?>
- <?php if ($mission) { ?>
- <div id="mission"><?php print $mission ?></div>
- <?php } ?>
+ <?php print render($page['highlighted']); ?>
@@ -82,19 +75,19 @@
<!-- START main content -->
<?php if ($show_messages && $messages) print $messages; ?>
- <?php print $help ?>
- <?php print $content ?>
+ <?php print render ($page['help']); ?>
+ <?php print render ($page['content']); ?>
<!-- END main content -->
- <?php print $feed_icons ?>
+ <?php print render ($page['feed_icons']); ?>
</td>
- <?php if ($right) { ?>
- <td id="sidebar-right" class="sidebar"><?php print $right ?></td>
+ <?php if ($didebar_second) { ?>
+ <td id="sidebar-second" class="column sidebar"><?php print render
($page['sidebar_second']); ?></td>
<?php } ?>
</tr>
</table>
@@ -106,6 +99,6 @@
</div>
</div>
-<?php print $closure ?>
+<?php print render ($page['page_bottom']); ?>
</body>
</html>
Modified: gnunet-www/GNUnet/template.php
===================================================================
--- gnunet-www/GNUnet/template.php 2012-12-02 12:02:38 UTC (rev 25176)
+++ gnunet-www/GNUnet/template.php 2012-12-02 14:57:05 UTC (rev 25177)
@@ -24,7 +24,7 @@
* @return
* An array of links of the specified menu and level.
*/
-function noprob_navigation_links($menu_name, $level = 0) {
+function gnunet_navigation_links($menu_name, $level = 0) {
// Don't even bother querying the menu table if no menu is specified.
if (empty($menu_name)) {
return array();
@@ -47,7 +47,7 @@
}
}
- return noprob_navigation_links_level($tree_page, $tree_all);
+ return gnunet_navigation_links_level($tree_page, $tree_all);
}
@@ -55,7 +55,7 @@
* Helper function for noprob_navigation_links to recursively create an array
of links.
* (Both trees are required in order to include every menu item and active
trail info.)
*/
-function noprob_navigation_links_level($tree_page, $tree_all) {
+function gnunet_navigation_links_level($tree_page, $tree_all) {
$links = array();
foreach ($tree_all as $key => $item) {
$item_page = $tree_page[$key];
@@ -69,7 +69,7 @@
$class = ' active-trail';
}
if ($item_all['below']) {
- $l['children'] = noprob_navigation_links_level($item_page['below'],
$item_all['below']);
+ $l['children'] = gnunet_navigation_links_level($item_page['below'],
$item_all['below']);
}
// Keyed with the unique mlid to generate classes in theme_links().
$links['menu-'. $item_all['link']['mlid'] . $class] = $l;
@@ -80,10 +80,10 @@
/**
- * Helper function to retrieve the primary links using
noprob_navigation_links().
+ * Helper function to retrieve the primary links using
gnunet_navigation_links().
*/
-function noprob_primary_links() {
- return noprob_navigation_links(variable_get('menu_primary_links_source',
'primary-links'));
+function gnunet_primary_links() {
+ return gnunet_navigation_links(variable_get('menu_primary_links_source',
'primary-links'));
}
@@ -97,7 +97,7 @@
* @return
* A string containing an unordered list of links.
*/
-function noprob_links($links, $attributes = array('class' => 'links')) {
+function gnunet_links($links, $attributes = array('class' => 'links')) {
$output = '';
if (count($links) > 0) {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25177 - gnunet-www/GNUnet,
gnunet <=