+
';
-
- foreach($userRoles as $role=>$label) {
+ foreach ($userRoles as $role => $label) {
echo '';
- echo $view->formCheckbox('commenting_moderate_roles[]', $role,
- array('checked'=> in_array($role, $moderateRoles) ? 'checked' : '')
- );
+ echo $view->formCheckbox('commenting_moderate_roles[]', $role, array(
+ 'checked' => in_array($role, $moderateRoles) ? 'checked' : '',
+ ));
echo $label;
echo ' ';
}
@@ -91,49 +155,45 @@
-
-
+
+
-
-
+
+
';
-
- foreach($userRoles as $role=>$label) {
+ foreach ($userRoles as $role => $label) {
echo '';
- echo $view->formCheckbox('commenting_comment_roles[]', $role,
- array('checked'=> in_array($role, $commentRoles) ? 'checked' : '')
- );
+ echo $view->formCheckbox('commenting_comment_roles[]', $role, array(
+ 'checked' => in_array($role, $commentRoles) ? 'checked' : '',
+ ));
echo $label;
echo ' ';
-
}
echo '';
?>
-
-
+
+
-
+
';
- foreach($userRoles as $role=>$label) {
+ foreach ($userRoles as $role => $label) {
echo '';
- echo $view->formCheckbox('commenting_reqapp_comment_roles[]', $role,
- array('checked'=> in_array($role, $reqAppCommentRoles) ? 'checked' : '')
- );
+ echo $view->formCheckbox('commenting_reqapp_comment_roles[]', $role, array(
+ 'checked' => in_array($role, $reqAppCommentRoles) ? 'checked' : '',
+ ));
echo $label;
echo ' ';
-
}
echo '';
?>
@@ -143,15 +203,14 @@
-
-
+
+
-
@@ -159,21 +218,21 @@
- formCheckbox('commenting_allow_public_view', null,
- array('checked'=> (bool) get_option('commenting_allow_public_view') ? 'checked' : '',
- )
- ); ?>
+
+ formCheckbox('commenting_allow_public_view', null, array(
+ 'checked' => (bool) get_option('commenting_allow_public_view') ? 'checked' : '',
+ )); ?>
-
-
-
+
+
+
';
- foreach($userRoles as $role=>$label) {
+ foreach ($userRoles as $role=> $label) {
echo '';
- echo $view->formCheckbox('commenting_view_roles[]', $role,
- array('checked'=> in_array($role, $viewRoles) ? 'checked' : '')
- );
+ echo $view->formCheckbox('commenting_view_roles[]', $role, array(
+ 'checked' => in_array($role, $viewRoles) ? 'checked' : '',
+ ));
echo $label;
echo ' ';
}
@@ -182,22 +241,22 @@
reCAPTCHA', "" . __('security settings') . "");?>
-
-
+
+
-
diff --git a/views/helpers/GetCommentForm.php b/views/helpers/GetCommentForm.php
new file mode 100644
index 0000000..d791c44
--- /dev/null
+++ b/views/helpers/GetCommentForm.php
@@ -0,0 +1,17 @@
+post) {
+ $form->isValid(unserialize($commentSession->post));
+ }
+ unset($commentSession->post);
+ return $form;
+ }
+ }
+}
diff --git a/views/helpers/GetComments.php b/views/helpers/GetComments.php
new file mode 100644
index 0000000..62a0500
--- /dev/null
+++ b/views/helpers/GetComments.php
@@ -0,0 +1,137 @@
+getRequest();
+ $params = $request->getParams();
+
+ if ($record) {
+ $record_type = get_class($record);
+ $record_id = $record->id;
+ }
+ else {
+ $record_type = $this->_getRecordType($params);
+ $record_id = $this->_getRecordId($params);
+ }
+
+ $db = get_db();
+ $commentTable = $db->getTable('Comment');
+ $searchParams = array(
+ 'record_type' => $record_type,
+ 'record_id' => $record_id,
+ );
+ if (isset($options['approved'])) {
+ $searchParams['approved'] = $options['approved'];
+ }
+
+ if (!is_allowed('Commenting_Comment', 'update-approved')) {
+ $searchParams['flagged'] = 0;
+ $searchParams['is_spam'] = 0;
+ }
+
+ $select = $commentTable->getSelectForFindBy($searchParams);
+ if (isset($options['order'])) {
+ $select->order("ORDER BY added " . $options['order']);
+ }
+ return $commentTable->fetchObjects($select);
+ }
+
+ /**
+ * Helper to get record id from request params.
+ *
+ * @see plugins/Commenting/forms/CommentForm.php
+ *
+ * @todo To be merged.
+ */
+ private function _getRecordId($params)
+ {
+ if (isset($params['module'])
+ && $params['module'] == 'commenting'
+ && $params['controller'] == 'comment'
+ && $params['action'] == 'add'
+ ) {
+ return $params['record_id'];
+ }
+
+ if (isset($params['module'])) {
+ switch ($params['module']) {
+ case 'exhibit-builder':
+ $view = get_view();
+ // ExhibitBuilder uses slugs in the params, so need to
+ // negotiate around those to dig up the record_id and model.
+ if (isset($view->exhibit) && isset($view->exhibit_pages)) {
+ $id = $view->exhibit->id;
+ }
+ elseif (isset($view->exhibit_page)) {
+ $id = $view->exhibit_page->id;
+ }
+//todo: check the ifs for an exhibit showing an item
+ elseif (isset($params['item_id'])) {
+ $id = $params['item_id'];
+ }
+ else {
+ $id = isset($params['id']) ? $params['id'] : null;
+ }
+ break;
+
+ default:
+ $id = isset($params['id']) ? $params['id'] : null;
+ break;
+ }
+ }
+ // Default for collections, items and files.
+ else {
+ $id = $params['id'];
+ }
+ return $id;
+ }
+
+ /**
+ * Helper to get record type from request params.
+ *
+ * @see plugins/Commenting/forms/CommentForm.php
+ *
+ * @todo To be merged.
+ */
+ private function _getRecordType($params)
+ {
+ if (isset($params['module'])
+ && $params['module'] == 'commenting'
+ && $params['controller'] == 'comment'
+ && $params['action'] == 'add'
+ ) {
+ return $params['record_type'];
+ }
+
+ if (isset($params['module'])) {
+ switch ($params['module']) {
+ case 'exhibit-builder':
+ $view = get_view();
+ // ExhibitBuilder uses slugs in the params, so need to
+ // negotiate around those to dig up the record_id and model.
+ if (isset($view->exhibit) && isset($view->exhibit_pages)) {
+ $model = 'Exhibit';
+ }
+ elseif (isset($view->exhibit_page)) {
+ $model = 'ExhibitPage';
+ }
+// Todo: check the ifs for an exhibit showing an item.
+ else {
+ $model = 'Item';
+ }
+ break;
+
+ default:
+ $model = Inflector::camelize($params['module']) . ucfirst( $params['controller'] );
+ break;
+ }
+ }
+ // Default for collections, items and files.
+ else {
+ $model = ucfirst(Inflector::singularize($params['controller']));
+ }
+ return $model;
+ }
+}
diff --git a/views/public/comments.php b/views/public/comments.php
deleted file mode 100644
index 42e440a..0000000
--- a/views/public/comments.php
+++ /dev/null
@@ -1,20 +0,0 @@
-
+
formText('commenting_wpapi_key', get_option('commenting_wpapi_key'),
- array('size'=> 45)
- );?>
+ array('size' => 45)
+ );?>
-
-
-
-
-
-
-
- $comments)); ?>
-
-
- partial('threaded-comments.php', array('comments' => $comments, 'parent_id'=>null)); ?>
-
-
-
\ No newline at end of file
diff --git a/views/public/comment.php b/views/public/common/comment.php
similarity index 52%
rename from views/public/comment.php
rename to views/public/common/comment.php
index a97bf58..6195165 100644
--- a/views/public/comment.php
+++ b/views/public/common/comment.php
@@ -1,7 +1,7 @@
- partial('comment.php', array('comment' => $comment)); ?>
-
-
-
-
author_name)) {
- if(empty($comment->author_url)) {
+ if (!empty($comment->author_name)) {
+ if (empty($comment->author_url)) {
$authorText = $comment->author_name;
} else {
$authorText = "{$comment->author_name}";
@@ -17,9 +17,9 @@
echo "
";
?>
-body; ?>
-
-flagged): ?> style='display:none;' >
-flagged): ?>style='display:none;' >
+body; ?>
+
+flagged): ?> style='display:none;' >
+flagged): ?>style='display:none;' >
diff --git a/views/public/common/comments.php b/views/public/common/comments.php new file mode 100644 index 0000000..3def07b --- /dev/null +++ b/views/public/common/comments.php @@ -0,0 +1,24 @@ +
+
+
+
+
+
+
+
+
+
+ $comments)); ?>
+
+
+
+
+ partial('common/threaded-comments.php', array('comments' => $comments, 'parent_id' => null)); ?>
+
+
+
diff --git a/views/public/common/threaded-comments.php b/views/public/common/threaded-comments.php
new file mode 100644
index 0000000..ac4649e
--- /dev/null
+++ b/views/public/common/threaded-comments.php
@@ -0,0 +1,11 @@
+
+ parent_comment_id == $parent_id): ?>
+
+ partial('common/comment.php', array('comment' => $comment)); ?>
+
+
+
+
+ partial('common/comment.php', array('comment' => $comment)); ?>
+
+
+
diff --git a/views/public/css/commenting.css b/views/public/css/commenting.css
index 823221f..23f0486 100644
--- a/views/public/css/commenting.css
+++ b/views/public/css/commenting.css
@@ -1,38 +1,38 @@
-
/* desperate attempts to prevent crazy padding across themes */
div#comments-container div {
- padding: 2px !important;
- margin: 2px !important;
- clear: both;
+ padding: 2px !important;
+ margin: 2px !important;
+ clear: both;
}
div#comments-container label {
- padding: 2px !important;
- margin: 2px !important;
+ padding: 2px !important;
+ margin: 2px !important;
}
div#comments-container div.comment-body {
- margin-left: 100px !important;
- margin-top: 12px !important;
- min-height: 60px;
- padding: 6px;
+ margin-left: 100px !important;
+ margin-top: 12px !important;
+ min-height: 60px;
+ padding: 6px;
}
/* end desperation */
form#comment-form {
- clear:both;
- line-height: 1em;
+ clear:both;
+ line-height: 1em;
}
-form#comment-form input, form#comment-form textarea {
+form#comment-form input,
+form#comment-form textarea {
height: inherit;
font-size: 14px;
line-height: 1em;
}
div#comment-main-container {
- max-width: 550px;
+ max-width: 550px;
}
div#comments-container div.comment-children {
@@ -40,59 +40,61 @@ div#comments-container div.comment-children {
}
div.comment {
- margin-left: 12px;
- margin-top: 3px;
- margin-bottom: 6px;
- clear: both;
- min-height: 80px;
- width: 60%;
- min-width: 400px;
+ margin-left: 12px;
+ margin-top: 3px;
+ margin-bottom: 6px;
+ clear: both;
+ min-height: 80px;
+ width: 60%;
+ min-width: 400px;
}
div.comment-author {
- float: left;
- margin: 0 6px;
- width: 100px;
+ float: left;
+ margin: 0 6px;
+ width: 100px;
}
-.comment-flag , .comment-unflag {
- float:left;
+.comment-flag,
+.comment-unflag {
+ float: left;
cursor: pointer;
}
div.comment-flagged {
- background-color: pink;
+ background-color: #F09999;
}
-
div.comment-body p {
- font-size: 1em;
+ font-size: 1em;
}
.comment-reply {
- cursor: pointer;
- float: right;
+ cursor: pointer;
+ float: right;
}
p.comment-author-name {
- margin: 0;
+ margin: 0;
}
div.success {
font-size: 1.8em;
}
-
+.errors {
+ color: red;
+}
input.hidden {
- display:none;
+ display:none;
}
-span.comment-flag, span.comment-unflag {
+span.comment-flag,
+span.comment-unflag {
padding-left: 6px;
cursor: pointer;
}
a.mceButton {
- overflow: inherit;
-
-}
+ overflow: inherit;
+}
diff --git a/views/public/javascripts/commenting.js b/views/public/javascripts/commenting.js
index 36a566b..0ba8556 100644
--- a/views/public/javascripts/commenting.js
+++ b/views/public/javascripts/commenting.js
@@ -1,52 +1,51 @@
var Commenting = {
-
- handleReply: function(event) {
- Commenting.moveForm(event);
+ handleReply: function(event) {
+ Commenting.moveForm(event);
},
-
+
finalizeMove: function() {
- jQuery('#comment-form-body_parent').attr('style', '')
+ jQuery('#comment-form-body_parent').attr('style', '');
+ },
+
+ moveForm: function(event) {
+ //first make tinyMCE go away so it is safe to move around in the DOM
+ tinyMCE.execCommand('mceRemoveControl', false, 'comment-form-body');
+ jQuery('#comment-form').insertAfter(event.target);
+ commentId = Commenting.getCommentId(event.target);
+ jQuery('#parent-id').val(commentId);
+ tinyMCE.execCommand('mceAddControl', false, 'comment-form-body');
+ },
+
+ flag: function(event) {
+ var commentId = Commenting.getCommentId(event.target);
+ var json = {'id': commentId };
+ jQuery.post(Commenting.pluginRoot + "flag", json, Commenting.flagResponseHandler);
},
-
- moveForm: function(event) {
- //first make tinyMCE go away so it is safe to move around in the DOM
- tinyMCE.execCommand('mceRemoveControl', false, 'comment-form-body');
- jQuery('#comment-form').insertAfter(event.target);
- commentId = Commenting.getCommentId(event.target);
- jQuery('#parent-id').val(commentId);
- tinyMCE.execCommand('mceAddControl', false, 'comment-form-body');
- },
-
- flag: function(event) {
- var commentId = Commenting.getCommentId(event.target);
- var json = {'id': commentId };
- jQuery.post(Commenting.pluginRoot + "flag", json, Commenting.flagResponseHandler);
- },
unflag: function(event) {
var commentId = Commenting.getCommentId(event.target);
- var json = {'id': commentId };
+ var json = {'id': commentId };
jQuery.post(Commenting.pluginRoot + "unflag", json, Commenting.flagResponseHandler);
- },
-
- flagResponseHandler: function(response, status, jqxhr) {
- var comment = jQuery('#comment-' + response.id);
- if(response.action == 'flagged') {
- comment.find('div.comment-body').addClass('comment-flagged');
- comment.find('p.comment-flag').hide();
- comment.find('p.comment-unflag').show();
- }
-
- if(response.action == 'unflagged') {
- comment.find('div.comment-body').removeClass('comment-flagged');
- comment.find('p.comment-flag').show();
- comment.find('p.comment-unflag').hide();
- }
- },
-
- getCommentId: function(el) {
- return jQuery(el).parents('div.comment').first().attr('id').substring(8);
- }
+ },
+
+ flagResponseHandler: function(response, status, jqxhr) {
+ var comment = jQuery('#comment-' + response.id);
+ if (response.action == 'flagged') {
+ comment.find('div.comment-body').addClass('comment-flagged');
+ comment.find('p.comment-flag').hide();
+ comment.find('p.comment-unflag').show();
+ }
+
+ if (response.action == 'unflagged') {
+ comment.find('div.comment-body').removeClass('comment-flagged');
+ comment.find('p.comment-flag').show();
+ comment.find('p.comment-unflag').hide();
+ }
+ },
+
+ getCommentId: function(el) {
+ return jQuery(el).parents('div.comment').first().attr('id').substring(8);
+ }
};
/**
@@ -58,11 +57,11 @@ var Commenting = {
* defaults.
*/
-if(typeof Omeka == 'undefined' ) {
+if (typeof Omeka == 'undefined' ) {
Omeka = {};
}
-if(typeof Omeka.wysiwyg == 'undefined') {
+if (typeof Omeka.wysiwyg == 'undefined') {
Omeka.wysiwyg = function (params) {
// Default parameters
initParams = {
@@ -79,7 +78,7 @@ if(typeof Omeka.wysiwyg == 'undefined') {
media_strict: false,
width: "100%"
};
-
+
// Overwrite default params with user-passed ones.
for (var attribute in params) {
// Account for annoying scripts that mess with prototypes.
@@ -89,21 +88,17 @@ if(typeof Omeka.wysiwyg == 'undefined') {
}
tinyMCE.init(initParams);
};
-
}
-jQuery(document).ready(function() {
- jQuery('.comment-reply').click(Commenting.handleReply);
- jQuery('.comment-flag').click(Commenting.flag);
- jQuery('.comment-unflag').click(Commenting.unflag);
- var commentingWysiwyg = {
- elements: 'comment-form-body',
- mode: 'exact',
- valid_child_elements: "ul[li],ol[li]",
- theme_advanced_buttons1: "bold,italic,underline,link,bullist,numlist,|,code",
- };
- Omeka.wysiwyg(commentingWysiwyg);
+jQuery(document).ready(function() {
+ jQuery('.comment-reply').click(Commenting.handleReply);
+ jQuery('.comment-flag').click(Commenting.flag);
+ jQuery('.comment-unflag').click(Commenting.unflag);
+ var commentingWysiwyg = {
+ elements: 'comment-form-body',
+ mode: 'exact',
+ valid_child_elements: "ul[li],ol[li]",
+ theme_advanced_buttons1: "bold,italic,underline,link,bullist,numlist,|,code",
+ };
+ Omeka.wysiwyg(commentingWysiwyg);
});
-
-
-
\ No newline at end of file
diff --git a/views/public/threaded-comments.php b/views/public/threaded-comments.php
deleted file mode 100644
index 24767cb..0000000
--- a/views/public/threaded-comments.php
+++ /dev/null
@@ -1,11 +0,0 @@
-
- parent_comment_id == $parent_id): ?>
-
+ partial('common/threaded-comments.php', array('comments' => $comments, 'parent_id' => $comment->id)); ?>
+
+
- partial('comment.php', array('comment' => $comment)); ?>
-
-
-
\ No newline at end of file
- partial('threaded-comments.php', array('comments' => $comments, 'parent_id'=>$comment->id)); ?>
-
-