fix saveToCache() usage; move hook controllers around

[pharext/pharext.org] / app / views / github / repo.phtml

diff --git a/app/views/github/repo.phtml b/app/views/github/repo.phtml
index 372de5d5a6c65234e151185c037060064415b700..6000cf7e976f563952a949c8dd70876c70817960 100644 (file)
--- a/app/views/github/repo.phtml
+++ b/app/views/github/repo.phtml
@@ -20,10 +20,6 @@
        </h1>
 </div>
 
-<?php if (isset($exception)) : ?>
-       <?= $this->fetch("alert") ?>
-<?php elseif (isset($repo)) : ?>
-
 <div class="row">
        <div class="col-md-6">
                <div class="well">
@@ -119,20 +115,50 @@
        </div>
 
        <div class="col-md-6">
-               
-               <div class="row text-center">
-                       <div class="col-md-6">
-                               <form method="post" action="<?= $baseUrl->mod("./github/repo/". $repo->full_name ."/hook/add") ?>"> 
-                               <button type="submit" class="btn btn-lg btn-block btn-success <?= $this->check($repo) ? "disabled":"" ?>">Enable Hook</button>
-                               </form>
-                       </div>
+               <div class="row">
+                       <form method="post" action="<?= $baseUrl->mod("./github/repo/". $repo->full_name ."/hook/" . ($this->check($repo) ? "upd" : "add")) ?>">
+                               <div class="col-md-12">
+                                               <div class="checkbox">
+                                                       <label for="hook-tag">
+                                                               <input id="hook-tag" type="checkbox" name="tag" value="1" <?= ($hook = $this->check($repo)) && in_array("create", $hook->events) ? "checked":"" ?>>
+                                                               Automatically create a release when I push a tag.
+                                                       </label>
+                                               </div>
+                                               <div class="checkbox">
+                                                       <label for="hook-release">
+                                                               <input id="hook-release" type="checkbox" name="release" value="1" <?= ($hook = $this->check($repo)) && in_array("release", $hook->events) ? "checked":"" ?>>
+                                                               Automatically upload a PHARext package as an asset to a release.
+                                                       </label>
+                                               </div>
+                               </div>
+                               <?php if ($this->check($repo)) : ?>
+                               <div class="col-md-6">
+                                       <button type="submit" class="btn btn-lg btn-block btn-info">
+                                               <span class="glyphicon glyphicon-ok-circle"></span>
+                                               Update Hook
+                                       </button>
+                               </div>
+                               <?php else : ?>
+                               <div class="col-md-12">
+                                       <button type="submit" class="btn btn-lg btn-block btn-success">
+                                               <span class="octicon octicon-plug"></span>
+                                               Enable Hook
+                                       </button>
+                               </div>
+                               <?php endif; ?>
+                       </form>
+                       <!-- column wrapping! -->
+                       <?php if ($this->check($repo)) : ?>
                        <div class="col-md-6">
                                <form method="post" action="<?= $baseUrl->mod("./github/repo/". $repo->full_name ."/hook/del") ?>"> 
-                               <button class="btn btn-lg btn-block btn-danger <?= $this->check($repo) ? "":"disabled" ?>">Disable Hook</button>
+                               <button class="btn btn-lg btn-block btn-danger">
+                                       <span class="glyphicon glyphicon-remove-circle"></span>
+                                       Remove Hook
+                               </button>
                                </form>
                        </div>
+                       <?php endif; ?>
                </div>
-               </form>
        </div>
 </div>
 
@@ -151,7 +177,7 @@
                                <?= $this->e($v->tag->name) ?>
                                <span class="label label-default pull-right">Tag</span>
                        <?php else : ?>
-                               <?= $this->e($v->release->name) ?>
+                               <?= $this->e($v->release->name ?: $v->tag->name) ?>
                                <span class="label label-info pull-right">Release</span>
                        <?php endif; ?>
                </h3>
@@ -184,4 +210,3 @@
 </div>
 <?php endforeach; ?>
 
-<?php endif; ?>