← Back to branch summary

~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to lib/Controller/Schedule.php

  • Committer: Dan Garner
  • Date: 2016-02-01 11:09:24 UTC
  • mfrom: (454.4.85)
  • Revision ID: git-v1:c2a7712fa4fd339a76780537fc77492c50667b9d
Merge pull request #135 from dasgarner/develop

Fixes for alpha3

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Controller/Schedule.php
145
145
            $editable = $this->isEventEditable($row->displayGroups);
146
146
 
147
147
            // Event Title
148
 
            $title = sprintf(__('%s scheduled on %s'), ($row->campaign == '') ? $row->command : $row->campaign, $displayGroupList);
 
148
            $title = sprintf(__('[%s to %s] %s scheduled on %s (Order: %d)'),
 
149
                Date::getLocalDate($row->fromDt),
 
150
                Date::getLocalDate($row->toDt),
 
151
                ($row->campaign == '') ? $row->command : $row->campaign,
 
152
                $displayGroupList,
 
153
                $row->displayOrder
 
154
            );
149
155
 
150
156
            // Event URL
151
 
            $url = ($editable) ? $this->urlFor('schedule.edit.form', ['id' => $row->eventId]) : '#';
 
157
            $editUrl = ($this->isApi()) ? 'schedule.edit' : 'schedule.edit.form';
 
158
            $url = ($editable) ? $this->urlFor($editUrl, ['id' => $row->eventId]) : '#';
152
159
 
153
160
            // Classes used to distinguish between events
154
161
            //$class = 'event-warning';