Changeset 1070

Timestamp:

11/09/2007 09:10:15 PM (13 months ago)

Author:

Shadowhand

Message:

Changes to website branch:

• Switched download to use GET. This is technically more correct, and offers easier remote download capabilities.
  
• Updated form styles to make the page easier to read.
  
• Changed feed locations to the new URLs
  

Location:

branches/website/application

Files:

• controllers/download.php (modified) (3 diffs)
• libraries/MY_Controller.php (modified) (2 diffs)
• views/media/css/layout.css (modified) (1 diff)
• views/pages/download.php (modified) (4 diffs)
• views/pages/tutorials/index.php (modified) (1 diff)

branches/website/application/controllers/download.php

@@ -185 +185 @@
                 );
 
-                if (empty($_POST))
-                {
-                        // Fake POST data, for validation
-                        $_POST = array
+                if (empty($_GET))
+                {
+                        // Fake validation data, so that we can pre-fill the form
+                        $validate = array
                         (
                                 'group' => 'standard',
@@ -197 +197 @@
                                 )
                         );
-
-                        // Do not validate fake POST data
-                        $validate = FALSE;
                 }
                 else
                 {
-                        $validate = TRUE;
+                        // Validate GET data
+                        $validate = $_GET;
                 }
 
                 // Load validation
-                $this->load->library('validation');
+                $this->load->library('validation', $validate);
 
                 // Set rules
@@ -217 +215 @@
                 ));
 
-                if ($validate AND $this->validation->run())
+                if ( ! empty($_GET) AND $this->validation->run())
                 {
                         // Get current directory for return

branches/website/application/libraries/MY_Controller.php

@@ -49 +49 @@
                                 'tutorials'  => 'Tutorials',
                                 // External links
-                                'http://kohanaphp.com/forums/'     => 'Forums',
-                                'http://kohanaphp.com/user_guide/' => 'User Guide'
+                                'http://forums.kohanaphp.com/' => 'Forums',
+                                'http://api.kohanaphp.com/'    => 'API Manual'
                         );
 
@@ -101 +101 @@
                                 }
 
-                                // Add the feed to the template
-                                $feeds[$name] = feed::parse($filename, 3);
+                                // Add the feed to the sidebar
+                                // $this->template->sidebar->feeds[$name] = feed::parse($filename, 3);
                         }
-
-                        $this->template->sidebar->feeds = $feeds;
 
                         // Auto-rendering

branches/website/application/views/media/css/layout.css

@@ -49 +49 @@
         #body ul, #body ol { padding-left: 1.5em; margin-bottom: 1em; list-style: square; line-height: 180%; }
         #body ol { list-style: decimal; }
-        #body form ul { padding-left: 0; list-style: none; }
+        #body form fieldset { padding: 0.5em 0; }
+        #body form .legend { display: block; padding: 0.5em; background: #ddefbd; }
+        #body form ul { display: block; padding: 0.5em 1em 0; list-style: none; }
         #body .intro { margin: 1em; margin-left: -4em; padding: 1em 2em; padding-left: 4em; background: #eaeee5; font-size: 1.6em; line-height: 1.4em; color: #8C9393; }
                 #body .intro strong { text-transform: uppercase; font-weight: bold; font-size: 0.76em; color: #7b7d78; letter-spacing: -0.02em; white-space: nowrap; }

branches/website/application/views/pages/download.php

@@ -4 +4 @@
 
 
-<?php echo form::open('download') ?> 
-<p>Choose your download type:</p>
+<?php echo form::open('download', array('method' => 'get')) ?> 
 
+<fieldset><span class="legend">Choose your download type:</span>
 <ul>
-<li><label><?php echo form::radio('group', 'minimal', ($this->validation->group == 'minimal')) ?> <strong>Tiny Flower (Minimal)</strong></label> &ndash; Included libraries: Session, Validation. Included helpers: array, cookie, form, html, security, url, and validation.</li>
-<li><label><?php echo form::radio('group', 'standard', ($this->validation->group == 'standard')) ?> <strong>Naked Babe (Standard)</strong></label> &ndash; Additional libraries: Archive, Database, Encryption, Pagination, and Profiler. Additional helpers: date, download, feed, inflector, and text.</li>
+<li><label><?php echo form::radio('group', 'minimal', ($this->validation->group == 'minimal')) ?> <strong>Minimal</strong></label> &ndash; Included libraries: Session, Validation. Included helpers: array, cookie, form, html, security, url, and validation.</li>
+<li><label><?php echo form::radio('group', 'standard', ($this->validation->group == 'standard')) ?> <strong>Standard</strong></label> &ndash; Additional libraries: Archive, Database, Encryption, Pagination, and Profiler. Additional helpers: date, download, feed, inflector, and text.</li>
 </ul>
+</fieldset>
 
-<p>Include the following vendor tools in my download:</p>
-
+<fieldset><span class="legend">Include the following vendor tools in my download:</span>
 <ul>
 <?php
@@ -29 +29 @@
 ?>
 </ul>
+</fieldset>
 
-<p>Include the following languages in my download:</p>
-<?php echo $this->validation->languages_error ?> 
+<fieldset><span class="legend">Include the following languages in my download:</span>
 <ul>
 <?php
@@ -45 +45 @@
 ?>
 </ul>
+</fieldset>
 
-<p>Choose your download format:</p>
+<fieldset><span class="legend">Choose your download format:</span>
 <?php echo $this->validation->format_error ?> 
 <ul>
@@ -61 +62 @@
 ?>
 </ul>
+</fieldset>
 
-<?php echo form::button(array('type' => 'submit', 'name' => 'download'), 'Download Kohana!') ?> 
+<?php echo form::button(array('type' => 'submit'), 'Download Kohana!') ?> 
 <?php echo form::close() ?> 

branches/website/application/views/pages/tutorials/index.php

@@ -6 +6 @@
 
 <ul>
+<li><?php echo html::anchor('tutorials/xss', 'XSS Attack Filtering') ?></li>
 <li><?php echo html::anchor('tutorials/page', 'Creating a Page Controller') ?></li>
-<li><?php echo html::anchor('tutorials/xss', 'XSS Filtering') ?></li>
 </ul>