diff options
author | Tim Almdal <tnalmdal@shaw.ca> | 2009-03-16 03:50:57 +0000 |
---|---|---|
committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-03-16 03:50:57 +0000 |
commit | 0bc64efa4ab183d9c98334b6c4180307fef0a51b (patch) | |
tree | 556c7ca6ce3caf57d978f1bd6de46e2e757d3ff1 /core/views | |
parent | 13a337b6cd575f884a2a9fef005c4984a88f28eb (diff) |
Thin down the scaffolding code so that all that is there is the test
data creation and the packaging code. The rest ofthe functionality is
either no longer required, or moved to the developer module (MPTT
Tree).
Also provide checking for the active user to be an admin.
Diffstat (limited to 'core/views')
-rw-r--r-- | core/views/scaffold.html.php | 311 | ||||
-rw-r--r-- | core/views/scaffold_syscheck.html.php | 68 |
2 files changed, 4 insertions, 375 deletions
diff --git a/core/views/scaffold.html.php b/core/views/scaffold.html.php index 028acd02..765464b5 100644 --- a/core/views/scaffold.html.php +++ b/core/views/scaffold.html.php @@ -62,65 +62,12 @@ margin-top: -.25em; } - div#activities { - margin-bottom: 1em; - } - - div.activity { - display: none; - } - - ul.tabs { - margin-left: 0; - padding: 1em 0 2px 1em; - white-space: nowrap; - border-bottom: 1px solid black; - } - - ul.tabs li { - display: inline; - list-style-type: none; - } - - ul.tabs a { - padding: 3px 10px; - color: #fff; - background-color: #036; - text-decoration: none; - } - - div#access { - margin-top: -20px; - padding: 0px; - padding-left: 20px; - } - - div#access ul.tabs a { - background-color: #830; - border: 1px solid white; - } - - ul.tabs a:hover { - background-color: #369; - } - fieldset { margin-left: 1em; + margin-bottom: 1em; padding-bottom: 0; } - div#photo_upload_wrap { - display: inline; - } - - div#photo_upload_wrap { - display: inline; - } - - tr.core td { - border-bottom: 1px solid black; - } - a { text-decoration: none; } @@ -129,11 +76,6 @@ text-decoration: underline; } - span.understate { - font-size: 70%; - font-style: italic; - } - a.allowed { color: green; font-size: 110%; @@ -144,11 +86,6 @@ font-size: 90%; } - ul#permissions ul { - margin-left: -1.5em; - list-style-type: none; - } - .gHide { display: none; } @@ -161,10 +98,6 @@ margin: 5px 0px 0px 1em; } </style> - <?= html::script("lib/jquery.js") ?> - <?= html::script("lib/jquery.form.js") ?> - <?= html::script("lib/jquery.cookie.js") ?> - <?= html::script("lib/jquery.MultiFile.js") ?> </head> <body> <div class="outer"> @@ -193,58 +126,9 @@ </div> <? endif ?> - <ul class="tabs"> - <li><a href="javascript:show('config')">Configuration</a></li> - <? if ($album_count > 0): ?> - <li><a href="javascript:show('actions')">Actions</a></li> - <? if (module::is_installed("user")): ?> - <li><a href="javascript:show('access')">Access</a></li> - <? endif ?> - <li><a href="javascript:show('info')">Info</a></li> - <li><a href="javascript:show('benchmarks')">Benchmarks</a></li> - <li><a href="javascript:show('docs')">Docs</a></li> - <? endif ?> - </ul> - - <div id="activities"> - <script> - show = function(show1, show2, immediate) { - if (!show1) { - show1 = "configuration"; - } else if (show1 == "access" && !show2) { - show2 = "access_users"; - } - var acts = $("div.activity"); - for (var i = 0; i < acts.length; i++) { - act = acts[i]; - if (act.id != show1 && act.id != show2) { - if (immediate) { - $("#" + act.id).hide(); - } else { - $("#" + act.id).slideUp(); - } - } else { - if (immediate) { - $("#" + act.id).show(); - } else { - $("#" + act.id).slideDown(); - } - } - } - $.cookie("show1", show1); - $.cookie("show2", show2); - } - $(document).ready(function(){ - show($.cookie("show1"), $.cookie("show2"), true); - $("#photo_upload").MultiFile(); - }); - </script> - - <div id="config" class="activity"> - <?= $syscheck ?> - </div> - - <div id="actions" class="activity"> + <div id="actions" class="activity"> + <fieldset> + <legend>Generate Test Data</legend> <p> add: [ <? foreach (array(1, 10, 50, 100, 500, 1000) as $count): ?> @@ -273,198 +157,11 @@ <? endforeach ?> ] tags </p> - <?= $add_photo_html ?> - <fieldset> - <legend>Server Side Photos</legend> - <form method="post" action="<?= url::site("scaffold/add_photos") ?>"> - <input type="submit" value="upload"/> - <input type="text" name="path" size="70" - value="<?= cookie::get("add_photos_path") ?>" /> - <br> - Album id: <input name="parent_id" type="text" size="3" value="1"/> - </form> - </fieldset> - <fieldset> - <legend>Albums</legend> - <form method="post" action="<?= url::site("albums/1") ?>"> - <input type="submit" value="create"/> - <input type="text" name="name"/> - <input type="hidden" name="type" value="album"/> - </form> </fieldset> <fieldset> <legend>Packaging</legend> <a href="<?= url::site("scaffold/package") ?>">Make Package</a> </fieldset> - </div> - - <? if (module::is_installed("user")): ?> - <div id="access" class="activity"> - <ul class="tabs"> - <li><a href="javascript:show('access', 'access_users')">Users</a></li> - <li><a href="javascript:show('access', 'access_groups')">Groups</a></li> - <li><a href="javascript:show('access', 'access_permissions')">Guest Permissions</a></li> - </ul> - - <div id="access_users" class="activity"> - <ul> - <? foreach ($users as $user): ?> - <li> - <?= $user->name ?> - <? if (!$user->admin): ?> - <?= html::anchor("scaffold/delete_user/$user->id", "[x]") ?> - <? endif ?> - <ul> - <? foreach ($user->groups as $group): ?> - <li> - <?= $group->name ?> - <? if (!$group->special): ?> - <?= html::anchor("scaffold/remove_from_group/$group->id/$user->id", "[x]") ?> - <? endif ?> - </li> - <? endforeach ?> - <li> - <form method="post" action="<?= url::site("scaffold/add_to_group/$user->id") ?>"> - <input type="text" name="group_name"/> - </form> - </li> - </ul> - </li> - <? endforeach ?> - </ul> - <fieldset> - <legend>Add User</legend> - <form method="post" action="<?= url::site("scaffold/add_user") ?>"> - <input name="user_name" type="text"/> - <input type="submit" value="create"/> - <input type="checkbox" name="admin"/> Admin - </form> - </fieldset> - </div> - - <div id="access_groups" class="activity"> - <ul> - <? foreach ($groups as $group): ?> - <li> - <?= $group->name ?> - <? if (!$group->special): ?> - <?= html::anchor("scaffold/delete_group/$group->id", "[x]") ?> - <? endif ?> - </li> - <? endforeach ?> - </ul> - <fieldset> - <legend>Add Group</legend> - <form method="post" action="<?= url::site("scaffold/add_group") ?>"> - <input name="group_name" type="text"/> - <input type="submit" value="create"/> - </form> - </fieldset> - </div> - - <div id="access_permissions" class="activity"> - <? if ($album_tree): ?> - <? $stack = array(1); // hardcoded to the root album ?> - <? while ($stack): ?> - <? $current = array_pop($stack); ?> - <? if ($current != "CLOSE"): ?> - <? $current = $album_tree[$current]; ?> - <ul id="permissions"> - <li> - <span class="understate">(<?= $current->album->id ?>)</span> - <?= html::anchor("albums/{$current->album->id}", $current->album->title) ?> - » - <? foreach (array("view", "view_full", "edit") as $perm): ?> - <?= $perm != "view" ? " ---- " : "" ?> - <? if (access::group_can(group::everybody(), $perm, $current->album)): ?> - <?= html::anchor("scaffold/deny_perm/1/$perm/{$current->album->id}", strtoupper($perm), array("class" => "allowed")) ?> - <? else: ?> - <?= html::anchor("scaffold/add_perm/1/$perm/{$current->album->id}", strtolower($perm), array("class" => "denied")) ?> - <? endif ?> - <? endforeach ?> - <? if ($current->album->id != 1): ?> - <span class="understate"> - (<?= html::anchor("scaffold/reset_all_perms/1/{$current->album->id}", "reset") ?>) - </span> - <? endif; ?> - <? $stack[] = "CLOSE"; ?> - <? if ($current->children): ?> - <? $stack = array_merge($stack, $current->children) ?> - <? endif ?> - <? else: ?> - </li> - </ul> - <? endif ?> - <? endwhile ?> - <? endif ?> - </div> - </div> - <? endif ?> - - <div id="info" class="activity"> - <ul> - <li> <?= html::anchor("scaffold/mptt?type=text", "MPTT tree (text)") ?> </li> - <li> - <?= html::anchor("scaffold/mptt", "MPTT tree (graph)") ?> - <i>(requires /usr/bin/dot from the graphviz package)</i> - </li> - <? if ($deepest_photo): ?> - <li> - <?= html::anchor("photos/{$deepest_photo->id}", "Deepest photo") ?> - <i>(<?= $deepest_photo->level ?> levels deep)</i> - </li> - <? endif ?> - <? if ($deepest_album): ?> - <li> - <?= html::anchor("albums/{$deepest_album->id}", "Deepest album") ?> - <i>(<?= $deepest_album->level ?> levels deep)</i> - </li> - <? endif ?> - <? if ($most_tagged): ?> - <li> - <?= html::anchor("items/{$most_tagged->id}", "Most tagged item") ?> - <i>(<?= $most_tagged->count ?> tags)</i> - </li> - <? endif ?> - </ul> - </div> - - <div id="benchmarks" class="activity"> - <ul> - <li> - <?= html::anchor("scaffold/i18n/build", "Make Translation") ?> - </li> - <li> - <?= html::anchor("scaffold/i18n/run", "Run Translation") ?> - </li> - </ul> - </div> - - <div id="docs" class="activity"> - <ul> - <li> - <a href="http://codex.gallery2.org/Gallery3:Features">Gallery3: Features</a> - </li> - <li> - <a href="http://gallery.svn.sourceforge.net/viewvc/gallery/trunk/eval/gx/ui/HTML/index.html">Mockups</a> - </li> - <li> - <a href="http://www.nabble.com/Rough-Gallery-3-time-line-td20240153.html">Rough Timeline</a> (as of Oct 29, 2008) - </li> - <li> - <a href="http://codex.gallery2.org/Gallery3:About">Gallery3: About Page</a> - </li> - <li> - <a href="http://codex.gallery2.org/Gallery3:Coding_Standards">Gallery3: Coding Standards</a> - </li> - <li> - <a href="http://docs.kohanaphp.com/">Kohana Documentation</a> - </li> - <li> - <a href="http://jkwebs.de/gallery/gx_admin/">Admin wireframes</a> - </li> - </ul> - </div> </div> </div> </div> diff --git a/core/views/scaffold_syscheck.html.php b/core/views/scaffold_syscheck.html.php deleted file mode 100644 index 7dbb4b9f..00000000 --- a/core/views/scaffold_syscheck.html.php +++ /dev/null @@ -1,68 +0,0 @@ -<?php defined("SYSPATH") or die("No direct script access.") ?> -<? foreach ($errors as $error): ?> -<div class="block"> - <p class="error"> - <?= $error->message ?> - </p> - <? foreach ($error->instructions as $line): ?> - <pre><?= $line ?></pre> - <? endforeach ?> - - <? if (!empty($error->message2)): ?> - <p class="error"> - <?= $error->message2 ?> - </p> - <? endif ?> -</div> -<? endforeach ?> - -<? if (empty($errors)): ?> -<div class="block"> - <? if (!module::is_installed("core")): ?> - <p class="success"> - Your system is ready, but Gallery is not yet installed. - </p> - <p> - <?= html::anchor("scaffold/install/core", "install gallery") ?> - </p> - <? else: ?> - <p class="success"> - Your Gallery is ready with the following modules installed: - </p> - <table style="width: 400px"> - <tr> - <th align="left">Name</th> - <th align="left">Installed</th> - <th align="left">Available</th> - <th align="left">Action</th> - </tr> - <tr class="core"> - <td> <b> core </b> </td> - <td> <b> <?= module::get_version("core") ?> </b> </td> - <td> <b> <?= module::get_version("core") ?> </b> </td> - <td> <b> <?= html::anchor("scaffold/uninstall/core", "reset install") ?> </b> </td> - </tr> - <? foreach ($modules as $module_name => $info): ?> - <? if ($module_name == "core") continue; ?> - <tr> - <td><?= $module_name ?></td> - <td><?= $info->installed ?></td> - <td><?= $info->version ?></td> - <td> - <? if ($info->installed): ?> - <?= html::anchor("scaffold/uninstall/{$module_name}", "uninstall") ?> - <? else: ?> - <?= html::anchor("scaffold/install/{$module_name}", "install") ?> - <? endif ?> - </td> - </tr> - <? endforeach; ?> - <tr> - <td colspan="3" align="center"> - <button onclick="document.location.href='<?= url::site("scaffold/install/*") ?>'">Install All Plugins</button> - </td> - </tr> - </table> - <? endif; ?> -</div> -<? endif ?> |