Ekokumppanit/ystavakylaecard
1
0
Fork 0
mirror of https://github.com/Ekokumppanit/ystavakylaecard.git synced 2026-03-05 06:54:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetic changes to code, better wording in list_cards view, generalised validation errors to all forms, not just #ecard_form

Browse Source
This commit is contained in:
Ismo Vuorinen
2013-07-17 13:55:21 +03:00
parent 769dac1fce
commit 78cb7b2eee
6 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/yllapito.php
View File

@@ -113,7 +113,9 @@ class Yllapito extends CI_Controller
if (empty($limit)) { if (empty($limit)) {
$data['cards'] = $this->ecard->order_by('created_at')->get_all(); $data['cards'] = $this->ecard->order_by('created_at')->get_all();
} else { } else {
$data['cards'] = $this->ecard->order_by('created_at')->get_many_by('card_status', $limit); $data['cards'] = $this->ecard
->order_by('created_at')
->get_many_by('card_status', $limit);
} }
$data['page_title'] = array_merge($page_title, $data['page_title']); $data['page_title'] = array_merge($page_title, $data['page_title']);
@@ -156,7 +158,6 @@ class Yllapito extends CI_Controller
break; break;
} }
$data['page_title'] = array_merge($page_title, $data['page_title']); $data['page_title'] = array_merge($page_title, $data['page_title']);
$page = 'yllapito/users_'.$section; $page = 'yllapito/users_'.$section;

12
application/views/_header.php
View File

@@ -118,14 +118,14 @@ if (isset($user) and ! empty($user)) {
<ul class="dropdown"> <ul class="dropdown">
<?php <?php
if ($user->can_modusers == "yes") { if ($user->can_modusers == "yes") {
echo "<li>" echo "<li>"
. lnk("yllapito/users/add", "Lisää käyttäjä") . lnk("yllapito/users/add", "Lisää käyttäjä")
. "</li>\n"; . "</li>\n";
} }
if ($user->can_seeusers == "yes") { if ($user->can_seeusers == "yes") {
echo "<li>" echo "<li>"
. lnk("yllapito/users/list", "Listaa käyttäjät") . lnk("yllapito/users", "Listaa käyttäjät")
. "</li>\n"; . "</li>\n";
} }
?> ?>
</ul> </ul>

26
application/views/yllapito/dashboard.php
View File

@@ -21,7 +21,7 @@ if ($all > 0) {
if ($p_queue > 0) { ?> if ($p_queue > 0) { ?>
<span data-tooltip <span data-tooltip
class="has-tip left queue meter" class="has-tip left queue meter"
data-width="210" data-width="230"
title="Kortteja jonossa <?=$count->queue; ?> kpl" title="Kortteja jonossa <?=$count->queue; ?> kpl"
style="width: <?=$p_queue;?>%"></span> style="width: <?=$p_queue;?>%"></span>
<?php <?php
@@ -29,7 +29,7 @@ if ($p_queue > 0) { ?>
if ($p_public > 0) { ?> if ($p_public > 0) { ?>
<span data-tooltip <span data-tooltip
class="has-tip left public meter" class="has-tip left public meter"
data-width="210" data-width="230"
title="Kortteja julkaistuna <?=$count->public; ?> kpl" title="Kortteja julkaistuna <?=$count->public; ?> kpl"
style="width: <?=$p_public;?>%"></span> style="width: <?=$p_public;?>%"></span>
<?php <?php
@@ -37,15 +37,15 @@ if ($p_public > 0) { ?>
if ($p_private > 0) { ?> if ($p_private > 0) { ?>
<span data-tooltip <span data-tooltip
class="has-tip left private meter" class="has-tip left private meter"
data-width="210" data-width="230"
title="Kortteja piilotettuna <?=$count->private; ?> kpl" title="Yksityisiä kortteja <?=$count->private; ?> kpl"
style="width: <?=$p_private;?>%"></span> style="width: <?=$p_private;?>%"></span>
<?php <?php
} }
if ($p_hidden > 0) { ?> if ($p_hidden > 0) { ?>
<span data-tooltip <span data-tooltip
class="has-tip left hidden meter" class="has-tip left hidden meter"
data-width="210" data-width="230"
title="Poistettuja kortteja <?=$count->hidden; ?> kpl" title="Poistettuja kortteja <?=$count->hidden; ?> kpl"
style="width: <?=$p_hidden;?>%"></span> style="width: <?=$p_hidden;?>%"></span>
<?php <?php
@@ -54,15 +54,15 @@ if ($p_hidden > 0) { ?>
</div> </div>
<pre><?php <h4>Kortit</h4>
if (empty($user)) { <ul class="inline-list">
$user = new stdClass(); <li><?php echo lnk("yllapito/ecards/queue", "Jonossa"); ?></li>
} <li><?php echo lnk("yllapito/ecards/public", "Julkaistut"); ?></li>
<li><?php echo lnk("yllapito/ecards/private", "Yksityiset"); ?></li>
var_export($user); <li><?php echo lnk("yllapito/ecards/hidden", "Piilotetut"); ?></li>
<li><?php echo lnk("yllapito/ecards/", "Kaikki"); ?></li>
?></pre> </ul>
</div> </div>
</div> </div>

6
application/views/yllapito/list_cards.php
View File

@@ -92,9 +92,9 @@ if (!empty($cards)) {
$checkboxes = array( $checkboxes = array(
'queue' => 'Jonossa', 'queue' => 'Jonossa',
'public' => 'Julkaise', 'public' => 'Julkaistu',
'private' => 'Piilota', 'private' => 'Piilotettu',
'hidden' => 'Hylkää' 'hidden' => 'Hylätty'
); );

7
application/views/yllapito/users_show.php
View File

@@ -3,7 +3,12 @@
if (empty($userdata)) { if (empty($userdata)) {
$userdata = array(); $userdata = array();
} }
if (empty($user)) {
$user = new stdClass();
}
if (empty($userid)) {
$userid = 0;
}
?> ?>
<div class="row"> <div class="row">

2
assets/css/style.css
View File

@@ -133,7 +133,7 @@ table thead th button {
font-size: 11px; font-size: 11px;
} }
#ecard_form label.error { form label.error {
margin-top: -10px; margin-top: -10px;
padding-bottom: 20px; padding-bottom: 20px;
clear: both; clear: both;