Changeset 2406

Timestamp:

05/20/08 22:58:32 (6 months ago)

Author:

bsmith

Message:

bugzid:79852 - Disable all references to Address Book when configuration directive not enabled

Files:

• branches/release-38/lib/MT/CMS/Common.pm (modified) (1 diff)
• branches/release-38/lib/MT/Notification.pm (modified) (1 diff)
• branches/release-38/mt-static/css/structure.css (modified) (1 diff)
• branches/release-38/tmpl/cms/dialog/entry_notify.tmpl (modified) (1 diff)
• branches/release-38/tmpl/cms/edit_role.tmpl (modified) (1 diff)
• branches/release-38/tmpl/cms/include/notification_table.tmpl (modified) (1 diff)
• branches/release-38/tmpl/cms/list_notification.tmpl (modified) (2 diffs)

branches/release-38/lib/MT/CMS/Common.pm

@@ -849 +849 @@
-    $param{saved_deleted} = $q->param('saved_deleted');
-    $param{page_actions}  = $app->page_actions( 'list_' . $type );
-unless ( $param{screen_class} ) {
-    $param{screen_class} 
-}
+$param{screen_class} ||= "list-$type";
+$param{screen_id} ||
+$param{listing_screen} = 1;
-    $app->load_tmpl( "list_${type}.tmpl", \%param );
-}

branches/release-38/lib/MT/Notification.pm

@@ -27 +27 @@
-    audit => 1,
-    primary_key => 'id',
+    listing_screen => 1,
-});
-

branches/release-38/mt-static/css/structure.css

@@ -850 +850 @@
-#list-category #main-content,
-#list-folder #main-content,
+#list-notification #main-content,
-.batch-edit #main-content {
-    padding-top: 5px;

branches/release-38/tmpl/cms/dialog/entry_notify.tmpl

@@ -33 +33 @@
-        hint="<__trans phrase="Enter email addresses on separate lines, or comma separated.">">
-        <ul>
+<mt:if name="config.enableaddressbook">
-            <li><input type="checkbox" name="send_notify_list" id="send_notify_list" value="1" class="cb" checked="checked" /> <label for="send_notify_list"><__trans phrase="All addresses from Address Book"></label></li>
+</mt:if>
-            <li><textarea name="send_notify_emails" class="full-width lines-4" id="send_notify_emails" cols="" rows="3"></textarea></li>
-        </ul>

branches/release-38/tmpl/cms/edit_role.tmpl

@@ -281 +281 @@
-            <li><label for="permission-edit_categories"><input id="permission-edit_categories" type="checkbox" onclick="checkPerms(this);" class="edit_categories cb" name="permission" value="edit_categories"<mt:if name="have_access-edit_categories"> checked="checked"</mt:if><mt:if name="id"><mt:unless name="is_enabled"> disabled="disabled"</mt:unless></mt:if> /> <mt:var name="prompt-edit_categories" escape="html"></label></li>
-            <li><label for="permission-edit_tags"><input id="permission-edit_tags" type="checkbox" onclick="checkPerms(this);" class="edit_tags cb" name="permission" value="edit_tags"<mt:if name="have_access-edit_tags"> checked="checked"</mt:if><mt:if name="id"><mt:unless name="is_enabled"> disabled="disabled"</mt:unless></mt:if> /> <mt:var name="prompt-edit_tags" escape="html"></label></li>
+<mt:if name="config.enableaddressbook">
-            <li><label for="permission-edit_notifications"><input id="permission-edit_notifications" type="checkbox" onclick="checkPerms(this);" class="edit_notifications cb" name="permission" value="edit_notifications"<mt:if name="have_access-edit_notifications"> checked="checked"</mt:if><mt:if name="id"><mt:unless name="is_enabled"> disabled="disabled"</mt:unless></mt:if> /> <mt:var name="prompt-edit_notifications" escape="html"></label></li>
+</mt:if>
-            <li><label for="permission-view_blog_log"><input id="permission-view_blog_log" type="checkbox" onclick="checkPerms(this);" class="view_blog_log cb" name="permission" value="view_blog_log"<mt:if name="have_access-view_blog_log"> checked="checked"</mt:if><mt:if name="id"><mt:unless name="is_enabled"> disabled="disabled"</mt:unless></mt:if> /> <mt:var name="prompt-view_blog_log" escape="html"></label></li>
-        </ul>

branches/release-38/tmpl/cms/include/notification_table.tmpl

@@ -13 +13 @@
-        <tr class="<mt:if name="__odd__">odd<mt:else>even</mt:if>">
-            <td class="cb" id="delete-<mt:var name="id">"><input type="checkbox" name="id" value="<mt:var name="id">" class="select" /></td>
-mouseover="highlight_note(<mt:var name="id">)" onmouseout="unhighlight_note(<mt:var name="id">)" on
+
-                <span id="note-email-field-<mt:var name="id">" style="display: none">
-                    <input type="text" name="note-email-<mt:var name="id">" id="note-email-<mt:var name="id">" value="<mt:var name="email" escape="html">" />
-                </span>
-            </td>
-mouseover="highlight_note(<mt:var name="id">)" onmouseout="unhighlight_note(<mt:var name="id">)" onclick="edit_note(<mt:var name="id">); return false;"><a href="javascript:void(0)" title="<__trans phrase="Click to edit contact">"><mt:var name="url" escape="html
+click="edit_note(<mt:var name="id">); return false;"><a href="javascript:void(0)" title="<__trans phrase="Click to edit contact">"><mt:var name="url" escape="html" default="-
-                <span id="note-url-field-<mt:var name="id">" style="display: none">
-                    <input type="text" name="note-url-<mt:var name="id">" id="note-url-<mt:var name="id">" value="<mt:var name="url" escape="html">" />

branches/release-38/tmpl/cms/list_notification.tmpl

@@ -1 @@
-
+Manage 
-<mt:setvarblock name="system_msg">
-    <mt:if name="error">
@@ -173 +173 @@
-    ><__trans phrase="Delete"></a>
-</mt:setvarblock>
-
+
+
+
+
+
-<mt:include name="include/header.tmpl">
-
-<p id="create-contact"><a href="javascript:void(0)" onclick="setCreateMode()" class="icon-left icon-create"><__trans phrase="Create Contact"></a></p>
-
-<div class="create-inline" id="create-inline-notification">