Coding standard fixes. Routes: Error page override works now. Welcome controller: Return false where needed. Header-view: lnk-helper function to help highlight current page matching links. ecards-helper: lnk() and checkboxes(), needs commenting. new-view: values for javascript, Image name for dropdown. style.css: better colours, footer links not so prominent, helper classes, moved cursor: move from users without javascript. scripts.js: documentation.

This commit is contained in:
Ismo Vuorinen
2013-07-16 18:42:36 +03:00
parent 4bb689166d
commit adaca5b8b2
9 changed files with 211 additions and 115 deletions

View File

@@ -7,14 +7,14 @@ if (empty($page_title)) {
}
?><!DOCTYPE html>
<!--[if IE 8]> <html class="no-js lt-ie9" lang="fi"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="fi"> <!--<![endif]-->
<!--[if IE 8]><html class="no-js lt-ie9" lang="fi"><![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="fi"><!--<![endif]-->
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width" />
<link rel="icon" href="<?php echo site_url('/favicon.ico'); ?>">
<title><?php echo implode(" &raquo; ", $page_title); ?></title>
<?php
<?php
// Assets spark
assets_css(
array(
@@ -44,29 +44,30 @@ if (empty($page_title)) {
<section class="top-bar-section">
<ul class="left">
<li class="divider"></li>
<li><a class="active" href="<?php echo site_url("uusi"); ?>">Luo omasi!</a></li>
<li><?= lnk("uusi", "Luo omasi!"); ?></li>
<li class="divider"></li>
<li><a href="<?php echo site_url("kaikki"); ?>">Listaa kaikki</a></li>
<li><?= lnk("kaikki", "Listaa kaikki"); ?></li>
<li class="divider"></li>
<li class="has-dropdown">
<a href="<?php echo site_url("info"); ?>">Tietoa</a>
<?= lnk("info", "Tietoa"); ?>
<ul class="dropdown">
<li><a href="<?php echo site_url("info"); ?>#rekisteri">Rekisteriseloste</a></li>
<li><a href="<?php echo site_url("info"); ?>#yhteystiedot">Yhteystiedot</a></li>
<li><?= lnk("info#rekisteri", "Rekisteriseloste"); ?></li>
<li><?= lnk("info#yhteystiedot", "Yhteystiedot"); ?></li>
</ul>
</li>
</ul>
<?php
if (isset($user) and ! empty($user)) {
?>
<ul class="left">
<li class="has-dropdown adminmenu">
<a href="<?php echo site_url("yllapito"); ?>">Ylläpito</a>
<a href="<?php echo site_url("yllapito"); ?>">
<ul class="dropdown">
<li class="has-dropdown">
<a href="<?php echo site_url("yllapito/kortit"); ?>">Hallitse kortteja</a>
<?= lnk("yllapito/ecards", "Hallitse kortteja"); ?>
<ul class="dropdown">
<li>
<a href="<?php echo site_url("yllapito/ecards/moderate");?>">

View File

@@ -29,7 +29,7 @@
</div>
<div class="small-12 large-9 columns">
<input required type="text" id="sender_name"
name="sender_name" placeholder="Lähettäjän nimi">
name="sender_name" value="" placeholder="Lähettäjän nimi">
</div>
</div>
<div class="row">
@@ -38,7 +38,7 @@
</div>
<div class="small-12 large-9 columns">
<input required type="email" id="sender_email"
name="sender_email" placeholder="Lähettäjän email">
name="sender_email" value="" placeholder="Lähettäjän email">
</div>
</div>
</div>
@@ -53,7 +53,7 @@
</div>
<div class="small-12 large-9 columns">
<input required type="text" id="receiver_name"
name="receiver_name" placeholder="Vastaanottajan nimi">
name="receiver_name" value="" placeholder="Vastaanottajan nimi">
</div>
</div>
<div class="row">
@@ -62,7 +62,7 @@
</div>
<div class="small-12 large-9 columns">
<input required type="email" id="receiver_email"
name="receiver_email" placeholder="Vastaanottajan email">
name="receiver_email" value="" placeholder="Vastaanottajan email">
</div>
</div>
</div>
@@ -79,12 +79,12 @@
<?php
if (! empty($images)) {
foreach ($images as $i => $image) {
$name = pathinfo($image, PATHINFO_FILENAME);
?> <option data-img-src='<?php echo
$image;
?> <option data-img-src='<?php echo $image;
?>' value='<?php
echo $i;
?>'>Cute Kitten <?=$i;?></option><?php
echo $image;
?>'>Kuva: <?=$name;?></option><?php
echo "\n";
}
}
@@ -102,7 +102,7 @@ if (! empty($images)) {
</div>
<div class="small-12 large-9 columns">
<input type="text" maxlength="200" id="message_title"
name="message_title" placeholder="Moikka!">
name="message_title" value="" placeholder="Moikka!">
</div>
</div>
<div class="row">
@@ -166,9 +166,6 @@ if (! empty($images)) {
</div>
</div>
</form>