Merge branch 'ryerson-history' into 2.5.x-saas

Conflicts:
	airtime_mvc/application/views/scripts/menu.phtml
This commit is contained in:
Naomi Aro 2013-09-02 15:52:43 -04:00
commit 682a37894b
156 changed files with 38382 additions and 4637 deletions

View file

@ -0,0 +1,37 @@
<form>
<?php $form = $this->element ?>
<dl class="zend_form">
<?php $name = "his_file_id"; ?>
<dd id="<?php echo $name;?>-element">
<?php echo $form->getElement($name); ?>
</dd>
<?php foreach ($form->getSubForm('his_file_template') as $index=>$el): ?>
<?php $name = $el->getName(); ?>
<dt id="<?php echo $name;?>-label">
<label for="<?php echo $name;?>"><?php echo $el->getLabel() ?></label>
</dt>
<dd id="<?php echo $name;?>-element">
<?php echo $el ?>
<?php if ($el->hasErrors()): ?>
<ul class='errors'>
<?php foreach($el->getMessages() as $error): ?>
<li><?php echo $error; ?></li>
<?php endforeach; ?>
</ul>
<?php endif; ?>
</dd>
<?php endforeach; ?>
<dd id="submitButtons-element">
<?php foreach (array("his_file_save", "his_file_cancel") as $name): ?>
<?php echo $form->getElement($name); ?>
<?php endforeach;?>
</dd>
</dl>
</form>

View file

@ -0,0 +1,86 @@
<form>
<?php $form = $this->element ?>
<dl class="zend_form">
<?php $formErrors = $form->getErrorMessages() ?>
<?php if (count($formErrors) > 0) : ?>
<ul class='errors'>
<?php foreach ($formErrors as $error): ?>
<li><?php echo $error; ?></li>
<?php endforeach; ?>
</ul>
<?php endif; ?>
<?php $name = "his_item_id"; ?>
<dd id="<?php echo $name;?>-element">
<?php echo $form->getElement($name); ?>
</dd>
<?php foreach (array("his_item_starts", "his_item_ends") as $name): ?>
<dt id="<?php echo $name;?>-label">
<label for="<?php echo $name;?>"><?php echo $form->getElement($name)->getLabel() ?></label>
</dt>
<dd id="<?php echo $name;?>-element">
<div class="well">
<div id="<?php echo $name;?>_datetimepicker" class="input-append date">
<?php echo $form->getElement($name) ?>
<span class="add-on">
<i data-time-icon="icon-time" data-date-icon="icon-calendar"></i>
</span>
</div>
</div>
<?php if ($form->getElement($name)->hasErrors()) : ?>
<ul class='errors'>
<?php foreach ($form->getElement($name)->getMessages() as $error): ?>
<li><?php echo $error; ?></li>
<?php endforeach; ?>
</ul>
<?php endif; ?>
</dd>
<?php endforeach;?>
<dd id="his_choose_instance">
<div>
<label for="<?php echo $name;?>"><?php echo _("Choose Show Instance") ?></label>
</div>
<div>
<?php $select = $form->getElement("his_instance_select"); ?>
<?php if (isset($select)): ?>
<?php echo $select; ?>
<?php else: ?>
<select id="his_instance_select">
<option value="0"><?php echo _("No Show") ?></option>
</select>
<?php endif; ?>
<button class="btn" type="button" id="his_instance_retrieve"><?php echo _("Find") ?></button>
</div>
</dd>
<?php foreach ($form->getSubForm('his_item_template') as $index=>$el): ?>
<?php $name = $el->getName(); ?>
<dt id="<?php echo $name;?>-label">
<label for="<?php echo $name;?>"><?php echo $el->getLabel() ?></label>
</dt>
<dd id="<?php echo $name;?>-element">
<?php echo $el ?>
<?php if ($el->hasErrors()): ?>
<ul class='errors'>
<?php foreach($el->getMessages() as $error): ?>
<li><?php echo $error; ?></li>
<?php endforeach; ?>
</ul>
<?php endif; ?>
</dd>
<?php endforeach; ?>
<dd id="submitButtons-element">
<?php foreach (array("his_item_save", "his_item_cancel") as $name): ?>
<?php echo $form->getElement($name); ?>
<?php endforeach;?>
</dd>
</dl>
</form>

View file

@ -7,13 +7,18 @@
<span class="down"><?php echo _($page->getLabel()); ?></span>
</a>
<ul class="sub">
<?php foreach ($page->getPages() as $sub) :
if($sub->getId() == "manage_folder"){
continue;
} ?>
<?php if($this->navigation()->accept($sub)) : ?>
<li>
<a href="<?php echo $sub->getHref(); ?>" <?php echo ($sub->getTarget() != "")?"target=\"".$sub->getTarget()."\"":""; ?>><?php echo _($sub->getLabel()); ?></a>
</li>
<?php endif; ?>
<?php endforeach; ?>
</ul>
<?php else: ?>

View file

@ -0,0 +1 @@
<?php echo $this->form; ?>

View file

@ -1,4 +1,25 @@
<div id="history_content" class="ui-widget ui-widget-content block-shadow alpha-block padded">
<?php echo $this->date_form; ?>
<table id="history_table" cellpadding="0" cellspacing="0" class="datatable"></table>
<?php echo $this->date_form; ?>
<div id="his-tabs">
<ul>
<?php if ($this->userType != UTYPE_HOST): ?>
<li><a href="#his-tabs-1"><?php echo _("Log Sheet"); ?></a></li>
<li><a href="#his-tabs-2"><?php echo _("File Summary"); ?></a></li>
<?php endif; ?>
<li><a href="#his-tabs-3"><?php echo _("Show Summary"); ?></a></li>
</ul>
<?php if ($this->userType != UTYPE_HOST): ?>
<div id="his-tabs-1">
<table id="history_table_list" cellpadding="0" cellspacing="0" class="datatable"></table>
</div>
<div id="his-tabs-2">
<table id="history_table_aggregate" cellpadding="0" cellspacing="0" class="datatable"></table>
</div>
<?php endif; ?>
<div id="his-tabs-3">
<div id="history_show_summary"></div>
</div>
</div>
</div>

View file

@ -0,0 +1,3 @@
<div id="configure_item_template" class="ui-widget ui-widget-content block-shadow alpha-block padded-strong">
<?php echo $this->render('playouthistorytemplate/template-contents.phtml'); ?>
</div>

View file

@ -0,0 +1,67 @@
<div id="history_template" class="ui-widget ui-widget-content block-shadow alpha-block padded-strong">
<div>
<div><h4>Log Sheet Templates</h4></div>
<ul id="template_list">
<?php if (count($this->template_list) == 0): ?>
<li>No Log Sheet Templates</li>
<?php endif; ?>
<?php foreach ($this->template_list as $id=>$name): ?>
<?php if (count($this->template_list) == 0): ?>
<li>No Log Sheet Templates</li>
<?php endif; ?>
<?php if (in_array($id, $this->configured)): ?>
<li data-template="<?php echo $id; ?>" data-name="<?php echo $name; ?>" class="template_configured">
<a class="template_name" href="<?php echo $this->baseUrl("Playouthistorytemplate/configure-template/id/{$id}"); ?>">
<?php echo $name; ?>
</a>
<i class="icon icon-ok"></i>
<?php else: ?>
<li data-template="<?php echo $id; ?>" data-name="<?php echo $name; ?>">
<a class="template_name" href="<?php echo $this->baseUrl("Playouthistorytemplate/configure-template/id/{$id}"); ?>">
<?php echo $name; ?>
</a>
<a class="template_remove" href="<?php echo $this->baseUrl("Playouthistorytemplate/delete-template/id/{$id}"); ?>">
<i class="icon icon-trash"></i>
</a>
<a class="template_default" href="<?php echo $this->baseUrl("Playouthistorytemplate/set-template-default/format/json/id/{$id}"); ?>">
Set Default
</a>
<?php endif; ?>
</li>
<?php endforeach; ?>
</ul>
<button id="new_item_template" class="btn">New Log Sheet Template</button>
</div>
<br><br>
<div>
<div><h4>File Summary Templates</h4></div>
<ul id="template_file">
<?php if (count($this->template_file) == 0): ?>
<li>No File Summary Templates</li>
<?php endif; ?>
<?php foreach ($this->template_file as $id=>$name): ?>
<?php if (in_array($id, $this->configured)): ?>
<li data-template="<?php echo $id; ?>" data-name="<?php echo $name; ?>" class="template_configured">
<a class="template_name" href="<?php echo $this->baseUrl("Playouthistorytemplate/configure-template/id/{$id}"); ?>">
<?php echo $name; ?>
</a>
<i class="icon icon-ok"></i>
<?php else: ?>
<li data-template="<?php echo $id; ?>" data-name="<?php echo $name; ?>">
<a class="template_name" href="<?php echo $this->baseUrl("Playouthistorytemplate/configure-template/id/{$id}"); ?>">
<?php echo $name; ?>
</a>
<a class="template_remove" href="<?php echo $this->baseUrl("Playouthistorytemplate/delete-template/id/{$id}"); ?>">
<i class="icon icon-trash"></i>
</a>
<a class="template_default" href="<?php echo $this->baseUrl("Playouthistorytemplate/set-template-default/format/json/id/{$id}"); ?>">
Set Default
</a>
<?php endif; ?>
</li>
<?php endforeach; ?>
</ul>
<button id="new_file_template" class="btn">New File Summary Template</button>
</div>
</div>

View file

@ -0,0 +1,83 @@
<?php if ($this->template_type == Application_Service_HistoryService::TEMPLATE_TYPE_FILE): ?>
<h4>Creating File Summary Template</h4>
<?php else: ?>
<h4>Creating Log Sheet Template</h4>
<?php endif; ?>
<div class="template_name_wrap">
<label>
Name
<input id="template_name" type="text" value="<?php echo $this->template_name; ?>">
</label>
<?php $i = 0;
$usedFileMD = array();
?>
<ul class="template_item_list">
<?php foreach ($this->template_fields as $field): ?>
<?php if($field["isFileMd"]) {
$usedFileMD[] = $field["name"];
} ?>
<li id="<?php echo "field_".$i?>"
data-id="<?php echo isset($field["id"]) ? $field["id"] : ""; ?>"
data-name="<?php echo $field["name"]?>"
data-label="<?php echo $field["label"]?>"
data-type="<?php echo $field["type"]?>"
data-filemd="<?php echo var_export($field["isFileMd"], true)?>"
class="<?php echo ($field["isFileMd"]) ? 'field_filemd' : 'field_other' ?>">
<span><?php echo $field["label"]?></span>
<span><?php echo $field["type"]?></span>
<?php if(!in_array($field["name"], $this->required_fields)): ?>
<span class="template_item_remove">
<i class="icon icon-trash"></i>
</span>
<?php endif; ?>
</li>
<?php $i++; ?>
<?php endforeach; ?>
</ul>
</div>
<div class="add_more">
<p>Add more elements:</p>
<ul class="template_file_md">
<?php foreach ($this->fileMD as $md): ?>
<?php if(in_array($md["name"], $usedFileMD)) {
continue;
} ?>
<li id="<?php echo "md_".$md["name"]?>"
data-name="<?php echo $md["name"]?>"
data-type="<?php echo $md["type"]?>"
data-label="<?php echo $md["label"]?>">
<?php echo $md["label"] ?>
<a class="field_add" href="#"><i class="icon icon-plus"></i></a>
</li>
<?php endforeach; ?>
</ul>
<?php if ($this->template_type !== Application_Service_HistoryService::TEMPLATE_TYPE_FILE): ?>
<div class="template_item_add">
<input type="text" placeholder="Add New Field">
<select>
<?php foreach ($this->fields as $field): ?>
<option value="<?php echo $field; ?>"><?php echo $field; ?></option>
<?php endforeach; ?>
</select>
<button class="btn"><i class="icon-white icon-plus"></i> Add</button>
</div>
<?php endif; ?>
</div>
<div>
<?php if (!in_array($this->template_id, $this->configured)): ?>
<button id="template_set_default" data-template="<?php echo $this->template_id; ?>" class="btn">Set Default Template</button>
<?php endif; ?>
<button id="template_item_save" data-template="<?php echo $this->template_id; ?>" class="btn">Save</button>
</div>