зеркало из https://github.com/mozilla/gecko-dev.git
Use the user's TZ as the default when creating a party, correct grammar concerning duration unit, add a separator between party options, and convert account options from an unordered list to a paragraph.
This commit is contained in:
Родитель
200cca0069
Коммит
b7bb4c1c60
|
@ -57,7 +57,7 @@ class PartiesController extends AppController {
|
||||||
$this->set('map', 'mapInit()');
|
$this->set('map', 'mapInit()');
|
||||||
|
|
||||||
if(empty($this->data)) {
|
if(empty($this->data)) {
|
||||||
$this->set('utz', '0');
|
$this->set('utz', $_SESSION['User']['tz']);
|
||||||
$this->render();
|
$this->render();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
echo 'Venue: '.$party['Party']['vname']."<br/>\n";
|
echo 'Venue: '.$party['Party']['vname']."<br/>\n";
|
||||||
|
|
||||||
echo 'Date: '.(($party['Party']['confirmed'] == 1) ? gmdate('Y-m-d h:ia', $party['Party']['date'] + (@$_SESSION['User']['tz'] * 60 * 60))." GMT".@$_SESSION['User']['tz'] : "TBA")."<br/>\n";
|
echo 'Date: '.(($party['Party']['confirmed'] == 1) ? gmdate('Y-m-d h:ia', $party['Party']['date'] + (@$_SESSION['User']['tz'] * 60 * 60))." GMT".@$_SESSION['User']['tz'] : "TBA")."<br/>\n";
|
||||||
echo 'Duration: '.$party['Party']['duration']." hours\n<br/>";
|
echo 'Duration: '.$party['Party']['duration'].' hour'.(($party['Party']['duration'] == 1) ? '' : 's')."\n<br/>";
|
||||||
|
|
||||||
if (!empty($party['Party']['website']))
|
if (!empty($party['Party']['website']))
|
||||||
echo 'Website: <a href="'.$party['Party']['website'].'" rel="nofollow">'.$party['Party']['website']."</a><br/>\n";
|
echo 'Website: <a href="'.$party['Party']['website'].'" rel="nofollow">'.$party['Party']['website']."</a><br/>\n";
|
||||||
|
@ -54,8 +54,7 @@
|
||||||
</div>
|
</div>
|
||||||
<?php if (@$_SESSION['User']['id'] == $party['Party']['owner']):?>
|
<?php if (@$_SESSION['User']['id'] == $party['Party']['owner']):?>
|
||||||
<h1>Party options</h1>
|
<h1>Party options</h1>
|
||||||
<a href="<?php echo $html->url('/parties/edit/'.$party['Party']['id']);?>">Edit party</a>
|
<a href="<?php echo $html->url('/parties/edit/'.$party['Party']['id']);?>">Edit party</a> | <a href="<?php echo $html->url('/parties/invite/'.$party['Party']['id']);?>">Invite a guest</a>
|
||||||
<a href="<?php echo $html->url('/parties/invite/'.$party['Party']['id']);?>">Invite a guest</a>
|
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<?php if (isset($flickr)): ?>
|
<?php if (isset($flickr)): ?>
|
||||||
<h1 id="photos">Photos <a title="Photo Feed" href="<?php echo $html->url('/feeds/photos/'.$party['Party']['id']); ?>"><img src="<?php echo $html->url('/img/feed16.png'); ?>" alt="Atom"/></a></h1>
|
<h1 id="photos">Photos <a title="Photo Feed" href="<?php echo $html->url('/feeds/photos/'.$party['Party']['id']); ?>"><img src="<?php echo $html->url('/img/feed16.png'); ?>" alt="Atom"/></a></h1>
|
||||||
|
|
|
@ -54,7 +54,8 @@
|
||||||
?>
|
?>
|
||||||
</p>
|
</p>
|
||||||
<h2>Account Options</h2>
|
<h2>Account Options</h2>
|
||||||
<ul>
|
<p>
|
||||||
<li><a href="<?php echo $html->url('/users/edit'); ?>">Edit my account</a></li>
|
<a href="<?php echo $html->url('/users/edit'); ?>">Edit my account</a>
|
||||||
<li><a href="<?php echo $html->url('/users/logout'); ?>">Logout</a></li>
|
<br/>
|
||||||
</ul>
|
<a href="<?php echo $html->url('/users/logout'); ?>">Logout</a>
|
||||||
|
</p>
|
||||||
|
|
Загрузка…
Ссылка в новой задаче