Changeset 247

Timestamp:

06/24/2011 11:49:41 AM (11 months ago)

Author:

sque

Message:

Add "community" concept on config and installation.
Improve home page, by adding a general welcome text (Closes #149).
Design and integrate favicon on frontend and installer.

Location:

trunk

Files:

• config-sample/config.php (modified) (1 diff)
• globals/functions.php (modified) (1 diff)
• globals/vars.php (modified) (1 diff)
• includes/main_footer.php (modified) (3 diffs)
• includes/pages/startup/startup.php (modified) (1 diff)
• install/index.php (modified) (2 diffs)
• install/steps/step_community.php (added)
• templates/basic/images/favicon.svg (added)
• templates/basic/images/favicon_256.png (added)
• templates/basic/images/favicon_32.png (added)
• templates/basic/images/favicon_64.png (added)
• templates/basic/includes/html.tpl (modified) (1 diff)
• templates/basic/includes/main_footer.tpl (modified) (1 diff)
• templates/basic/includes/main_header.tpl (modified) (1 diff)
• templates/basic/includes/pages/startup/startup.tpl (modified) (1 diff)

trunk/config-sample/config.php

@@ -15 +15 @@
                 'url' => 'http://server.example.org/'
                 ),
-        
+        'community' => array(
+                'name' => 'Anonymous Wireless Community',
+                'short_name' => 'AWC'
+        ),
         'cookies' => array(
                 'expire' => (60 * 60 * 24 * 30)

trunk/globals/functions.php

@@ -460 +460 @@
 }
 
-?>
+function format_version($version_array) {
+        $str = '';
+        foreach ($version_array as $dig) {
+                $glue =  is_numeric($dig)? '.' : '-';
+                $str .= empty($str)?$dig:$glue . $dig;
+        }
+        return $str;    
+}

trunk/globals/vars.php

@@ -23 +23 @@
         
         'info' => array(
-                'version' => 0,
+                'version' => array(1, 0, 'rc1'),
                 'min_template_version' => 0
                 )
-
 );
-
-?>

trunk/includes/main_footer.php

@@ -24 +24 @@
         var $hide=FALSE;
 
-        function footer() {
-        
-        }
-        
         function output() {
                 global $db, $php_start, $main, $vars;
@@ -33 +29 @@
                 $this->tpl['php_time'] = getmicrotime() - $php_start;
                 $this->tpl['mysql_time'] = $db->total_time;
+                $this->tpl['wind_version'] = format_version($vars['info']['version']);
                 if (isset($main->userdata->privileges['admin']) && $main->userdata->privileges['admin'] === TRUE && $vars['debug']['enabled'] == TRUE) {
                         $this->tpl['debug_mysql'] = ROOT_PATH."debug/mysql.php?".get_qs();
@@ -40 +37 @@
         
 }
-
-?>

trunk/includes/pages/startup/startup.php

@@ -29 +29 @@
         
         function output() {
-                if (file_exists(ROOT_PATH."config/startup.html")) $this->tpl['startup_html'] = file_get_contents(ROOT_PATH."config/startup.html");
+                global $vars;
+                if (file_exists(ROOT_PATH."config/startup.html"))
+                        $this->tpl['startup_html'] = file_get_contents(ROOT_PATH."config/startup.html");
+                $this->tpl['wind_version'] = format_version($vars['info']['version']);
+                $this->tpl['community_name'] = $vars['community']['name'];
+                $this->tpl['community_short_name'] = $vars['community']['short_name'];
                 return template($this->tpl, __FILE__);
         }
 
 }
-
-?>

trunk/install/index.php

@@ -33 +33 @@
         'deps' => 'Dependencies',
         'file_perms' => 'File permissions',
+        'community' => 'Community Information',
         'smarty' => 'Smarty configuration',
         'dbsetup' => 'Setup database',
@@ -58 +59 @@
         <title>WiND - Installation</title>
         <link rel="stylesheet" href="<?php echo surl('/../templates/basic/css/styles_packed.css')?>" >
-        <link rel="stylesheet" href="install.css">      
+        <link rel="icon" type="image/png" href="<?php echo surl('/../templates/basic/images/favicon_32.png')?>" / >
+        <link rel="stylesheet" href="install.css">
+                
         <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script>  
+        
 </head>
 <body>

trunk/templates/basic/includes/html.tpl

@@ -25 +25 @@
 {$head}
 <link href="{$css_dir}styles_packed.css" rel="stylesheet" type="text/css" />
+<link rel="icon" type="image/png" href="templates/basic/images/favicon_32.png" / >
 <script type="text/javascript" src="{$js_dir}overlib/overlib_packed.js"><!-- overLIB (c) Erik Bosrup --></script>
 </head>

trunk/templates/basic/includes/main_footer.tpl

@@ -30 +30 @@
         </td>
         <td class="footer" align="right" width="33%">
-                        Powered by:<br /><a href="http://wind.cube.gr/"><b>WiND - Wireless Nodes Database project</b></a><br /><br />
-                &copy; 2005-2011 <a href="http://wind.cube.gr/wiki/Team">WiND development team</a>
+                        Powered by: <a target="_blank" href="http://wind.cube.gr/"><b>WiND  v{$wind_version}</b></a><br /><br />
+                &copy; 2005-2011 <a target="_blank" href="http://wind.cube.gr/wiki/Team">WiND development team</a>
         </td>
       </tr>

trunk/templates/basic/includes/main_header.tpl

@@ -22 +22 @@
       <tr>
         <td class="table-header-td-left"><img src="{$img_dir}main_logo.png" alt="WiND Logo" /></td>
-{if $mylogo}        <td class="table-header-td-right"><img src="{$mylogo_dir}mylogo.png" alt="{$lang.site_title}" /></td>{/if}
+{if $mylogo}<td class="table-header-td-right"><img src="{$mylogo_dir}mylogo.png" alt="{$lang.site_title}" /></td>{/if}
       </tr>
 </table>

trunk/templates/basic/includes/pages/startup/startup.tpl

@@ -23 +23 @@
 {$startup_html}
 {else}
-<center>
+<div style="padding: 30px; font-size: 12px;">
+<h1>{$community_name}</h1>
+<p>Welcome at {$community_name}. Here you can find information about <a href="?page=nodes">registered nodes</a>
+of {$community_short_name} and <a href="?page=services">services</a> running on the network.
+If you want want to participate you can always try to <a href="?page=users&user=add">register</a>. For registered
+users, there is support for private messages.
+</p>
+
+<h3>Registration</h3>
+
 <p>
-<font size="5"><strong>WiND - Wireless Nodes Database</strong></font>
+To create a new account, visit <a href="?page=users&user=add">registration page</a>. To complete the registration you have
+to confirm your email. If, for any reason you didn't get any email, you can request to
+<a href="?page=users&action=restore">resend the email</a>. 
+</p>
+
+<h3>Add Your Node</h3>
+<p>
+To create a new node you must be a registered user. After you have logged on on the system you
+can request to <a href="?page=mynodes&action=add">add a node</a>.
+</p>
+
+<h3>Declare links</h3>
+<p>
+For each node you can declare its links with other <strong>existing</strong> nodes.
+<ul>
+<li>If you are a <strong>client</strong> node, declare only one 
+        link with the access point that you have been connected at.</li>
+<li>If you have created a <strong>backbone link</strong>, declare it with as many information as possible.
+        For complete link, the other node must add also link information.</li>
+<li>If you own an access point, declare it so that clients can declare their links at you.</li>
+</ul>  
+</p>
+
+<h3>Managing your Nodes</h3>
+<p>
+For any node you can update its information by visiting its page. Through your node page you can also interract
+with the Hostmaster team, to request IP Ranges, DNS zones and nameservers.
+</p>
 <br />
-<br />
-<strong>Warning</strong>: this is an SVN snapshot.<br />
-As such, it's still under heavy development and you
-should expect it to break and/or lose data.<br />
-</p>
-</center>
+<hr/>
+<em>Try to update your nodes, with as much as possible <strong>valid</strong> information.
+If you see invalid data on foreign nodes don't hesitate to contact them and request to update/change their public information.</em>
+
+</div>
 {/if}