diff --git a/wysiwyg_template.admin.inc b/wysiwyg_template.admin.inc index ad70f8c..8f6ffd2 100644 --- a/wysiwyg_template.admin.inc +++ b/wysiwyg_template.admin.inc @@ -66,9 +66,9 @@ function wysiwyg_template_template_form($something, $form_state, $template = NUL // Add the current values as defaults to the form, if editing an existing item. $form_state['values'] = $template; } - - $form = array(); + $form = array(); + $form['#attributes']['enctype'] = 'multipart/form-data'; $form['title'] = array( '#type' => 'textfield', '#title' => t('Template Name'), @@ -92,6 +92,32 @@ function wysiwyg_template_template_form($something, $form_state, $template = NUL '#default_value' => isset($form_state['values']['description']) ? $form_state['values']['description'] : '', '#description' => t('A description to be shown with the template.') ); + // load image if it has one + $image = ''; + if (isset($form_state['values']['fid']) && $form_state['values']['fid']) { + $image_uri = file_load($form_state['values']['fid'])->uri; + if ($image_uri) { + $image = theme('image_style', array('style_name' => 'wysiwyg_template_thumbnail', 'path' => $image_uri)); + } + } + $form['template_image'] = array( + '#type' => 'file', + '#title' => t('Choose a file'), + '#size' => 22, + '#description' => t('A image to be shown with the template.'), + '#prefix' => $image, + ); + $form['template_image_fid'] = array( + '#type' => 'hidden', + '#default_value' => isset($form_state['values']['fid']) ? $form_state['values']['fid'] : 0, + ); + // add delete button if it has an image + if (isset($form_state['values']['fid']) && $form_state['values']['fid']) { + $form['template_image_delete'] = array( + '#type' => 'checkbox', + '#title' => t('Delete the Template image.') + ); + } $form['body'] = array( '#type' => 'textarea', '#title' => t('HTML Template'), @@ -142,13 +168,42 @@ function wysiwyg_template_template_form_submit($form, &$form_state) { // delete confirmation provided if (isset($form_state['values']['delete'])){ if ($form_state['values']['delete'] === TRUE) { + // delete image if one was uploaded + if (!empty($form_state['values']['template_image_fid'])) { + file_delete($form_state['values']['template_image_fid']); + } wysiwyg_template_delete_template($form_state['values']['name']); drupal_set_message(t('The template has been deleted.')); $form_state['redirect'] = 'admin/config/content/wysiwyg-templates'; return; } } - + // drop image if selected and checked + if (isset($form_state['values']['template_image_delete']) && $form_state['values']['template_image_delete']) { + file_delete(file_load($form_state['values']['template_image_fid'])); + // unset the fid previously used + $form_state['values']['template_image_fid'] = 0; + } + // prepare file if needed + $filepath = 'public://wysiwyg_template_images/'; + file_prepare_directory($filepath, FILE_CREATE_DIRECTORY); + // save the image, validate it against file_validate_extensions + $file = file_save_upload('template_image', array('file_validate_extensions' => array('jpg png gif jpeg')), $filepath); + if ($file) { + // set status to permanent + $file->status = FILE_STATUS_PERMANENT; + $file = file_save($file); + if ($file) { + $form_state['values']['fid'] = $file->fid; + // delete previous file if it had one + if ($form_state['values']['template_image_fid']) { + file_delete(file_load($form_state['values']['template_image_fid'])); + } + } + } + else { + $form_state['values']['fid'] = $form_state['values']['template_image_fid']; + } // save the template if(wysiwyg_template_save_template($form_state['values'])){ drupal_set_message(t('The template has been saved.')); diff --git a/wysiwyg_template.install b/wysiwyg_template.install index 38ebf1d..297e00b 100644 --- a/wysiwyg_template.install +++ b/wysiwyg_template.install @@ -21,6 +21,12 @@ function wysiwyg_template_schema() { 'type' => 'varchar', 'length' => 255, 'not null' => TRUE), + 'fid' => array( + 'description' => 'The {file_managed}.fid of the image.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0), 'body' => array( 'description' => 'The Wysiwyg template HTML', 'type' => 'text'), @@ -84,3 +90,17 @@ function wysiwyg_template_update_7200() { db_add_primary_key('wysiwyg_templates', array('name')); db_drop_field('wysiwyg_templates', 'tid'); } + +/** + * Add the fid table field + */ +function wysiwyg_template_update_7201() { + // Create name field and populate it. + db_add_field('wysiwyg_templates', 'fid', array( + 'description' => 'The {file_managed}.fid of the image.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0) + ); +} \ No newline at end of file diff --git a/wysiwyg_template.module b/wysiwyg_template.module index a4b6e4d..75056ed 100644 --- a/wysiwyg_template.module +++ b/wysiwyg_template.module @@ -18,7 +18,7 @@ function wysiwyg_template_menu() { 'title' => 'Wysiwyg templates', 'description' => 'Create and modify Wysiwyg templates', 'page callback' => 'wysiwyg_template_overview', - 'access arguments' => array('administer filters'), + 'access arguments' => array('administer wysiwyg templates'), 'file' => 'wysiwyg_template.admin.inc', ); //list template @@ -32,7 +32,7 @@ function wysiwyg_template_menu() { 'title' => 'Add Template', 'page callback' => 'drupal_get_form', 'page arguments' => array('wysiwyg_template_template_form'), - 'access arguments' => array('administer filters'), + 'access arguments' => array('administer wysiwyg templates'), 'type' => MENU_LOCAL_TASK, 'file' => 'wysiwyg_template.admin.inc', ); @@ -41,7 +41,7 @@ function wysiwyg_template_menu() { 'title' => 'Edit Template', 'page callback' => 'drupal_get_form', 'page arguments' => array('wysiwyg_template_template_form', 5), - 'access arguments' => array('administer filters'), + 'access arguments' => array('administer wysiwyg templates'), 'type' => MENU_CALLBACK, 'parent' => 'admin/config/content/wysiwyg-templates', 'file' => 'wysiwyg_template.admin.inc', @@ -50,7 +50,7 @@ function wysiwyg_template_menu() { 'title' => 'Import Template', 'page callback' => 'drupal_get_form', 'page arguments' => array('wysiwyg_template_import_form'), - 'access arguments' => array('administer filters'), + 'access arguments' => array('import wysiwyg templates'), 'type' => MENU_LOCAL_TASK, 'file' => 'wysiwyg_template.admin.inc', ); @@ -58,7 +58,7 @@ function wysiwyg_template_menu() { 'title' => 'Export Template', 'page callback' => 'drupal_get_form', 'page arguments' => array('wysiwyg_template_export_form', 5), - 'access arguments' => array('administer filters'), + 'access arguments' => array('administer wysiwyg templates'), 'type' => MENU_CALLBACK, 'parent' => 'admin/config/content/wysiwyg-templates', 'file' => 'wysiwyg_template.admin.inc', @@ -68,7 +68,7 @@ function wysiwyg_template_menu() { 'title' => 'Delete Template', 'page callback' => 'drupal_get_form', 'page arguments' => array('wysiwyg_template_delete_confirm'), - 'access arguments' => array('administer filters'), + 'access arguments' => array('administer wysiwyg templates'), 'file' => 'wysiwyg_template.admin.inc', 'type' => MENU_CALLBACK, ); @@ -90,6 +90,23 @@ function wysiwyg_template_menu() { } /** + * Implements hook_permission(). + */ +function wysiwyg_template_permission() { + $perms = array(); + $perms['administer wysiwyg templates'] = array( + 'title' => t('Administer WYSIWYG Templates'), + 'description' => t('Create, edit and delete WYSIWYG templates.'), + ); + $perms['import wysiwyg templates'] = array( + 'title' => t('Import WYSIWYG Templates'), + 'description' => t('Import WYSIWYG templates from exported code.'), + 'restrict access' => TRUE, + ); + return $perms; +} + +/** * Wysiwyg template Wildcard menu loader - prepare item for the create/modify admin form * * @param $name @@ -110,47 +127,47 @@ function wysiwyg_template_wysiwyg_plugin($editorName, $version) { switch ($editorName) { case 'tinymce': return array( - 'template' => array( - 'buttons' => array('template' => t('Insert templates')), - 'url' => 'http://drupal.org/project/wysiwyg_template', - 'internal' => TRUE, - 'options' => array( - 'template_external_list_url' => url('wysiwyg-templates/' . $editorName . '/list'), //load the javascript template list - //'template_selected_content_classes' => variable_get('wysiwyg_template_selected_content_classes', ''), - //'template_replace_values' => array('caption' => 'Replace with this content') - ), - 'extended_valid_elements' => array( //tinymce specific - allows additional elements to be used - 'img[id|class|src|border=0|alt|title|width|height|align|name|style]', - ), - 'load' => TRUE, - ), + 'template' => array( + 'buttons' => array('template' => t('Insert templates')), + 'url' => 'http://drupal.org/project/wysiwyg_template', + 'internal' => TRUE, + 'options' => array( + 'template_external_list_url' => url('wysiwyg-templates/' . $editorName . '/list'), //load the javascript template list + //'template_selected_content_classes' => variable_get('wysiwyg_template_selected_content_classes', ''), + //'template_replace_values' => array('caption' => 'Replace with this content') + ), + 'extended_valid_elements' => array( //tinymce specific - allows additional elements to be used + 'img[id|class|src|border=0|alt|title|width|height|align|name|style]', + ), + 'load' => TRUE, + ), ); break; case 'ckeditor': return array( - 'templates' => array( - 'buttons' => array('Templates' => t('Insert templates')), - 'url' => 'http://drupal.org/project/wysiwyg_template', - 'internal' => TRUE, - 'options' => array( - 'templates_files' => array(url('wysiwyg-templates/' . $editorName . '/list')), //load the javascript template list + 'templates' => array( + 'buttons' => array('Templates' => t('Insert templates')), + 'url' => 'http://drupal.org/project/wysiwyg_template', + 'internal' => TRUE, + 'options' => array( + 'templates_files' => array(url('wysiwyg-templates/' . $editorName . '/list')), //load the javascript template list 'templates_replaceContent' => false, - ), - 'load' => FALSE, - ), + ), + 'load' => FALSE, + ), ); break; case 'fckeditor': return array( - 'templates' => array( - 'buttons' => array('Templates' => t('Insert templates')), - 'url' => 'http://drupal.org/project/wysiwyg_template', - 'internal' => TRUE, - 'options' => array( - 'TemplatesXmlPath' => array(url('wysiwyg-templates/' . $editorName . '/list')), //load the javascript template list - ), - 'load' => FALSE, - ), + 'templates' => array( + 'buttons' => array('Templates' => t('Insert templates')), + 'url' => 'http://drupal.org/project/wysiwyg_template', + 'internal' => TRUE, + 'options' => array( + 'TemplatesXmlPath' => array(url('wysiwyg-templates/' . $editorName . '/list')), //load the javascript template list + ), + 'load' => FALSE, + ), ); break; } @@ -175,6 +192,7 @@ function wysiwyg_template_features_api() { * Generate javascript for template loading */ function wysiwyg_template_list_js($editorName){ + global $base_url; //don't cache templates drupal_add_http_header('CacheControl', 'no-cache'); drupal_add_http_header('Expires', '-1'); @@ -185,23 +203,21 @@ function wysiwyg_template_list_js($editorName){ print 'var tinyMCETemplateList = '; $outArray = array(); foreach($templates as $template){ - $outArray[] = array( - $template['title'], - url('wysiwyg-templates/' . $editorName . '/load/') . $template['name'], - $template['description'], - ); + $outArray[] = array( + $template['title'], + url('wysiwyg-templates/' . $editorName . '/load/') . $template['name'], + $template['description'], + ); } print json_encode($outArray) . ";"; break; case 'ckeditor': - print "CKEDITOR.addTemplates( 'default', { templates:"; - //todo: include an image with templates... - //imagesPath : CKEDITOR.getUrl( CKEDITOR.plugins.getPath( 'templates' ) + 'templates/images/' ), + print "CKEDITOR.addTemplates( 'default', { imagesPath:'". $base_url ."', templates: "; // load the templates into the json array structure foreach($templates as &$template){ - $template['html'] = $template['body']; - unset($template['body']); - unset($template['name']); + $template['html'] = $template['body']; + unset($template['body']); + unset($template['tid']); } print json_encode($templates); print "});"; @@ -210,11 +226,11 @@ function wysiwyg_template_list_js($editorName){ print ''; print ''; foreach($templates as $template){ - print ''; + print ''; } print ''; break; @@ -233,7 +249,7 @@ function wysiwyg_template_html_print($body, $editorName){ drupal_add_http_header('Content-Type', 'text/javascript; charset=UTF-8'); switch($editorName){ case 'tinymce': - print $body; + print $body; break; } } @@ -257,6 +273,7 @@ function wysiwyg_template_load_template($name){ $tItem = array( 'title' => $template->title, 'description' => $template->description, + 'fid' => $template->fid, 'body' => $template->body, 'name' => $name, ); @@ -269,12 +286,22 @@ function wysiwyg_template_load_template($name){ * Wysiwyg load all templates from the database */ function wysiwyg_template_load_all(){ + global $base_url; $templateResults = db_query("SELECT * FROM {wysiwyg_templates}"); $templates = array(); foreach ($templateResults as $dbTemplate) { + //get the image + $image = file_load($dbTemplate->fid)->uri; + if ($image) { + $image = str_replace($base_url, "", image_style_url('wysiwyg_template_thumbnail', $image)); + } + else { + $image = ""; + } $template = array( 'title' => $dbTemplate->title, 'description' => $dbTemplate->description, + 'image' => $image, 'body' => token_replace($dbTemplate->body), 'name' => $dbTemplate->name, ); @@ -291,6 +318,7 @@ function wysiwyg_template_save_template($template) { 'name' => $template['name'], 'title' => $template['title'], 'description' => $template['description'], + 'fid' => $template['fid'], 'body' => $template['body'], ); @@ -310,3 +338,24 @@ function wysiwyg_template_delete_template($name){ function wysiwyg_template_name_exists($name) { return (bool) db_query('SELECT 1 FROM {wysiwyg_templates} WHERE name = :name', array(':name' => $name))->fetchField(); } + +/** + * Implements hook_image_default_styles(). + */ +function wysiwyg_template_image_default_styles() { + $styles = array(); + // supply the default image thumbnail style + $styles['wysiwyg_template_thumbnail'] = array( + 'effects' => array( + array( + 'name' => 'image_resize', + 'data' => array( + 'width' => 100, + 'height' => 70, + ), + 'weight' => 0, + ), + ), + ); + return $styles; +} \ No newline at end of file