Remove UI elements related to kronolith "keywords"

diff --git a/kronolith/config/conf.xml b/kronolith/config/conf.xml
index 643e3e2..2aeb714 100644 (file)
--- a/kronolith/config/conf.xml
+++ b/kronolith/config/conf.xml
@@ -51,12 +51,6 @@
   </configswitch>
  </configsection>
 
- <configsection name="metadata">
-  <configheader>Metadata Settings</configheader>
-  <configboolean name="keywords" desc="Should keywords be loaded from
-   config/keywords.php to be assigned to events?">false</configboolean>
- </configsection>
-
  <configsection name="reminder">
   <configheader>Reminder Settings</configheader>
   <configstring name="server_name" desc="Server name from which reminder

diff --git a/kronolith/lib/Views/Event.php b/kronolith/lib/Views/Event.php
index c41afd2..838c90c 100644 (file)
--- a/kronolith/lib/Views/Event.php
+++ b/kronolith/lib/Views/Event.php
@@ -84,22 +84,6 @@ class Kronolith_View_Event {
         $status = Kronolith::statusToString($this->event->getStatus());
         $attendees = $this->event->getAttendees();
 
-        if ($conf['metadata']['keywords']) {
-            include KRONOLITH_BASE . '/config/keywords.php';
-            $keyword_list = array();
-            foreach ($keywords as $cat => $list) {
-                $sub_list = array();
-                foreach ($list as $entry) {
-                    if ($this->event->hasKeyword($entry)) {
-                        $sub_list[] = htmlspecialchars($entry);
-                    }
-                }
-                if (count($sub_list)) {
-                    $keyword_list[$cat] = $sub_list;
-                }
-            }
-        }
-
         if ($datetime = Util::getFormData('datetime')) {
             $datetime = new Horde_Date($datetime);
             $month = $datetime->month;

diff --git a/kronolith/templates/edit/edit.inc b/kronolith/templates/edit/edit.inc
index 8ab58d9..9167eab 100644 (file)
--- a/kronolith/templates/edit/edit.inc
+++ b/kronolith/templates/edit/edit.inc
@@ -372,39 +372,6 @@ endif;
 <?php endif; ?>
 </tbody>
 
-<?php if ($GLOBALS['conf']['metadata']['keywords']): ?>
-<!-- keywords -->
-<tr>
- <td colspan="5" class="control toggle" onclick="toggleSection('keywords')">
-  <?php echo Horde::img('tree/blank.png', '', array('id' => 'toggle_keywords'), $GLOBALS['registry']->getImageDir('horde')) . ' <strong>' . _("Keywords") ?></strong>
-  <span class="extra" id="extra_keywords"><?php echo implode(', ', $event->getKeywords()) ?></span>
- </td>
-</tr>
-<tr id="section_keywords">
- <td></td>
- <td colspan="4">
-  <table cellspacing="2">
-   <?php include KRONOLITH_BASE . '/config/keywords.php'; $count = 0 ?>
-   <?php foreach ($keywords as $cat => $list):
-       if ($count % 3 == 0): ?>
-   <tr>
-   <?php endif; ?>
-    <td valign="top">
-     <strong><?php echo $cat ?></strong><br />
-    <?php for ($k = 0; $k < count($list); ++$k): ?>
-     <input type="checkbox" class="checkbox" id="keyword<?php echo htmlspecialchars($k) ?>" name="keywords[]" value="<?php echo htmlspecialchars($list[$k]) ?>"<?php if ($event->hasKeyword($list[$k])) echo ' checked="checked"' ?> />
-     <?php echo Horde::label('keyword' . $k, htmlspecialchars($list[$k])) ?><br />
-    <?php endfor; ?>
-    </td>
-   <?php if (($count % 3 == 2) || ($count == count($keywords) - 1)): ?>
-   </tr>
-   <?php endif; ++$count ?>
-   <?php endforeach; ?>
-  </table>
- </td>
-</tr>
-<?php endif; ?>
-
 <!-- tags  -->
 <tr>
 <td colspan="5" class="control toggle" onclick="toggleSection('tags')">