Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added google maps build location page

Added phpass encryption
  • Loading branch information...
commit be98137fba4af7e826a79f1cfabce9205ac46e70 1 parent 89eedca
@michaelc42 authored
View
1  application/config/routes.php
@@ -55,6 +55,7 @@
$route['using_product'] = 'main_controller/using_product';
$route['frequently_asked_questions'] = 'main_controller/frequently_asked_questions';
$route['architectural_details'] = 'main_controller/architectural_details';
+$route['build_locations'] = 'main_controller/build_locations';
//$route['user'] = 'user';
//$route['user/login'] = 'user/login';
View
43 application/controllers/main_controller.php
@@ -147,7 +147,7 @@ function galleries( $off = 0 )
$data['galleries'] = $limited_galleries;
//$data['galleries'] = $ret;
- $this->load->view('includes/template', $data);
+ $this->load->view('includes/gallery-template', $data);
}
}
@@ -217,7 +217,7 @@ function gallery( $gallery, $off = NULL )
$data['main_content'] = 'gallery_view';
$data['css'] = 'gallery.css';
$data['title'] = 'Gallery';
- $this->load->view('includes/template', $data);
+ $this->load->view('includes/gallery-template', $data);
}
function photo($id = NULL)
@@ -246,6 +246,7 @@ function photo($id = NULL)
$data['picTitle'] = $pic->title;
$data['picDesc'] = $pic->description;
$data['picID'] = $pic->id;
+ $data['picGallery'] = $pic->gallery_id;
}
else
@@ -258,7 +259,7 @@ function photo($id = NULL)
$data['errors'] = 'No ID given.';
}
- $this->load->view('includes/template', $data);
+ $this->load->view('includes/gallery-template', $data);
}
@@ -310,7 +311,7 @@ function frequently_asked_questions()
{
$data = NULL;
$data['main_content'] = 'faqs_view';
- $data['active'] = 'FAQs';
+ $data['active'] = 'faqs';
$data['title'] = 'Frequently Asked Questions';
$data['css'] = 'alt_style.css';
$data['header_image'] = 'using_product_banner.jpg';
@@ -327,6 +328,40 @@ function architectural_details()
$data['header_image'] = 'using_product_banner.jpg';
$this->load->view('includes/alt-template', $data);
}
+
+ function build_locations()
+ {
+ $data['locations'] = array();
+ $data['main_content'] = 'build_locations_view';
+ $data['active'] = 'build_locations';
+ $data['title'] = 'Build Locations';
+ $data['css'] = 'alt_style.css';
+ $data['header_image'] = 'using_product_banner.jpg';
+ $this->load->view('includes/alt-template', $data);
+ }
+
+ function bcrypt()
+ {
+ $password = 'michael1';
+ $actualPassword = 'michael1';
+ $this->load->library('PasswordHash');
+ $pHash = new PasswordHash();
+
+ echo $hashedPass = $pHash->HashPassword($actualPassword);
+ echo '<br />';
+ //check the user input unhased password with the hashed
+ //password retrieved from the database
+ $check = $pHash->CheckPassword($password, $hashedPass);
+
+ if( $check )
+ {
+ echo 'Password Correct!';
+ }
+ else
+ {
+ echo 'Password Wrong!';
+ }
+ }
}
/* End of file main_controller.php */
View
255 application/libraries/PasswordHash.php
@@ -0,0 +1,255 @@
+<?php
+#
+# Portable PHP password hashing framework.
+#
+# Version 0.3 / genuine.
+#
+# Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in
+# the public domain. Revised in subsequent years, still public domain.
+#
+# There's absolutely no warranty.
+#
+# The homepage URL for this framework is:
+#
+# http://www.openwall.com/phpass/
+#
+# Please be sure to update the Version line if you edit this file in any way.
+# It is suggested that you leave the main version number intact, but indicate
+# your project name (after the slash) and add your own revision information.
+#
+# Please do not change the "private" password hashing method implemented in
+# here, thereby making your hashes incompatible. However, if you must, please
+# change the hash type identifier (the "$P$") to something different.
+#
+# Obviously, since this code is in the public domain, the above are not
+# requirements (there can be none), but merely suggestions.
+#
+class PasswordHash {
+ var $itoa64;
+ var $iteration_count_log2;
+ var $portable_hashes;
+ var $random_state;
+ //CodeIgniter Problem, To load a library with CI's load system, you cannot
+ //load a library with a constructor. To make it work define the constructor
+ //variables inside the library file. $iteration_count_log2 and $portable_hashes
+ function PasswordHash($iteration_count_log2 = 8, $portable_hashes = FALSE)
+ {
+ $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+
+ if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31)
+ $iteration_count_log2 = 8;
+ $this->iteration_count_log2 = $iteration_count_log2;
+
+ $this->portable_hashes = $portable_hashes;
+
+ $this->random_state = microtime();
+ if (function_exists('getmypid'))
+ $this->random_state .= getmypid();
+ }
+
+ function get_random_bytes($count)
+ {
+ $output = '';
+ if (is_readable('/dev/urandom') &&
+ ($fh = @fopen('/dev/urandom', 'rb'))) {
+ $output = fread($fh, $count);
+ fclose($fh);
+ }
+
+ if (strlen($output) < $count) {
+ $output = '';
+ for ($i = 0; $i < $count; $i += 16) {
+ $this->random_state =
+ md5(microtime() . $this->random_state);
+ $output .=
+ pack('H*', md5($this->random_state));
+ }
+ $output = substr($output, 0, $count);
+ }
+
+ return $output;
+ }
+
+ function encode64($input, $count)
+ {
+ $output = '';
+ $i = 0;
+ do {
+ $value = ord($input[$i++]);
+ $output .= $this->itoa64[$value & 0x3f];
+ if ($i < $count)
+ $value |= ord($input[$i]) << 8;
+ $output .= $this->itoa64[($value >> 6) & 0x3f];
+ if ($i++ >= $count)
+ break;
+ if ($i < $count)
+ $value |= ord($input[$i]) << 16;
+ $output .= $this->itoa64[($value >> 12) & 0x3f];
+ if ($i++ >= $count)
+ break;
+ $output .= $this->itoa64[($value >> 18) & 0x3f];
+ } while ($i < $count);
+
+ return $output;
+ }
+
+ function gensalt_private($input)
+ {
+ $output = '$P$';
+ $output .= $this->itoa64[min($this->iteration_count_log2 +
+ ((PHP_VERSION >= '5') ? 5 : 3), 30)];
+ $output .= $this->encode64($input, 6);
+
+ return $output;
+ }
+
+ function crypt_private($password, $setting)
+ {
+ $output = '*0';
+ if (substr($setting, 0, 2) == $output)
+ $output = '*1';
+
+ $id = substr($setting, 0, 3);
+ # We use "$P$", phpBB3 uses "$H$" for the same thing
+ if ($id != '$P$' && $id != '$H$')
+ return $output;
+
+ $count_log2 = strpos($this->itoa64, $setting[3]);
+ if ($count_log2 < 7 || $count_log2 > 30)
+ return $output;
+
+ $count = 1 << $count_log2;
+
+ $salt = substr($setting, 4, 8);
+ if (strlen($salt) != 8)
+ return $output;
+
+ # We're kind of forced to use MD5 here since it's the only
+ # cryptographic primitive available in all versions of PHP
+ # currently in use. To implement our own low-level crypto
+ # in PHP would result in much worse performance and
+ # consequently in lower iteration counts and hashes that are
+ # quicker to crack (by non-PHP code).
+ if (PHP_VERSION >= '5') {
+ $hash = md5($salt . $password, TRUE);
+ do {
+ $hash = md5($hash . $password, TRUE);
+ } while (--$count);
+ } else {
+ $hash = pack('H*', md5($salt . $password));
+ do {
+ $hash = pack('H*', md5($hash . $password));
+ } while (--$count);
+ }
+
+ $output = substr($setting, 0, 12);
+ $output .= $this->encode64($hash, 16);
+
+ return $output;
+ }
+
+ function gensalt_extended($input)
+ {
+ $count_log2 = min($this->iteration_count_log2 + 8, 24);
+ # This should be odd to not reveal weak DES keys, and the
+ # maximum valid value is (2**24 - 1) which is odd anyway.
+ $count = (1 << $count_log2) - 1;
+
+ $output = '_';
+ $output .= $this->itoa64[$count & 0x3f];
+ $output .= $this->itoa64[($count >> 6) & 0x3f];
+ $output .= $this->itoa64[($count >> 12) & 0x3f];
+ $output .= $this->itoa64[($count >> 18) & 0x3f];
+
+ $output .= $this->encode64($input, 3);
+
+ return $output;
+ }
+
+ function gensalt_blowfish($input)
+ {
+ # This one needs to use a different order of characters and a
+ # different encoding scheme from the one in encode64() above.
+ # We care because the last character in our encoded string will
+ # only represent 2 bits. While two known implementations of
+ # bcrypt will happily accept and correct a salt string which
+ # has the 4 unused bits set to non-zero, we do not want to take
+ # chances and we also do not want to waste an additional byte
+ # of entropy.
+ $itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+
+ $output = '$2a$';
+ $output .= chr(ord('0') + $this->iteration_count_log2 / 10);
+ $output .= chr(ord('0') + $this->iteration_count_log2 % 10);
+ $output .= '$';
+
+ $i = 0;
+ do {
+ $c1 = ord($input[$i++]);
+ $output .= $itoa64[$c1 >> 2];
+ $c1 = ($c1 & 0x03) << 4;
+ if ($i >= 16) {
+ $output .= $itoa64[$c1];
+ break;
+ }
+
+ $c2 = ord($input[$i++]);
+ $c1 |= $c2 >> 4;
+ $output .= $itoa64[$c1];
+ $c1 = ($c2 & 0x0f) << 2;
+
+ $c2 = ord($input[$i++]);
+ $c1 |= $c2 >> 6;
+ $output .= $itoa64[$c1];
+ $output .= $itoa64[$c2 & 0x3f];
+ } while (1);
+
+ return $output;
+ }
+
+ function HashPassword($password)
+ {
+ $random = '';
+
+ if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
+ $random = $this->get_random_bytes(16);
+ $hash =
+ crypt($password, $this->gensalt_blowfish($random));
+ if (strlen($hash) == 60)
+ return $hash;
+ }
+
+ if (CRYPT_EXT_DES == 1 && !$this->portable_hashes) {
+ if (strlen($random) < 3)
+ $random = $this->get_random_bytes(3);
+ $hash =
+ crypt($password, $this->gensalt_extended($random));
+ if (strlen($hash) == 20)
+ return $hash;
+ }
+
+ if (strlen($random) < 6)
+ $random = $this->get_random_bytes(6);
+ $hash =
+ $this->crypt_private($password,
+ $this->gensalt_private($random));
+ if (strlen($hash) == 34)
+ return $hash;
+
+ # Returning '*' on error is safe here, but would _not_ be safe
+ # in a crypt(3)-like function used _both_ for generating new
+ # hashes and for validating passwords against existing hashes.
+ return '*';
+ }
+
+ function CheckPassword($password, $stored_hash)
+ {
+ $hash = $this->crypt_private($password, $stored_hash);
+ if ($hash[0] == '*')
+ $hash = crypt($password, $stored_hash);
+
+ return $hash == $stored_hash;
+ }
+}
+
+?>
View
0  application/libraries/index.html 100644 → 100755
File mode changed
View
29 application/models/login_model.php
@@ -1,10 +1,11 @@
<?php
class Login_model extends CI_Model {
+ /*
public function checkLogin($name, $pass)
{
$this->load->database();
-
+
$error = 'The username or password is incorrect.';
$query = $this->db->get_where('users', array('username'=>$name, 'password'=>$this->encryptPass($pass)));
@@ -16,6 +17,32 @@ public function checkLogin($name, $pass)
return $error;
}
+ */
+ /* This function uses phpass with bcrypt */
+ public function checkLogin( $name, $pass )
+ {
+ $this->load->database();
+ $this->load->library('PasswordHash');
+ $error = 'The username or password is incorrect.';
+
+ $pHash = new PasswordHash();
+
+ $query = $this->db->get_where('users', array('username'=>$name,));
+ $row = $query->row();
+
+ if ( $query->num_rows == 1 )
+ {
+ $check = $pHash->CheckPassword($pass, $row->password);
+ if ( $check )
+ {
+ return TRUE;
+ }
+ }
+ return $error;
+ //check the user input unhased password with the hashed
+ //password retrieved from the database
+
+ }
public function encryptPass($password)
{
View
5 application/views/all_galleries_view.php
@@ -1,7 +1,4 @@
<div id="container" class="grid_16 alpha omega">
-
-<h2>All galleries loaded</h2>
-
<div class="galleries grid_16 alpha omega">
<?php foreach ($galleries as $gallery) : ?>
<div class="gallery grid_4 alpha">
@@ -22,7 +19,7 @@
<?php endforeach; ?>
</div>
-<div id="pagination" class="grid_16">
+<div id="pagination" class="grid_16 alpha">
<p>
<?php echo $this->pagination->create_links(); ?>
</p>
View
68 application/views/build_locations_view.php
@@ -0,0 +1,68 @@
+<script src="http://maps.google.com/maps/api/js?sensor=false"
+ type="text/javascript"></script>
+
+<?php
+
+ /* Array connsists of Name, LatLong, and z-index of marker*/
+ $locations=array(
+ array('Based In Eureka, IL', '40.721388,-89.272932', 1),
+ array('Peoria Heights, IL', '40.753499,-89.569016', 4),
+ array('Springfield, IL', '39.786379,-89.644547', 5),
+ array('Davenport, IA', '41.533254,-90.577698', 3)
+ );
+?>
+
+<h4>Places We've Built Shelters</h4>
+
+<div id="map" style="float: left; width: 500px; height: 400px;"></div>
+<div style="float:left" id="maplinks">
+ <ul>
+ <?php foreach ( $locations as $key=>$value ): ?>
+ <li><a href="#map" onclick="goToLoc(<?php echo $key;?>)"><?php echo $value[0]; ?></a></li>
+ <?php endforeach; ?>
+ </ul>
+</div>
+
+<script type="text/javascript">
+ var locations=[
+ <?php
+ foreach ($locations as $value)
+ {
+ echo "['".$value[0]."',".$value[1].",".$value[2]."],";
+
+ }
+ ?>
+ ];
+
+
+ var map = new google.maps.Map(document.getElementById('map'), {
+ zoom: 6,
+ center: new google.maps.LatLng(40.721388,-89.272932),
+ mapTypeId: google.maps.MapTypeId.ROADMAP
+ });
+
+ var infowindow = new google.maps.InfoWindow();
+
+ var marker, i;
+
+ for (i = 0; i < locations.length; i++) {
+ marker = new google.maps.Marker({
+ position: new google.maps.LatLng(locations[i][1], locations[i][2]),
+ map: map
+ });
+
+ google.maps.event.addListener(marker, 'click', (function(marker, i) {
+ return function() {
+ infowindow.setContent(locations[i][0]);
+ infowindow.open(map, marker);
+ map.setZoom(9);
+ map.panTo(marker.getPosition());
+ }
+ })(marker, i));
+ }
+
+ function goToLoc(id){
+ map.setZoom(8);
+ map.panTo(new google.maps.LatLng(locations[id][1], locations[id][2]));
+ }
+ </script>
View
5 application/views/gallery_view.php
@@ -1,5 +1,4 @@
-<div id="container" class="grid_16 alpha omega">
- <h1>Gallery</h1>
+<p><a href="<?php echo site_url('galleries');?>">Back to Galleries</a></p>
<?php if ( !$errors ) : ?>
<div id="pictures" class="grid_16 alpha omega">
<h2><?php echo $ret[0]->title; ?></h2>
@@ -10,7 +9,7 @@
$pieces[0] .= '_thumb.';
$thumb = $pieces[0] . $pieces[1];
?>
- <a href="<?php echo site_url().'photo/'.$pic->id ?>">
+ <a href="<?php echo site_url().'photo/'.$pic->id ?>/#photo">
<img src="<?php echo site_url().'uploads/'.$ret[0]->directory_name?>/thumbs/<?php echo $thumb ?>" class="grid_4 alpha" alt="image" />
</a>
</div><!-- end PICTURE div -->
View
4 application/views/home_view.php
@@ -54,6 +54,7 @@
</ul>
</div>
</li>
+ <!--
<li id="galleries-link">
<ul>
<li>
@@ -61,6 +62,7 @@
</li>
</ul>
</li>
+ -->
</ul>
</div>
</div>
@@ -89,7 +91,7 @@
the DuPont&#8482; StormRoom&#8482; can be easily incorporated into a new building design or added to
an existing home without disrupting the building process or your daily routine. </p>
</div>
- <div class="grid_7 omega" id="<!--[if lt IE 9]>provenbyscienceIE<![end if]-->">
+ <div class="grid_7 omega">
<img class="grid_3 alpha" src="<?php echo base_url();?>images/pic3.jpg" alt="F5 Stormrooms Image Three"/>
<h5 class="grid_4 alpha omega">Proven by Science</h5>
<p class="grid_4 alpha omega">Proven by Science
View
96 application/views/includes/alt-header.php
@@ -8,11 +8,12 @@
<link rel="shortcut icon" type="image/x-icon" href="<?php echo base_url();?>images/tornado-cropped64.png" />
+<!--[if gte IE 8]>-->
<link rel="stylesheet" type="text/css" href="<?php echo base_url();?>css/reset.css" />
<link rel="stylesheet" type="text/css" href="<?php echo base_url();?>css/text.css" />
<link rel="stylesheet" type="text/css" href="<?php echo base_url();?>css/960.css" />
<link rel="stylesheet" type="text/css" href="<?php echo base_url().'css/'.$css;?>"/>
-
+<!--<![endif]-->
<title>F5 Stormrooms - <?php echo $title; ?></title>
@@ -21,63 +22,68 @@
<body class="container_16">
<div id="container" class="grid_14 prefix_1 suffix_1 alpha omega">
<div class="grid_14 alpha omega" id="main">
- <div class="grid_3 alpha" id="names">
- <h3 id="f5stormrooms-header">F5 Stormrooms</h3>
- <h4>
- DuPont&#8482; StormRoom&#8482; with Kevlar&#174;
- </h4>
- </div><!-- End names div -->
- <img id="header-image" src="<?php echo site_url('images/'.$header_image)?>" alt="Product Information"/>
- <div class="grid_14 alpha" id="alt-nav">
+ <div class="grid_14 alpha omega">
+ <div class="grid_3 alpha" id="names">
+ <h3 id="f5stormrooms-header">F5 Stormrooms</h3>
+ <h4>
+ DuPont&#8482; StormRoom&#8482; with Kevlar&#174;
+ </h4>
+ </div><!-- End names div -->
+ <img id="header-image" src="<?php echo site_url('images/'.$header_image)?>" alt="Product Information"/>
+ </div>
+ <div class="grid_14 alpha omega" id="alt-nav">
<ul>
-
- <li>
- <ul id="home-link">
- <li class="<?php echo ( $active == 'home' ? 'active' : '' ); ?>">
- <a href="<?php echo site_url(); ?>">
- Home
- </a>
+ <li id="home-link">
+ <ul>
+ <li>
+ <a href="<? echo site_url();?>">Home</a>
</li>
</ul>
</li>
- <li>
- <div id="product-info-item">
+ <li id="prod-info-link">
+ <div class="menu">
<ul>
<li class="<?php echo ( $active == 'product_info' ? 'active' : '' ); ?>">
- <a href="product_info">Product Info</a>
- </li>
- <li class="dropdown <?php echo ( $active == 'proven_by_science' ? 'active' : '' ); ?>">
- <a href="proven_by_science">Proven by Science</a>
- </li>
- <li class="dropdown <?php echo ( $active == 'exceeding_standards' ? 'active' : ''); ?>">
- <a href="exceeding_standards">Exceeding Standards</a>
- </li>
- </ul>
- </div>
- </li>
- <li>
- <div id="using-product-item">
- <ul>
- <li class="<?php echo ( $active == 'using_product' ? 'active' : '' ); ?>">
- <a href="using_product">Using the Product</a>
+ <a href="<? echo site_url('product_info');?>">Product Info</a>
</li>
- <li class="dropdown <?php echo ( $active == 'faqs' ? 'active' : '' ); ?>">
- <a href="frequently_asked_questions">FAQs</a>
+ <li class="dropdown <?php echo ( $active == 'proven_by_science' ? 'active' : '' ); ?>">
+ <a href="<? echo site_url('proven_by_science');?>">Proven by Science</a>
</li>
- <li class="dropdown <?php echo ( $active == 'architectural_details' ? 'active' : ''); ?>">
- <a href="architectural_details">Architectural Details</a>
+ <li class="dropdown <?php echo ( $active == 'exceeding_standards' ? 'active' : ''); ?>">
+ <a href="<? echo site_url('exceeding_standards');?>">Exceeding Standards</a>
</li>
</ul>
</div>
</li>
- <li>
- <div id="gallery-item">
- <ul>
- <li><a href="galleries">Gallery</a></li>
- </ul>
+
+ <li id="using-prod-link">
+ <div class="menu">
+ <ul>
+ <li class="<?php echo ( $active == 'using_product' ? 'active' : '' ); ?>">
+ <a href="<? echo site_url('using_product');?>">Using the Product</a>
+ </li>
+ <li class="dropdown <?php echo ( $active == 'faqs' ? 'active' : '' ); ?>">
+ <a href="<? echo site_url('frequently_asked_questions');?>">FAQs</a>
+ </li>
+ <li class="dropdown <?php echo ( $active == 'architectural_details' ? 'active' : ''); ?>">
+ <a href="<? echo site_url('architectural_details');?>">Architectural Details</a>
+ </li>
+ </ul>
</div>
</li>
+ <!--
+ <li id="galleries-link">
+ <ul>
+ <li>
+ <a href="<? echo site_url('galleries');?>">Gallery</a>
+ </li>
+ </ul>
+ </li>
+ -->
</ul>
- </div> <!--Close alt-nav-->
+ </div><!-- end alt-nav div -->
<div class="grid_14 alpha omega beta" id="info-section">
- <div class="grid_14 alpha omega beta justify">
+ <div class="grid_14 alpha omega beta justify">
+ <!--[if lte IE 7]>
+ <h3>To view this website with full styling, please upgrade your browser.</h3>
+ <![endif]-->
View
23 application/views/includes/gallery-footer.php
@@ -0,0 +1,23 @@
+<div id="footer" class="grid_16 alpha">
+ <div id="footer-content" class="grid_16 alpha">
+ <p>
+ Copyright &#169; 2011 DuPont. All rights reserved. The DuPont Oval Logo, DuPont&#8482;, The miracles of science&#8482; and
+ all products denoted with &#174; or &#8482; are registered trademarks or trademarks of E. I. du Pont de Nemours and Company
+ or its affiliates.
+ </p>
+ <p id="login">
+ <?php if ($this->session->userdata('username')): ?>
+ Logged in as <?php echo $this->session->userdata('username').' '; ?>
+ <a href="<?php echo site_url(); ?>user/admin">admin</a> <a href="<?php echo site_url(); ?>user/logout">logout</a>
+ <?php else: ?>
+ <a href="<?php echo site_url(); ?>user/login">admin</a>
+ <?php endif; ?>
+ </p>
+ </div>
+</div> <!--Close Footer -->
+
+</div> <!-- close div container -->
+
+</body>
+
+</html>
View
24 application/views/includes/gallery-header.php
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+<script type="text/Javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+
+<link rel="shortcut icon" type="image/x-icon" href="<?php echo base_url();?>images/tornado-cropped64.png" />
+
+<link rel="stylesheet" type="text/css" href="<?php echo base_url();?>css/reset.css" />
+<link rel="stylesheet" type="text/css" href="<?php echo base_url();?>css/text.css" />
+<link rel="stylesheet" type="text/css" href="<?php echo base_url();?>css/960.css" />
+<link rel="stylesheet" type="text/css" href="<?php echo base_url();?>css/overall-style.css" />
+<link rel="stylesheet" type="text/css" href="<?php echo base_url().'css/'.$css;?>"/>
+
+<title>F5 Stormrooms - <?php echo $title; ?></title>
+
+
+</head>
+
+<body class="container_16">
+<div id="container" class="grid_16 alpha omega">
+<h1>F5 Stormrooms</h1>
View
5 application/views/includes/gallery-template.php
@@ -0,0 +1,5 @@
+<?php $this->load->view('includes/gallery-header', $css); ?>
+<?php $this->load->view($main_content); ?>
+<?php $this->load->view('includes/gallery-footer'); ?>
+
+
View
3  application/views/includes/header.php
@@ -19,3 +19,6 @@
</head>
<body class="container_16">
+<!--[if lte IE 7]>
+<h3>To view this website with full styling, please upgrade your browser.</h3>
+<![endif]-->
View
10 application/views/photo_view.php
@@ -1,7 +1,9 @@
-
<?php if ( $errors ) : ?>
<?php echo $errors; ?>
<?php endif; ?>
-<h2><?php echo $picTitle ?></h2>
-<p><img src="<?php echo $path; ?>" /></p>
-<p><?php echo $picDesc; ?></p>
+<div id="photo">
+ <h2><?php echo $picTitle ?></h2>
+ <p><a href="<?php echo site_url('gallery/'.$picGallery);?>">Back</a></p>
+ <p><img src="<?php echo $path; ?>" /></p>
+ <p><?php echo $picDesc; ?></p>
+</div>
View
12 css/admin_galleries.css
@@ -1,3 +1,14 @@
+body{
+ color: #666666;
+}
+
+h1,h2,h3,h4,h5,h6{
+ color: #cc0000;
+}
+
+a{
+ color: #cc0000;
+}
#pictures{
margin-top: 20px;
}
@@ -21,3 +32,4 @@
#admin-header #admin-menu{
padding-top: 75px;
}
+
View
101 css/alt_style.css
@@ -1,6 +1,6 @@
html{
-font-family:Verdana, Arial, Helvetica, sans-serif;\
+font-family:Verdana, Arial, Helvetica, sans-serif;
}
body{
@@ -30,93 +30,80 @@ a{
/* End Header Image */
/* Navigation Section on pages other than homepage */
+
#alt-nav{
- margin-bottom: 0px;
- background: #cc0000;
- height: 20px;
- padding-top: 5px;
- padding-bottom: 5px;
+ position: relative;
+ font-size: 100%;/*1.2em;*/
+ background:#b2031f;
+ font-weight: bold;
+ height: 36px;
+}
+#alt-nav *{
+ color: white;
}
-
#alt-nav a{
text-decoration: none;
-}
-#alt-nav .active{
- background-color: #87002f;
display: block;
}
-
-#alt-nav *{
- padding:0;
- margin:0;
-}
-
-#alt-nav ul li{
+#alt-nav ul, #alt-nav ul li, #alt-nav ul li ul li{
list-style-type: none;
+ margin:0;
+ padding: 0;
}
#alt-nav ul li ul:first-child{
- float:left;
- padding-left: 5px;
-
+ float: left;
}
-
-#alt-nav ul li ul li:hover{
- background-color: #666666;
+#alt-nav ul li ul:first-child li:first-child{
+ padding-top: 8px;
+ padding-bottom: 8px;
}
#alt-nav ul li ul li{
- padding-left: 5px;
-}
-
-#alt-nav #home-link{
- width: 70px;
+ padding-right: 10px;
+ padding-left: 10px;
}
#alt-nav ul li ul{
- width: 110px;
+ width: 4em;
}
-#alt-nav li{
- background-color: #cc0000;
+#alt-nav #prod-info-link ul:first-child{
+ width: 12.5%;
}
-#alt-nav a{
- color: white;
- text-decoration: none;
- display: block;
+#alt-nav #prod-info-link .dropdown{
+ width: 130%;
+}
+#alt-nav #using-prod-link ul:first-child{
+ width: 18%;
+}
+#alt-nav #using-prod-link .dropdown{
+ width: 91%;
}
+
#alt-nav .dropdown{
position: relative;
- margin-left: 0px;
- left:-10000px;
- float:none;
- display: block;
- width: 140px;
+ left: -10000px;
}
-
-
-#alt-nav .dropdown:hover div{
- left: 0px;
+#alt-nav .dropdown, ul li ul:hover{
+ background: #b2031f;
}
-#alt-nav .dropdown:hover div{
- left: 0px;
+#alt-nav .dropdown{
+ padding-top: 3px;
+ padding-bottom: 3px;
}
-
-#alt-nav #product-info-item:hover li{
- left: 0px;
+#alt-nav ul li ul li:hover{
+ background: #7d001d;
}
-#alt-nav #using-product-item:hover li{
- left: 0px;
-}
-#alt-nav #using-product-item ul
-{
- width: 140px;
+#alt-nav .menu:hover li{
+ left: 0;
}
-#alt-nav #gallery-item ul li{
+#alt-nav .active{
+ background: #7d001d;
}
/* Product Information Page */
@@ -180,11 +167,13 @@ padding-top:15px;
/* End Footer Style */
/* Classes */
+/*
.shadow {
-moz-box-shadow: -1px -2px 3px 2px #ccc;
-webkit-box-shadow: -1px -2px 3px 2px #ccc;
box-shadow: -1px -2px 3px 2px #ccc;
}
+*/
.justify{
text-align: justify;
View
55 css/overall-style.css
@@ -0,0 +1,55 @@
+body{
+ margin-top: 20px;
+}
+
+/*Pagination styling*/
+#pagination{
+ font-size: 15px;
+ /*Fixes space problem with pagination*/
+ position: relative;
+ left: -5px;
+}
+
+#pagination strong{
+ background: green;
+}
+
+#pagination a, strong{
+ background: blue;
+ text-decoration: none;
+ padding: 10px;
+ color: white;
+}
+
+#pagination a:hover{
+ background: red;
+}
+
+/*End Pagination Style*/
+
+/*Footer*/
+#footer{
+ margin-bottom: 30px;
+}
+
+#footer #footer-content {
+border-top:1px solid #000;
+padding-top:15px;
+}
+
+#footer #footer-content p {
+ margin-bottom: 0px;
+}
+
+#footer #footer-content #login {
+ text-align: right;
+}
+/*End Footer*/
+
+
+/*Test Section*/
+#photo img{
+max-width: 900px;
+max-height: 500px;
+}
+/* End Test */
View
38 css/style.css
@@ -34,13 +34,14 @@ background-size:820px;
#navigation{
position: relative;
top: 283px;
- font-size: 16px;
+ font-size: 120%;/*1.2em;*/
}
#navigation *{
color: white;
}
#navigation a{
text-decoration: none;
+ display: block;
}
#navigation ul, ul li,ul li ul li{
list-style-type: none;
@@ -50,34 +51,36 @@ background-size:820px;
#navigation ul li ul:first-child{
float: left;
}
-#navigation ul li ul li:first-child{
+#navigation ul li ul:first-child li:first-child{
border-right: 1px solid white;
- padding-top: 8px;
- padding-bottom: 8px;
+ padding-top: 9px;
+ padding-bottom: 9px;
}
-#navigation ul li{
- padding-left: 10px;
+
+#navigation ul li ul li{
padding-right: 10px;
+ padding-left: 10px;
}
-#navigation #home-link{
- padding-left: 0px;
-}
-#navigation #prod-info-link ul{
- width: 106px;
-}
-#navigation #using-prod-link ul{
- width: 148px;
+#navigation ul li ul{
+ width: 4em;
}
+
+#navigation #prod-info-link ul:first-child{
+ width: 14%;
+}
#navigation #prod-info-link .dropdown{
- width: 153px;
+ width: 142%;
+}
+#navigation #using-prod-link ul:first-child{
+ width: 19%;
}
-
#navigation #using-prod-link .dropdown{
- width: 143px;
+ width: 95%;
}
+
#navigation .dropdown{
position: relative;
left: -10000px;
@@ -256,6 +259,7 @@ color:gray;
text-decoration: none;
}
+
/*
#container{
Please sign in to comment.
Something went wrong with that request. Please try again.