From 0bec64c6a1339a826d36015ee020bde230746a4e Mon Sep 17 00:00:00 2001 From: Henning Bostelmann Date: Mon, 29 Jun 2015 18:51:11 +0100 Subject: [PATCH] MDL-50720 mod_data: Highlight non-approved entries --- mod/data/lang/en/data.php | 1 + mod/data/lib.php | 11 ++++++++++- mod/data/styles.css | 1 + mod/data/templates.php | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/mod/data/lang/en/data.php b/mod/data/lang/en/data.php index f9ec9dcb595..cf3f7dccd6f 100644 --- a/mod/data/lang/en/data.php +++ b/mod/data/lang/en/data.php @@ -31,6 +31,7 @@ $string['addtemplate'] = 'Add template'; $string['advancedsearch'] = 'Advanced search'; $string['allowcomments'] = 'Allow comments on entries'; $string['alttext'] = 'Alternative text'; +$string['approvalstatus'] = 'Approval status'; $string['approve'] = 'Approve'; $string['approved'] = 'Approved'; $string['areacontent'] = 'Fields'; diff --git a/mod/data/lib.php b/mod/data/lib.php index 9bd39ce0cac..2a43b9af7ab 100644 --- a/mod/data/lib.php +++ b/mod/data/lib.php @@ -552,7 +552,7 @@ function data_generate_default_template(&$data, $template, $recordid=0, $form=fa if ($fields = $DB->get_records('data_fields', array('dataid'=>$data->id), 'id')) { $table = new html_table(); - $table->attributes['class'] = 'mod-data-default-template'; + $table->attributes['class'] = 'mod-data-default-template ##approvalstatus##'; $table->colclasses = array('template-field', 'template-token'); $table->data = array(); foreach ($fields as $field) { @@ -1327,6 +1327,15 @@ function data_print_template($template, $records, $data, $search='', $page=0, $r $replacement[] = ''; } + $patterns[] = '##approvalstatus##'; + if (!$data->approval) { + $replacement[] = ''; + } else if ($record->approved) { + $replacement[] = 'approved'; + } else { + $replacement[] = 'notapproved'; + } + $patterns[]='##comments##'; if (($template == 'listtemplate') && ($data->comments)) { diff --git a/mod/data/styles.css b/mod/data/styles.css index 3c28c3244fa..61b088302ba 100644 --- a/mod/data/styles.css +++ b/mod/data/styles.css @@ -64,6 +64,7 @@ .mod-data-default-template .template-token {text-align:left;} .mod-data-default-template .controls {text-align:center;} .mod-data-default-template searchcontrols {text-align:right;} +.mod-data-default-template.notapproved {background-color:#FFCCCC;} #page-mod-data-templates td.save_template, #page-mod-data-templates .template_heading { text-align:center; diff --git a/mod/data/templates.php b/mod/data/templates.php index f2c0388d2f9..bcf374d52a8 100644 --- a/mod/data/templates.php +++ b/mod/data/templates.php @@ -277,6 +277,7 @@ if ($mode != 'csstemplate' and $mode != 'jstemplate') { echo ''; echo ''; echo ''; + echo ''; if ($mode != 'singletemplate') { // more points to single template - not useable there echo '';