Skip to content
Snippets Groups Projects
Commit 731afb59 authored by Eric Rasmussen's avatar Eric Rasmussen
Browse files

styles for check/uncheck; formatting for manager table; start of an upgrade... 

styles for check/uncheck; formatting for manager table; start of an upgrade script with some needed sql statements
parent 75bd1af2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
data/upgrade.php 0 → 100644
+ 13
− 0
View file @ 731afb59
'ALTER TABLE `bids` CHANGE `status` `juncture` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL';
ALTER TABLE `bids` CHANGE `feature` `status` VARCHAR( 20 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
CHANGE `datedue` `date_due` DATETIME NOT NULL ,
CHANGE `awarddate` `award_date` DATETIME NULL DEFAULT NULL ,
CHANGE `dateedited` `date_modified` TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ,
CHANGE `userwhoedited` `uid_modified` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL
UPDATE bids SET status='approved' WHERE status='1';
UPDATE bids SET status='pending' WHERE status='0';
\ No newline at end of file
src/UNL/Procurement/Controller.php
+ 4
− 7
View file @ 731afb59
...@@ -19,13 +19,10 @@ class UNL_Procurement_Controller ...@@ -19,13 +19,10 @@ class UNL_Procurement_Controller
'help' => 'UNL_Procurement_Help', 'help' => 'UNL_Procurement_Help',
); );
public static $pagetitle = array('latest' => 'Latest News', public static $pagetitle = array('manager' => 'Manager Home',
'mynews' => 'Your News Submissions', 'edit' => 'Editor',
'submit' => 'Submit an Item', 'thanks' => 'Confirmation',
'manager' => 'Manage News', 'help' => 'Help',
'preview' => 'Build Newsletter',
'newsletters' => 'Newsletters',
'help' => 'Help! How do I…',
); );
protected static $auth; protected static $auth;
......
src/UNL/Procurement/Manager.php
+ 4
− 4
View file @ 731afb59
...@@ -3,7 +3,7 @@ class UNL_Procurement_Manager extends UNL_Procurement_LoginRequired ...@@ -3,7 +3,7 @@ class UNL_Procurement_Manager extends UNL_Procurement_LoginRequired
{ {
public $actionable = array(); public $actionable = array();
public $options = array('status'=>'pending'); public $options = array('status'=>'approved');
function __postConstruct() function __postConstruct()
{ {
...@@ -33,11 +33,11 @@ class UNL_Procurement_Manager extends UNL_Procurement_LoginRequired ...@@ -33,11 +33,11 @@ class UNL_Procurement_Manager extends UNL_Procurement_LoginRequired
if (false === $newsroom) { if (false === $newsroom) {
throw new Exception('Could not find the newsroom you were trying to edit!', 400); throw new Exception('Could not find the newsroom you were trying to edit!', 400);
} }
if (!UNL_Procurement_Controller::getUser(true)->hasPermission($newsroom->id)) { if (!UNL_Procurement_Controller::getUser(true)->hasPermission($newsroom->id)) {
throw new Exception('you cannot modify a newsroom you don\'t have permission to!', 403); throw new Exception('you cannot modify a newsroom you don\'t have permission to!', 403);
} }
if (isset($_POST['allow_submissions']) if (isset($_POST['allow_submissions'])
&& $_POST['allow_submissions'] == 'on') { && $_POST['allow_submissions'] == 'on') {
$_POST['allow_submissions'] = 1; $_POST['allow_submissions'] = 1;
...@@ -46,7 +46,7 @@ class UNL_Procurement_Manager extends UNL_Procurement_LoginRequired ...@@ -46,7 +46,7 @@ class UNL_Procurement_Manager extends UNL_Procurement_LoginRequired
} }
UNL_Procurement_Controller::setObjectFromArray($newsroom, $_POST); UNL_Procurement_Controller::setObjectFromArray($newsroom, $_POST);
$newsroom->save(); $newsroom->save();
UNL_Procurement_Controller::redirect('?view=newsroom'); UNL_Procurement_Controller::redirect('?view=newsroom');
break; break;
} }
......
www/css/style.css
+ 74
− 26
View file @ 731afb59
input.btnsubmit {
display:none;
}
/* datejs style */
#your_date.datejs_accept { #your_date.datejs_accept {
background:url('../js/accept.png') 0 0; background:url('../js/accept.png') 0 0;
background-repeat:no-repeat; background-repeat:no-repeat;
padding:3px 0 0 20px; padding:3px 0 0 20px;
} }
#your_date.datejs_error { #your_date.datejs_error {
background:url('../js/exclamation.png') 0 0; background:url('../js/exclamation.png') 0 0;
background-repeat:no-repeat; background-repeat:no-repeat;
padding:3px 0 0 20px; padding:3px 0 0 20px;
} }
/* zenforms fix */
#maincontent input[type="file"] {
outline:none !important;
}
/* add more upload fields 'link' */
#addAnotherUpload {
margin:0px 0 20px 40px;
display:block;
text-decoration:underline;
}
#addAnotherUpload:hover {
cursor:pointer;
}
#addAnotherUpload span {
padding:0 2px;
border:1px solid #fff;
background:#de8727;
color:#fff;
text-decoration:none;
}
#addAnotherUpload span:hover {
background:#eeb797;
}
/*bid manager menu */
#maincontent ul.appli_nav {
padding:0 0 1.1em 0px;
}
#maincontent ul.appli_nav li {
font-family:Verdana,Helvetica,sans-serif;
font-weight:normal;
letter-spacing:-1px;
margin-bottom:10px;
list-style-image:none; /* Check/Uncheck/Action
list-style-position:outside; ****************************/
list-style-type:none; .storyAction {
background:#EEE;
border-bottom:1px solid #DDDDDD;
border-right:1px solid #DDDDDD;
height:1%;
margin:0 0 5px;
padding:4px 5px;
position:relative;
} }
#maincontent ul.appli_nav li a{ .storyButtonAction {
float:left;
margin:2px 0 0;
width:144px;
}
#maincontent a.checkall,
#maincontent a.uncheckall {
background:#F0F0F0;
border:1px solid #B8AFA1;
color:#5F5F5F;
display:block; display:block;
height:34px; float:left;
padding:12px 0 0 15px; font-size:10px;
font-size:1.4em; margin-right:4px;
padding:1px 4px;
background-color:#f1f7fb; }
border:1px solid #cddeea; #maincontent form fieldset.storyFieldsetAction {
} background:none repeat scroll 0 0 transparent;
#maincontent ul.appli_nav li a:hover{ border-color:-moz-use-text-color -moz-use-text-color -moz-use-text-color #BBBBBB;
background-color:#f0f0f0; border-style:none none none solid;
border:1px solid #cddeea; border-width:medium medium medium 1px;
clear:none;
margin:3px 0 0 0;
padding:0;
width:110px;
}
#maincontent form fieldset.storyFieldsetAction label,
#maincontent form fieldset.storyFieldsetAction legend {
display:none;
}
#maincontent form fieldset.storyFieldsetAction select {
margin:0 5px;
} }
\ No newline at end of file
www/templates/default/Procurement/BidList.tpl.php
+ 11
− 11
View file @ 731afb59
...@@ -31,8 +31,7 @@ WDN.loadCSS("/wdn/templates_3.0/css/content/form.css"); ...@@ -31,8 +31,7 @@ WDN.loadCSS("/wdn/templates_3.0/css/content/form.css");
<option>Select action...</option> <option>Select action...</option>
<?php if ($parent->context->options['view'] === 'manager') : ?> <?php if ($parent->context->options['view'] === 'manager') : ?>
<option value="approved" disabled="disabled">Add to Approved</option> <option value="approved" disabled="disabled">Add to Approved</option>
<option value="pending" disabled="disabled">Move to Pending/Embargoed</option> <option value="pending" disabled="disabled">Move to Pending</option>
<option value="recommend" disabled="disabled">Recommend</option>
<?php endif ?> <?php endif ?>
<option value="delete" disabled="disabled">Delete</option> <option value="delete" disabled="disabled">Delete</option>
</select> </select>
...@@ -42,12 +41,13 @@ WDN.loadCSS("/wdn/templates_3.0/css/content/form.css"); ...@@ -42,12 +41,13 @@ WDN.loadCSS("/wdn/templates_3.0/css/content/form.css");
<thead> <thead>
<tr> <tr>
<th>Select</th> <th>Select</th>
<th scope="col" class="title"><a href="?view=manager&amp;status=<?php echo $status; ?>&amp;orderby=title">Bid Number</a></th> <th scope="col" class="number" width="7%"><a href="?view=manager&amp;status=<?php echo $status; ?>&amp;orderby=title">Bid Number</a></th>
<th scope="col" class="firstdate"><a href="?view=manager&amp;status=<?php echo $status; ?>&amp;orderby=starttime">Title</a></th> <th scope="col" class="title" width="36%"><a href="?view=manager&amp;status=<?php echo $status; ?>&amp;orderby=starttime">Title</a></th>
<th scope="col" class="lastdate"><a href="?view=manager&amp;status=<?php echo $status; ?>&amp;orderby=starttime">Due Date (Central)</a></th> <th scope="col" class="due_date" width="16%"><a href="?view=manager&amp;status=<?php echo $status; ?>&amp;orderby=starttime">Due Date (Central)</a></th>
<th scope="col" class="submitter"><a href="?view=manager&amp;status=<?php echo $status; ?>&amp;orderby=uid_created">Contact</a></th> <th scope="col" class="buyer"><a href="?view=manager&amp;status=<?php echo $status; ?>&amp;orderby=uid_created">Contact</a></th>
<th scope="col" class="modifier"><a href="?view=manager&amp;status=<?php echo $status; ?>&amp;orderby=uid_modified">Status</a></th> <th scope="col" class="juncture"><a href="?view=manager&amp;status=<?php echo $status; ?>&amp;orderby=uid_modified">Status</a></th>
<th scope="col" class="edit">Edit</th> <th scope="col" class="edit">Edit</th>
<th scope="col" class="date_modified">Last Modified</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -56,10 +56,11 @@ WDN.loadCSS("/wdn/templates_3.0/css/content/form.css"); ...@@ -56,10 +56,11 @@ WDN.loadCSS("/wdn/templates_3.0/css/content/form.css");
<td><input type="checkbox" name="story_<?php echo $item->id; ?>" /></td> <td><input type="checkbox" name="story_<?php echo $item->id; ?>" /></td>
<td><?php echo $item->number; ?></td> <td><?php echo $item->number; ?></td>
<td><?php echo $item->title; ?></td> <td><?php echo $item->title; ?></td>
<td><?php echo date("M j, Y g:i a", strtotime($item->date_due)) ?></td> <td><?php echo date("m/d/y g:i a", strtotime($item->date_due)) ?></td>
<td><?php echo $item->buyer; ?></td> <td><?php echo $item->buyer; ?></td>
<td><?php echo $item->juncture; ?></td> <td><?php echo $item->juncture; ?></td>
<td><a href="?view=edit&amp;id=<?php echo $item->id; ?>">Edit</a></td> <td style="background:#E6FFDF;font-size:1.2em"><a href="?view=edit&amp;id=<?php echo $item->id; ?>">Edit</a></td>
<td style="font-size:.8em;line-height:1.2em;color:#999"><?php echo $item->uid_modified; ?><br /><?php echo date("n/j/y H:i", strtotime($item->date_modified)); ?></td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
...@@ -76,8 +77,7 @@ WDN.loadCSS("/wdn/templates_3.0/css/content/form.css"); ...@@ -76,8 +77,7 @@ WDN.loadCSS("/wdn/templates_3.0/css/content/form.css");
<option>Select action...</option> <option>Select action...</option>
<?php if ($parent->context->options['view'] === 'manager') : ?> <?php if ($parent->context->options['view'] === 'manager') : ?>
<option value="approved" disabled="disabled">Add to Approved</option> <option value="approved" disabled="disabled">Add to Approved</option>
<option value="pending" disabled="disabled">Move to Pending/Embargoed</option> <option value="pending" disabled="disabled">Move to Pending</option>
<option value="recommend" disabled="disabled">Recommend</option>
<?php endif ?> <?php endif ?>
<option value="delete" disabled="disabled">Delete</option> <option value="delete" disabled="disabled">Delete</option>
</select> </select>
......
www/templates/default/Procurement/Manager.tpl.php
+ 8
− 5
View file @ 731afb59
...@@ -4,19 +4,22 @@ ...@@ -4,19 +4,22 @@
<div class="three_col left"> <div class="three_col left">
<p>Bids with a "Yes" in the "Feat." column are featured on <a href="http://procurement.unl.edu/bids/">http://procurement.unl.edu/bids/</a></p> <p>Bids under the approved tab are displayed on <a href="http://procurement.unl.edu/bids/">http://procurement.unl.edu/bids/</a></p>
</div> </div>
<div class="col right"> <div class="col right">
<ul class="appli_nav"> <div class="zenbox cool">
<li><a href="add.php">Add a Bid</a></li> <h3>Menu</h3>
<li><a href="main.php?logout">Logout</a></li> <ul>
<li><a href="<?php echo UNL_Procurement_Controller::getURL(); ?>?view=edit">Add New Bid</a></li>
<li><a href="<?php echo UNL_Procurement_Controller::getURL(); ?>?logout">Logout</a></li>
</ul> </ul>
</div>
</div> </div>
<div class="clear" style="margin-bottom:40px"></div> <div class="clear"></div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment