summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/comment/views/admin_comments.html.php2
-rw-r--r--modules/gallery/helpers/module.php19
-rw-r--r--modules/gallery/views/admin_themes.html.php8
-rw-r--r--modules/tag/css/tag.css114
-rw-r--r--modules/tag/helpers/tag.php2
-rw-r--r--modules/tag/helpers/tag_theme.php1
-rw-r--r--modules/tag/js/tag.js22
-rw-r--r--modules/tag/views/admin_tags.html.php8
-rw-r--r--modules/user/views/admin_users.html.php2
9 files changed, 153 insertions, 25 deletions
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index e32a843f..8f719f05 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -38,7 +38,7 @@
<h1> <?= t("Manage Comments") ?> </h1>
<!-- @todo: Highlight active menu option -->
- <div id="g-admin-comments-menu" class="g-clearfix">
+ <div id="g-admin-comments-menu" class="ui-helper-clearfix">
<?= $menu ?>
</div>
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index eab94500..fb298959 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -50,8 +50,20 @@ class module_Core {
* @param string $module_name
*/
static function get($module_name) {
- // @todo can't easily use model_cache here because it throw an exception on missing models.
- return ORM::factory("module", array("name" => $module_name));
+ if (empty(self::$modules[$module_name])) {
+ return ORM::factory("module", array("name" => $module_name));
+ }
+ return self::$modules[$module_name];
+ }
+
+ /**
+ * Get the information about a module
+ * @returns ArrayObject containing the module information from the module.info file or false if
+ * not found
+ */
+ static function info($module_name) {
+ $module_list = self::available();
+ return isset($module_list->$module_name) ? $module_list->$module_name : false;
}
/**
@@ -79,7 +91,8 @@ class module_Core {
$modules = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
foreach (glob(MODPATH . "*/module.info") as $file) {
$module_name = basename(dirname($file));
- $modules->$module_name = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
+ $modules->$module_name =
+ new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
$m =& $modules->$module_name;
$m->installed = self::is_installed($module_name);
$m->active = self::is_active($module_name);
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index a75d9f04..f7e77a01 100644
--- a/modules/gallery/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
@@ -14,7 +14,7 @@
<div id="g-site-theme">
<h2> <?= t("Gallery theme") ?> </h2>
- <div class="g-block g-selected g-clearfix">
+ <div class="g-block g-selected ui-helper-clearfix">
<img src="<?= url::file("themes/{$site}/thumbnail.png") ?>"
alt="<?= html::clean_attribute($themes[$site]->name) ?>" />
<h3> <?= $themes[$site]->name ?> </h3>
@@ -29,7 +29,7 @@
<? foreach ($themes as $id => $info): ?>
<? if (!$info->site) continue ?>
<? if ($id == $site) continue ?>
- <div class="g-block g-clearfix">
+ <div class="g-block ui-helper-clearfix">
<a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
<img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
alt="<?= html::clean_attribute($info->name) ?>" />
@@ -52,7 +52,7 @@
<div id="g-admin-theme">
<h2> <?= t("Admin theme") ?> </h2>
- <div class="g-block g-selected g-clearfix">
+ <div class="g-block g-selected ui-helper-clearfix">
<img src="<?= url::file("themes/{$admin}/thumbnail.png") ?>"
alt="<?= html::clean_attribute($themes[$admin]->name) ?>" />
<h3> <?= $themes[$admin]->name ?> </h3>
@@ -67,7 +67,7 @@
<? foreach ($themes as $id => $info): ?>
<? if (!$info->admin) continue ?>
<? if ($id == $admin) continue ?>
- <div class="g-block g-clearfix">
+ <div class="g-block ui-helper-clearfix">
<a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
<img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
alt="<?= html::clean_attribute($info->name) ?>" />
diff --git a/modules/tag/css/tag.css b/modules/tag/css/tag.css
new file mode 100644
index 00000000..b718de05
--- /dev/null
+++ b/modules/tag/css/tag.css
@@ -0,0 +1,114 @@
+#g-tag-cloud ul {
+ font-size: 1.2em;
+ text-align: justify;
+}
+
+#g-tag-cloud ul li {
+ display: inline;
+ line-height: 1.5em;
+ text-align: justify;
+}
+
+#g-tag-cloud ul li a {
+ text-decoration: none;
+}
+
+#g-tag-cloud ul li span {
+ display: none;
+}
+
+#g-tag-cloud ul li.size1 a {
+ color: #9cf;
+ font-size: 80%;
+ font-weight: 100;
+}
+
+#g-tag-cloud ul li.size2 a {
+ color: #69f;
+ font-size: 90%;
+ font-weight: 300;
+}
+
+#g-tag-cloud ul li.size3 a {
+ color: #69c;
+ font-size: 100%;
+ font-weight: 500;
+}
+
+#g-tag-cloud ul li.size4 a {
+ color: #369;
+ font-size: 110%;
+ font-weight: 700;
+}
+
+#g-tag-cloud ul li.size5 a {
+ color: #0e2b52;
+ font-size: 120%;
+ font-weight: 900;
+}
+
+#g-tag-cloud ul li.size6 a {
+ color: #0e2b52;
+ font-size: 130%;
+ font-weight: 900;
+}
+
+#g-tag-cloud ul li.size7 a {
+ color: #0e2b52;
+ font-size: 140%;
+ font-weight: 900;
+}
+
+#g-tag-cloud ul li a:hover {
+ color: #f30;
+ text-decoration: underline;
+}
+
+/* Tag admin ~~~~~~~~~~~~~~ */
+
+#g-tag-admin {
+ table-layout: fixed;
+}
+
+#g-tag-admin td {
+ border: 0;
+}
+
+#g-tag-admin ul {
+ padding-bottom: .3em;
+}
+
+#g-tag-admin li {
+ padding: .1em 0 .2em .3em;
+}
+
+#g-tag-admin .g-column {
+ float: left;
+ width: 200px;
+}
+
+#g-edit-tag-form input {
+ padding: 0 .2em 0 .2em;
+ clear: none;
+ float: left;
+ margin: 0 .2em 0 0;
+}
+
+#g-edit-tag-form input[type="text"].g-error {
+ border: 2px solid red;
+ background: none;
+}
+
+#g-edit-tag-form input[type="submit"] {
+ height: 25px;
+}
+
+#g-edit-tag-form a, #g-edit-tag-form span {
+ display: block;
+ float: left;
+ padding: .2em .2em 0 .1em;
+}
+
+#g-edit-tag-form span {
+ float: right;
+}
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index a2104e9d..b1d79458 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -111,7 +111,7 @@ class tag_Core {
}
static function get_rename_form($tag) {
- $form = new Forge("admin/tags/rename/$tag->id", "", "post", array("id" => "g-rename-tag-form"));
+ $form = new Forge("admin/tags/rename/$tag->id", "", "post", array("id" => "g-edit-tag-form", "class" => "g-short-form"));
$group = $form->group("rename_tag")->label(t("Rename Tag"));
$group->input("name")->label(t("Tag name"))->value($tag->name)->rules("required|length[1,64]");
$group->inputs["name"]->error_messages("in_use", t("There is already a tag with that name"));
diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php
index 4f22d2ac..e3743824 100644
--- a/modules/tag/helpers/tag_theme.php
+++ b/modules/tag/helpers/tag_theme.php
@@ -21,6 +21,7 @@ class tag_theme_Core {
static function head($theme) {
$theme->css("jquery.autocomplete.css");
$theme->script("jquery.autocomplete.js");
+ $theme->css("tag.css");
$theme->script("tag.js");
}
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index e2e6b782..17845272 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -8,8 +8,8 @@ function ajaxify_tag_form() {
success: function(data) {
if (data.result == "success") {
$.get($("#g-tag-cloud").attr("title"), function(data, textStatus) {
- $("#g-tag-cloud").html(data);
- });
+ $("#g-tag-cloud").html(data);
+ });
}
$("#g-tag form").resetForm();
}
@@ -18,10 +18,10 @@ function ajaxify_tag_form() {
function closeEditInPlaceForms() {
// closes currently open inplace edit forms
- if ($("#g-rename-tag-form").length) {
+ if ($("#g-edit-tag-form").length) {
$("#g-edit-error-message").remove();
- var li = $("#g-rename-tag-form").parent();
- $("#g-rename-tag-form").parent().html($("#g-rename-tag-form").parent().data("revert"));
+ var li = $("#g-edit-tag-form").parent();
+ $("#g-edit-tag-form").parent().html($("#g-edit-tag-form").parent().data("revert"));
li.height("");
$(".g-editable", li).bind("click", editInPlace);
$(".g-dialog-link", li).gallery_dialog();
@@ -41,7 +41,7 @@ function editInPlace(element) {
var tag_name = $(this).html();
var tag_width = $(this).width();
$(this).parent().data("revert", $(this).parent().html());
- var form = '<form id="g-rename-tag-form" method="post" class="ui-helper-clearfix" ';
+ var form = '<form id="g-edit-tag-form" method="post" class="g-inline ui-helper-clearfix" ';
form += 'action="' + TAG_RENAME_URL.replace('__ID__', tag_id) + '">';
form += '<input name="csrf" type="hidden" value="' + csrf_token + '" />';
form += '<input id="name" name="name" type="text" class="textbox" value="' +
@@ -52,14 +52,14 @@ function editInPlace(element) {
// add edit form
$(this).parent().html(form);
- $("#g-rename-tag-form #name")
+ $("#g-edit-tag-form #name")
.width(tag_width+30)
.focus();
- //$("#g-rename-tag-form").parent().height( $("#g-rename-tag-form").height() );
- $("#g-rename-tag-form a").bind("click", closeEditInPlaceForms);
+ //$("#g-edit-tag-form").parent().height( $("#g-edit-tag-form").height() );
+ $("#g-edit-tag-form a").bind("click", closeEditInPlaceForms);
ajaxify_editInPlaceForm = function() {
- $("#g-rename-tag-form").ajaxForm({
+ $("#g-edit-tag-form").ajaxForm({
dataType: "json",
success: function(data) {
if (data.result == "success") {
@@ -68,7 +68,7 @@ function editInPlace(element) {
console.log(data);
window.location.reload();
} else if (data.result == "error") {
- $("#g-rename-tag-form #name")
+ $("#g-edit-tag-form #name")
.addClass("g-error")
.focus();
$("#g-tag-admin").before("<p id=\"g-edit-error-message\" class=\"g-error\">" + data.message + "</p>");
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index 27813a91..edc466bb 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -3,8 +3,8 @@
var TAG_RENAME_URL = <?= html::js_string(url::site("admin/tags/rename/__ID__")) ?>;
$("document").ready(function() {
// using JS for adding link titles to avoid running t() for each tag
- $("#g-tag-admin .tag-name").attr("title", <?= t("Click to edit this tag")->for_js() ?>);
- $("#g-tag-admin .delete-link").attr("title", $(".delete-link:first span").html());
+ $("#g-tag-admin .g-tag-name").attr("title", <?= t("Click to edit this tag")->for_js() ?>);
+ $("#g-tag-admin .g-delete-link").attr("title", $(".g-delete-link:first span").html());
// In-place editing for tag admin
$(".g-editable").bind("click", editInPlace);
@@ -47,10 +47,10 @@
<? endif ?>
<li>
- <span id="g-tag-<?= $tag->id ?>" class="g-editable tag-name"><?= html::clean($tag->name) ?></span>
+ <span id="g-tag-<?= $tag->id ?>" class="g-editable g-tag-name"><?= html::clean($tag->name) ?></span>
<span class="g-understate">(<?= $tag->count ?>)</span>
<a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
- class="g-dialog-link delete-link g-button">
+ class="g-dialog-link g-delete-link g-button">
<span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
</li>
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 899e0b68..cee7c1eb 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -106,7 +106,7 @@
</div>
</div>
-<div id="g-group-admin" class="g-block g-clearfix">
+<div id="g-group-admin" class="g-block ui-helper-clearfix">
<a href="<?= url::site("admin/users/add_group_form") ?>"
class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
title="<?= t("Create a new group")->for_html_attr() ?>">
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 16:04:58 +0000