, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/sites/all/modules/imce/README.txt b/sites/all/modules/imce/README.txt
new file mode 100644
index 0000000..11515ee
--- /dev/null
+++ b/sites/all/modules/imce/README.txt
@@ -0,0 +1,181 @@
+
+IMCE
+http://drupal.org/project/imce
+====================================
+
+DESCRIPTION
+-----------
+IMCE is an image/file uploader and browser that supports personal directories and quota.
+IMCE can easily be integrated into any WYSIWYG editor or any web application that needs a file browser.
+See INTEGRATION METHODS for more information.
+
+FEATURES
+-----------
+- Basic file operations: upload, delete
+- Image(jpg, png, gif) operations: resize, create thumbnails, preview
+- Support for private file system
+- Configurable limits for user roles: file size per upload, directory quota, file extensions, and image dimensions
+- Personal or shared folders for users
+- Permissions per directory
+- Ftp-like directory navigation
+- File sorting by name, size, dimensions, date
+- Tabbed interface for file operations
+- Keyboard shortcuts(up, down, insert(or enter), delete, home, end, ctrl+A, R(esize), T(humbnails), U(pload)).
+- Built-in support for inline image/file insertion into textareas
+- Multiple file selection(using ctrl or shift)
+- Ajax file operations
+- Themable layout using tpl files
+
+INSTALLATION
+-----------
+1) Copy imce directory to your modules directory
+2) Enable the module at module administration page
+3) Create configuration profiles and assign them to user roles at /admin/config/media/imce
+4) Test it at /imce.
+5) See imce-content.tpl.php for some configuration options such as inline previewing.
+6) See INTEGRATION METHODS to make IMCE collaborate with your application if it's not already integrated.
+Notes:
+ - When you configure IMCE for inline image/file insertion into textareas there should appear an IMCE link under each textarea you specified.
+ - If you are uploading files containing unicode characters, it is strongly recommended to use the transliteration module that sanitizes filenames by converting characters from unicode to us-ascii. http://drupal.org/project/transliteration
+ - If you are using CCK, you may want to check the File field sources module at http://drupal.org/project/filefield_sources
+
+
+FREQUENTLY FACED ISSUES
+-----------
+- Inaccessible/invalid directory or subdirectory:
+In some server configurations, manually(ftp or directly) created directories may not be writable by PHP(by IMCE). In this case, you have to set the chmod permissions of the directory to 0777 in order to make it writable by anyone.
+You should also make sure that in each configuration profile all of the defined directories are located under drupal's file system path which is usually "files".
+And also if "safe mode restriction" is active in your server, don't expect IMCE to run flawlessly.
+
+- Disappearing images after node submission:
+Having nothing to do with IMCE, it appeared many times in issue queues. This is an input filtering issue that can be resolved by adding ' . t('Insert !image or !link.', array('!image' => l(t('image'), 'imce', array('attributes' => array('name' => $element['#id'] . '-IMCE-image', 'class' => array('imce-inline-image')))), '!link' => l(t('link'), 'imce', array('attributes' => array('name' => $element['#id'] . '-IMCE-link', 'class' => array('imce-inline-link')))))) . '
';
+ }
+ return $element;
+}
+
+/**
+ * Returns the configuration profile assigned to a user for a specific file scheme.
+ */
+function imce_user_profile($user, $scheme = NULL) {
+ static $ups = array();
+
+ // Set scheme
+ if (empty($scheme)) {
+ $scheme = variable_get('file_default_scheme', 'public');
+ }
+
+ // Return from cache.
+ if (isset($ups[$scheme][$user->uid])) {
+ return $ups[$scheme][$user->uid];
+ }
+ $ups[$scheme][$user->uid] = FALSE;
+
+ // Check scheme
+ $swrappers = file_get_stream_wrappers();
+ if (!isset($swrappers[$scheme])) {
+ return FALSE;
+ }
+
+ $profiles = variable_get('imce_profiles', array());
+ $scinfo = array('scheme' => $scheme);
+
+ // Handle user#1 separately
+ if ($user->uid == 1) {
+ return $ups[$scheme][$user->uid] = isset($profiles[1]) ? $profiles[1] + $scinfo : FALSE;
+ }
+
+ // Handle regular users.
+ $roles_profiles = variable_get('imce_roles_profiles', array());
+ $sckey = $scheme . '_pid';
+ foreach ($roles_profiles as $rid => $conf) {
+ if (isset($user->roles[$rid]) && isset($conf[$sckey]) && isset($profiles[$conf[$sckey]])) {
+ return $ups[$scheme][$user->uid] = $profiles[$conf[$sckey]] + $scinfo;
+ }
+ }
+
+ return FALSE;
+}
+
+/**
+ * Checks if the user is assigned an imce profile.
+ * A more detailed assignment check is performed before imce loads.
+ */
+function imce_access($user = FALSE, $scheme = NULL) {
+ if ($user === FALSE) {
+ global $user;
+ }
+ return imce_user_profile($user, $scheme) ? TRUE : FALSE;
+}
+
+/**
+ * Checks access to user/{$account->uid}/imce for the $user.
+ */
+function imce_user_page_access($account, $user = FALSE) {
+ if ($user === FALSE) {
+ global $user;
+ }
+ return ($user->uid == 1 || $account->uid == $user->uid) && ($profile = imce_user_profile($account)) && $profile['usertab'];
+}
+
+/**
+ * Check if the directory name is regular.
+ */
+function imce_reg_dir($dirname) {
+ return $dirname == '.' || is_int($dirname) || (is_string($dirname) && $dirname != '' && !preg_match('@(^\s)|(^/)|(^\./)|(\s$)|(/$)|(/\.$)|(\.\.)|(//)|(\\\\)|(/\./)@', $dirname));
+}
\ No newline at end of file
diff --git a/sites/all/modules/imce/inc/imce.admin.inc b/sites/all/modules/imce/inc/imce.admin.inc
new file mode 100644
index 0000000..23529c2
--- /dev/null
+++ b/sites/all/modules/imce/inc/imce.admin.inc
@@ -0,0 +1,747 @@
+ t('Operations'), 'colspan' => 2));
+ $rows = array();
+
+ foreach ($profiles as $pid => $profile) {
+ $rows[] = array(
+ check_plain($profile['name']),
+ l(t('Edit'), 'admin/config/media/imce/profile/edit/' . $pid),
+ $pid == 1 ? '' : l(t('Delete'), 'admin/config/media/imce/profile/delete/' . $pid),
+ );
+ }
+
+ $rows[] = array('', array('data' => l(t('Add new profile'), 'admin/config/media/imce/profile'), 'colspan' => 2));
+
+ $output['title'] = array(
+ '#markup' => '' . t('Configuration profiles') . ' ',
+ );
+ $output['table'] = array(
+ '#theme' => 'table',
+ '#header' => $header,
+ '#rows' => $rows,
+ '#attributes' => array('id' => 'imce-profiles-list'),
+ );
+ $output['form'] = drupal_get_form('imce_admin_form');
+
+ // Display security warnings
+ if (empty($_POST)) {
+ $roles = variable_get('imce_roles_profiles', array());
+ if (!empty($roles[DRUPAL_ANONYMOUS_RID]['public_pid']) || !empty($roles[DRUPAL_ANONYMOUS_RID]['private_pid'])) {
+ drupal_set_message(t('Anonymous user role has access to IMCE.') . ' ' . t('Make sure this is not a misconfiguration.'), 'warning');
+ }
+ if (imce_admin_check_wildcard_upload(DRUPAL_AUTHENTICATED_RID, $roles)) {
+ drupal_set_message(t('Authenticated user role is assigned a configuration profile with unrestricted file extensions.') . ' ' . t('Make sure this is not a misconfiguration.'), 'warning');
+ }
+ }
+
+ return $output;
+}
+
+/**
+ * Admin form.
+ */
+function imce_admin_form($form, &$form_state) {
+ //roles profiles
+ $form['roles'] = array('#tree' => TRUE);
+ $roles = imce_sorted_roles();
+ $form['#weighted'] = count($roles) > 3;
+
+ foreach ($roles as $rid => $role) {
+ $core = $rid == DRUPAL_ANONYMOUS_RID || $rid == DRUPAL_AUTHENTICATED_RID;
+ $form['roles'][$rid] = imce_role_form($role, $form['#weighted'], $core);
+ }
+
+ //common settings
+ $form['common'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Common settings'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ );
+ $form['common']['textarea'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Enable inline image/file insertion into plain textareas'),
+ '#default_value' => variable_get('imce_settings_textarea', ''),
+ '#maxlength' => NULL,
+ '#description' => t('If you don\'t use any WYSIWYG editor, this feature will allow you to add your images or files as html code into any plain textarea . Enter comma separated textarea IDs under which you want to enable a link to IMCE. The * character is a wildcard. Hint: ID of Body fields in most node types starts with edit-body*.'),
+ );
+ $form['common']['absurls'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Absolute URLs'),
+ '#default_value' => variable_get('imce_settings_absurls', 0),
+ '#description' => t('Check if you want IMCE to return absolute file URLs.'),
+ );
+ $form['common']['replace'] = array(
+ '#type' => 'radios',
+ '#title' => t('Default behaviour for existing files during file uploads'),
+ '#default_value' => variable_get('imce_settings_replace', FILE_EXISTS_RENAME),
+ '#options' => array(
+ FILE_EXISTS_RENAME => t('Keep the existing file renaming the new one'),
+ FILE_EXISTS_ERROR => t('Keep the existing file rejecting the new one'),
+ FILE_EXISTS_REPLACE => t('Replace the existing file with the new one')
+ ),
+ );
+ $form['common']['thumb_method'] = array(
+ '#type' => 'radios',
+ '#title' => t('Default method for creating thumbnails'),
+ '#default_value' => variable_get('imce_settings_thumb_method', 'scale_and_crop'),
+ '#options' => array(
+ 'scale' => t('Scale the image with respect to the thumbnail dimensions.'),
+ 'scale_and_crop' => t('First scale then crop the image to fit the thumbnail dimensions.')
+ ),
+ );
+ $form['common']['disable_private'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Disable serving of private files'),
+ '#default_value' => variable_get('imce_settings_disable_private', 1),
+ '#description' => t('IMCE serves all files under private files directory without applying any access restrictions. This allows anonymous access to any file(/system/files/filename) unless there is a module restricting access to the files. Here you can disable this feature.'),
+ );
+ $form['common']['admin_theme'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Use admin theme for IMCE paths'),
+ '#default_value' => variable_get('imce_settings_admin_theme', FALSE),
+ '#description' => t('If you have user interface issues with the active theme you may consider switching to admin theme.'),
+ );
+
+ $form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration'));
+ $form['#theme'] = 'imce_admin';
+ $form['#submit'][] = 'imce_admin_submit';
+ return $form;
+}
+
+/**
+ * Admin form themed.
+ */
+function imce_admin_theme($variables) {
+ $form = $variables['form'];
+ $profile1 = imce_user1_profile();
+ $header = array(t('User role'));
+ $rows = array(array(t('Site maintenance account')));
+ $keys = array('name');
+ //add each stream wrapper as a column
+ $swrappers = file_get_stream_wrappers(STREAM_WRAPPERS_VISIBLE);
+ foreach ($swrappers as $scheme => $info) {
+ $header[] = l($info['name'], 'imce/' . $scheme);
+ $rows[0][] = check_plain($profile1['name']);
+ $keys[] = $scheme . '_pid';
+ }
+
+ //in case we need profile weights.
+ $weight_info = '';
+ if ($form['#weighted']) {
+ $header[] = t('Weight');
+ $rows[0][] = t('n/a');
+ $keys[] = 'weight';
+ $weight_info = t('For users who have multiple roles , the weight property will determine the assigned profile. Lighter roles that are placed upper will take the precedence. So, an administrator role should be placed over other roles by having a smaller weight, ie. -10.');
+ }
+
+ foreach (element_children($form['roles']) as $rid) {
+ $cells = array();
+ foreach ($keys as $key) {
+ $cells[] = drupal_render($form['roles'][$rid][$key]);
+ }
+ $rows[] = $cells;
+ }
+
+ $output = '' . t('Role-profile assignments') . ' ';
+ $output .= theme('table', array('header' => $header, 'rows' => $rows));
+ $output .= '';
+ $output .= drupal_render($form['common']);
+ $output .= drupal_render_children($form);
+ return $output;
+}
+
+/**
+ * Validate admin form.
+ */
+function imce_admin_form_validate($form, &$form_state) {
+ $roles = $form_state['values']['roles'];
+ // Check anonymous profile. Do not allow wildcard upload.
+ if ($key = imce_admin_check_wildcard_upload(DRUPAL_ANONYMOUS_RID, $roles)) {
+ form_error($form['roles'][DRUPAL_ANONYMOUS_RID][$key], t('Anonymous user role can not have a configuration profile with unrestricted file extensions.'));
+ }
+}
+
+/**
+ * Submit admin form.
+ */
+function imce_admin_submit($form, &$form_state) {
+ $roles = $form_state['values']['roles'];
+ if (count($roles) > 3) {
+ uasort($roles, 'imce_rolesort');
+ }
+ variable_set('imce_roles_profiles', $roles);
+ variable_set('imce_settings_textarea', $form_state['values']['textarea']);
+ variable_set('imce_settings_absurls', $form_state['values']['absurls']);
+ variable_set('imce_settings_replace', $form_state['values']['replace']);
+ variable_set('imce_settings_thumb_method', $form_state['values']['thumb_method']);
+ variable_set('imce_settings_disable_private', $form_state['values']['disable_private']);
+ variable_set('imce_settings_admin_theme', $form_state['values']['admin_theme']);
+ drupal_set_message(t('Changes have been saved.'));
+}
+
+/**
+ * Add-Edit-Delete profiles.
+ */
+function imce_profile_operations($op = 'add', $pid = 0) {
+ //delete
+ if ($op == 'delete') {
+ drupal_set_title(t('Delete configuration profile'));
+ return drupal_get_form('imce_profile_delete_form', $pid);
+ }
+ //add-edit
+ if ($op === 'add' || $op === 'edit') {
+ return drupal_get_form('imce_profile_form', $pid);
+ }
+ drupal_access_denied();
+}
+
+/**
+ * Profile form.
+ */
+function imce_profile_form($form, &$form_state, $pid = 0) {
+
+ if ($pid && $profile = imce_load_profile($pid)) {
+ drupal_set_title($profile['name']);
+ }
+ else {
+ $pid = 0;
+ $profile = imce_sample_profile();
+ $profile['name'] = '';
+ }
+
+ //import profile
+ if (isset($_GET['import']) && $imported = imce_load_profile($_GET['import'])) {
+ if (empty($form_state['post'])) {
+ drupal_set_message(t('Settings were imported from the profile %name', array('%name' => $imported['name'])));
+ }
+ $imported['name'] = $profile['name']; //preserve the original name.
+ $profile = $imported;
+ }
+
+ $form_state['profile'] = $profile;//store the original profile just in case.
+
+ $form = array('#tree' => TRUE);
+ $form['name'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Profile name'),
+ '#default_value' => $profile['name'],
+ '#description' => t('Give a name to this profile.'),
+ '#required' => TRUE,
+ );
+ $form['import'] = array(
+ '#markup' => imce_profile_import_html($pid),
+ );
+ $form['usertab'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Display file browser tab in user profile pages.'),
+ '#default_value' => $profile['usertab'],
+ );
+ $form['filesize'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Maximum file size per upload'),
+ '#default_value' => $profile['filesize'],
+ '#description' => t('Set to 0 to use the maximum value available.') . ' ' . t('Your PHP settings limit the maximum file size per upload to %size.', array('%size' => format_size(file_upload_max_size()))),
+ '#field_suffix' => t('MB'),
+ );
+ $form['quota'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Directory quota'),
+ '#default_value' => $profile['quota'],
+ '#description' => t('Define the upload quota per directory.') . ' ' . t('Set to 0 to use the maximum value available.'),
+ '#field_suffix' => t('MB'),
+ );
+ $form['tuquota'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Total user quota'),
+ '#default_value' => $profile['tuquota'],
+ '#description' => t('This quota measures the size of all user uploaded files in the database and does not include FTP files. You can either use both quotations together or safely ignore this by setting the value to 0.'),
+ '#field_suffix' => t('MB'),
+ );
+ $form['extensions'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Permitted file extensions'),
+ '#default_value' => $profile['extensions'],
+ '#maxlength' => 255,
+ '#description' => t('Specify the allowed file extensions for uploaded files. Separate extensions with a space and do not include the leading dot.') . ' ' . t('Set to * to remove the restriction.'),
+ );
+ $form['dimensions'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Maximum image dimensions'),
+ '#default_value' => $profile['dimensions'],
+ '#description' => t('The maximum allowed image size (e.g. 640x480). Set to 0 for no restriction. If an image toolkit is installed, files exceeding this value will be scaled down to fit.', array('!image-toolkit-link' => url('admin/config/media/image-toolkit'))),
+ '#field_suffix' => '' . t('WIDTHxHEIGHT') . ' ',
+ );
+ $form['filenum'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Maximum number of files per operation'),
+ '#default_value' => $profile['filenum'],
+ '#description' => t('You can allow users to select multiple files for operations such as delete, resize, etc. Entire batch file operation is executed in a single drupal load, which may be good. However there will be an increase in script execution time, cpu load and memory consumption possibly exceeding the limits of your server, which is really bad. For unlimited number of file handling, set this to 0.'),
+ );
+
+ //Directories
+ $form['directories']['#theme'] = 'imce_directories';
+ $form['directories']['#weight'] = 1;
+ for ($i = 0; $i < count($profile['directories']); $i++) {
+ $form['directories'][$i] = imce_directory_form($profile['directories'][$i]);
+ }
+ $form['directories'][$i] = imce_directory_form();
+ $form['directories'][$i+1] = imce_directory_form();
+
+ //Thumbnails
+ $form['thumbnails']['#theme'] = 'imce_thumbnails';
+ $form['thumbnails']['#weight'] = 2;
+ for ($i = 0; $i < count($profile['thumbnails']); $i++) {
+ $form['thumbnails'][$i] = imce_thumbnail_form($profile['thumbnails'][$i]);
+ }
+ $form['thumbnails'][$i] = imce_thumbnail_form();
+ $form['thumbnails'][$i+1] = imce_thumbnail_form();
+
+ $form = array('profile' => $form);
+ $form['pid'] = array('#type' => 'hidden', '#value' => $pid);
+ $form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration'));
+ $form['#validate'][] = 'imce_profile_validate';
+ $form['#submit'][] = 'imce_profile_submit';
+ return $form;
+}
+
+/**
+ * Profile form validate.
+ */
+function imce_profile_validate($form, &$form_state) {
+ $profile = &$form_state['values']['profile'];
+ $dim_re = '/^\d+x\d+$/';
+ $dim_error = t('Dimensions must be specified in WIDTHxHEIGHT format.');
+ // Check max image dimensions
+ if ($profile['dimensions'] && !preg_match($dim_re, $profile['dimensions'])) {
+ return form_set_error('profile][dimensions', $dim_error);
+ }
+ // Check thumbnails dimensions
+ foreach ($profile['thumbnails'] as $i => $thumb) {
+ if (trim($thumb['name']) != '' && !preg_match($dim_re, $thumb['dimensions'])) {
+ return form_set_error("profile][thumbnails][$i][dimensions", $dim_error);
+ }
+ }
+}
+
+/**
+ * Profile form submit.
+ */
+function imce_profile_submit($form, &$form_state) {
+ $profile = $form_state['values']['profile'];
+ $pid = $form_state['values']['pid'];
+ $message = $pid > 0 ? t('The changes have been saved.') : t('Profile has been added.');
+
+ //unset empty fields of directories and thumbnails.
+ imce_clean_profile_fields($profile);
+
+ //save profile.
+ $pid = imce_update_profiles($pid, $profile);
+
+ drupal_set_message($message);
+ $form_state['redirect'] = 'admin/config/media/imce/profile/edit/' . $pid;
+}
+
+/**
+ * directory settings form
+ */
+function imce_directory_form($directory = array()) {
+ if (empty($directory)) {
+ $directory = array('name' => '', 'subnav' => 0, 'browse' => 0, 'upload' => 0, 'thumb' => 0, 'delete' => 0, 'resize' => 0);
+ }
+ $form['name'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $directory['name'],
+ '#size' => 24,
+ '#maxlength' => NULL,
+ );
+ $form['subnav'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Including subdirectories'),
+ '#default_value' => $directory['subnav'],
+ );
+ $form['browse'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Browse'),
+ '#default_value' => $directory['browse'],
+ );
+ $form['upload'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Upload'),
+ '#default_value' => $directory['upload'],
+ );
+ $form['thumb'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Thumbnails'),
+ '#default_value' => $directory['thumb'],
+ );
+ $form['delete'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Delete'),
+ '#default_value' => $directory['delete'],
+ );
+ $form['resize'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Resize'),
+ '#default_value' => $directory['resize'],
+ );
+ return $form;
+}
+
+/**
+ * Directorys form themed.
+ */
+function imce_directories_theme($variables) {
+ $form = $variables['form'];
+ $rows = array();
+ $root = t('root');
+
+ foreach (element_children($form) as $key) {
+ //directory path
+ $row = array('<' . $root . '>' . '/' . drupal_render($form[$key]['name']) . '
' . drupal_render($form[$key]['subnav']));
+ unset($form[$key]['name'], $form[$key]['subnav']);
+
+ //permissions
+ $header = array();
+ foreach (element_children($form[$key]) as $perm) {
+ $header[] = $form[$key][$perm]['#title'];
+ unset($form[$key][$perm]['#title']);
+ $row[] = drupal_render($form[$key][$perm]);
+ }
+
+ $rows[] = $row;
+ }
+
+ array_unshift($header, t('Directory path'));
+
+ $output = '' . t('Directories') . ' ';
+ $output .= theme('table', array('header' => $header, 'rows' => $rows));
+ $output .= '';
+ $output .= drupal_render_children($form);
+ return $output;
+}
+
+/**
+ * thumbnail settings form
+ */
+function imce_thumbnail_form($thumb = array()) {
+ if (empty($thumb)) {
+ $thumb = array('name' => '', 'dimensions' => '', 'prefix' => '', 'suffix' => '');
+ }
+ $form['name'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $thumb['name'],
+ '#size' => 20,
+ );
+ $form['dimensions'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $thumb['dimensions'],
+ '#size' => 20,
+ );
+ $form['prefix'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $thumb['prefix'],
+ '#size' => 20,
+ );
+ $form['suffix'] = array(
+ '#type' => 'textfield',
+ '#default_value' => $thumb['suffix'],
+ '#size' => 20,
+ );
+ return $form;
+}
+
+/**
+ * Thumbnails form themed.
+ */
+function imce_thumbnails_theme($variables) {
+ $form = $variables['form'];
+ $header = array(t('Name'), t('Dimensions'), t('Prefix'), t('Suffix'));
+ $rows = array();
+
+ foreach (element_children($form) as $key) {
+ $rows[] = array(
+ drupal_render($form[$key]['name']),
+ drupal_render($form[$key]['dimensions']),
+ drupal_render($form[$key]['prefix']),
+ drupal_render($form[$key]['suffix']),
+ );
+ }
+
+ $output = '' . t('Thumbnails') . ' ';
+ $output .= theme('table', array('header' => $header, 'rows' => $rows));
+ $output .= '';
+ $output .= drupal_render_children($form);
+ return $output;
+}
+
+/**
+ * Role-profile form
+ */
+function imce_role_form($role, $weight = TRUE, $core = TRUE) {
+ $form['name'] = array(
+ '#markup' => check_plain($role['name']),
+ );
+ if ($weight) {
+ $form['weight'] = $core ? array(
+ '#type' => 'textfield',
+ '#value' => $role['weight'],
+ '#attributes' => array('readonly' => 'readonly', 'style' => 'border: none; width: 2em; background-color: transparent;'),
+ ) : array(
+ '#type' => 'weight',
+ '#default_value' => $role['weight'],
+ );
+ }
+ foreach (array_keys(file_get_stream_wrappers(STREAM_WRAPPERS_VISIBLE)) as $scheme) {
+ $form[$scheme . '_pid'] = array(
+ '#type' => 'select',
+ '#options' => imce_profile_options(),
+ '#default_value' => $role[$scheme . '_pid'],
+ '#empty_value' => 0,
+ );
+ }
+ return $form;
+}
+
+/**
+ * Profile delete form
+ */
+function imce_profile_delete_form($form, &$form_state, $pid) {
+ if ($pid > 1 && $profile = imce_load_profile($pid)) {
+ $form['#submit'][] = 'imce_profile_delete_submit';
+ $form['pid'] = array('#type' => 'hidden', '#value' => $pid);
+ return confirm_form($form,
+ t('Are you sure you want to delete the profile %name?',
+ array('%name' => $profile['name'])),
+ 'admin/config/media/imce',
+ '',
+ t('Delete'),
+ t('Cancel')
+ );
+ }
+ drupal_goto('admin/config/media/imce');
+}
+
+/**
+ * Profile delete form submit
+ */
+function imce_profile_delete_submit($form, &$form_state) {
+ imce_update_profiles($form_state['values']['pid'], NULL);
+ drupal_set_message(t('Profile has been deleted.'));
+ $form_state['redirect'] = 'admin/config/media/imce';
+}
+
+/**
+ * Profile options.
+ */
+function imce_profile_options() {
+ $options = array();
+ foreach (variable_get('imce_profiles', array()) as $pid => $profile) {
+ $options[$pid] = $profile['name'];
+ }
+ return $options;
+}
+
+/**
+ * Profile import links.
+ */
+function imce_profile_import_html($pid = 0) {
+ $output = '';
+ $links = array();
+
+ foreach (variable_get('imce_profiles', array()) as $id => $profile) {
+ if ($pid != $id) {
+ $links[] = l($profile['name'], $_GET['q'], array('query' => array('import' => $id)));
+ }
+ }
+
+ if (!empty($links)) {
+ $output = '' . t('Import settings from other profiles') . ' : ';
+ $output .= implode(', ', $links) . '
';
+ }
+
+ return $output;
+}
+
+/**
+ * Update role-profile assignments.
+ */
+function imce_update_roles($pid) {
+ $roles = variable_get('imce_roles_profiles', array());
+ foreach ($roles as $rid => $role) {
+ foreach ($role as $key => $value) {
+ if (substr($key, -4) == '_pid') {
+ if ($value == $pid) {
+ $roles[$rid][$key] = 0;
+ }
+ elseif ($value > $pid) {
+ $roles[$rid][$key]--;
+ }
+ }
+ }
+ }
+ variable_set('imce_roles_profiles', $roles);
+}
+
+/**
+ * Add, update or delete a profile.
+ */
+function imce_update_profiles($pid, $profile = NULL) {
+ $profiles = variable_get('imce_profiles', array());
+
+ //add or update
+ if (isset($profile)) {
+ $pid = isset($profiles[$pid]) ? $pid : count($profiles)+1;
+ $profiles[$pid] = $profile;
+ }
+
+ //delete
+ elseif (isset($profiles[$pid]) && $pid > 1) {
+ unset($profiles[$pid]);
+ for ($i = $pid+1; isset($profiles[$i]); $i++) {
+ $profiles[$i-1] = $profiles[$i];
+ unset($profiles[$i]);
+ }
+ imce_update_roles($pid);
+ }
+
+ variable_set('imce_profiles', $profiles);
+ return $pid;
+}
+
+/**
+ * Unset empty fields in thumbnails and directory paths.
+ */
+function imce_clean_profile_fields(&$profile) {
+ $clean = array();
+ foreach ($profile['thumbnails'] as $thumb) {
+ if (trim($thumb['name']) != '') {
+ $clean[] = $thumb;
+ }
+ }
+ $profile['thumbnails'] = $clean;
+
+ $clean = array();
+ $names = array();
+ foreach ($profile['directories'] as $dir) {
+ $dir['name'] = trim($dir['name'], '/ ');
+ if ($dir['name'] == '') {
+ continue;
+ }
+ if (isset($names[$dir['name']])) {
+ drupal_set_message(t('Duplicate directory paths are not allowed.'), 'error');
+ continue;
+ }
+ if (!imce_reg_dir($dir['name'])) {
+ drupal_set_message(t('%dirname is not accepted as a proper directory name.', array('%dirname' => $dir['name'])), 'error');
+ continue;
+ }
+ $clean[] = $dir;
+ $names[$dir['name']] = 1;
+ }
+ $profile['directories'] = $clean;
+}
+
+/**
+ * Profile load.
+ */
+function imce_load_profile($pid) {
+ $profiles = variable_get('imce_profiles', array());
+ return isset($profiles[$pid]) ? $profiles[$pid] : NULL;
+}
+
+/**
+ * Sort roles according to their weights.
+ */
+function imce_sorted_roles() {
+ static $sorted;
+ if (!isset($sorted)) {
+ $sorted = array();
+ $roles = user_roles();
+ $profiles = variable_get('imce_profiles', array());
+ $roles_profiles = variable_get('imce_roles_profiles', array());
+ $roles_profiles[DRUPAL_ANONYMOUS_RID]['weight'] = 12;
+ $roles_profiles[DRUPAL_AUTHENTICATED_RID]['weight'] = 11;
+ $schemes = array_keys(file_get_stream_wrappers(STREAM_WRAPPERS_VISIBLE));
+ foreach ($roles as $rid => $name) {
+ $sorted[$rid] = array(
+ 'name' => $name,
+ 'weight' => isset($roles_profiles[$rid]['weight']) ? $roles_profiles[$rid]['weight'] : 0
+ );
+ foreach ($schemes as $scheme) {
+ $key = $scheme . '_pid';
+ $sorted[$rid][$key] = isset($roles_profiles[$rid][$key]) && isset($profiles[$roles_profiles[$rid][$key]]) ? $roles_profiles[$rid][$key] : 0;
+ }
+ }
+ uasort($sorted, 'imce_rolesort');
+ }
+ return $sorted;
+}
+
+/**
+ * Sorting function for roles.
+ */
+function imce_rolesort($r1, $r2) {
+ return $r1['weight']-$r2['weight'];
+}
+
+/**
+ * Checks if the given role can upload all extensions.
+ */
+function imce_admin_check_wildcard_upload($rid, $conf = NULL) {
+ if (!isset($conf)) {
+ $conf = variable_get('imce_roles_profiles', array());
+ }
+ if (!empty($conf[$rid])) {
+ foreach ($conf[$rid] as $key => $pid) {
+ if ($pid && substr($key, -4) == '_pid') {
+ if ($profile = imce_load_profile($pid)) {
+ if ($profile['extensions'] === '*' && !empty($profile['directories'])) {
+ foreach ($profile['directories'] as $dirconf) {
+ if (!empty($dirconf['upload'])) {
+ return $key;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return FALSE;
+}
+
+//Include core profile functions.
+include_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'imce') . '/inc/imce.core.profiles.inc';
\ No newline at end of file
diff --git a/sites/all/modules/imce/inc/imce.core.profiles.inc b/sites/all/modules/imce/inc/imce.core.profiles.inc
new file mode 100644
index 0000000..7495773
--- /dev/null
+++ b/sites/all/modules/imce/inc/imce.core.profiles.inc
@@ -0,0 +1,56 @@
+ $n, 'usertab' => $u, 'filesize' => $f, 'quota' => $q, 'tuquota' => $tq, 'extensions' => $e, 'dimensions' => $d, 'filenum' => $fn, 'directories' => array(), 'thumbnails' => array());
+ foreach ($ds as $d) {
+ $profile['directories'][] = array('name' => $d[0], 'subnav' => $d[1], 'browse' => $d[2], 'upload' => $d[3], 'thumb' => $d[4], 'delete' => $d[5], 'resize' => $d[6]);
+ }
+ foreach ($ts as $t) {
+ $profile['thumbnails'][] = array('name' => $t[0], 'dimensions' => $t[1], 'prefix' => $t[2], 'suffix' => $t[3]);
+ }
+ return $profile;
+}
+
+/**
+ * User1's profile.
+ */
+function imce_user1_profile() {
+ $profiles = variable_get('imce_profiles', array());
+ if (isset($profiles[1])) {
+ return $profiles[1];
+ }
+ return imce_construct_profile('User-1', 1, 0, 0, 0, '*', '1200x1200', 0, array(array('.', 1, 1, 1, 1, 1, 1)), array(array('Small', '90x90', 'small_', ''), array('Medium', '120x120', 'medium_', ''), array('Large', '180x180', 'large_', '')));
+}
+
+/**
+ * Default profile.
+ */
+function imce_sample_profile() {
+ return imce_construct_profile('Sample profile', 1, 1, 2, 0, 'gif png jpg jpeg', '800x600', 1, array(array('u%uid', 0, 1, 1, 1, 0, 0)), array(array('Thumb', '90x90', 'thumb_', '')));
+}
diff --git a/sites/all/modules/imce/inc/imce.js.inc b/sites/all/modules/imce/inc/imce.js.inc
new file mode 100644
index 0000000..7e500c5
--- /dev/null
+++ b/sites/all/modules/imce/inc/imce.js.inc
@@ -0,0 +1,67 @@
+ theme('imce_file_list', array('imce_ref' => array('imce' => &$imce))),
+ 'dirsize' => format_size($imce['dirsize']),
+ 'subdirectories' => array_map('rawurlencode', array_values($imce['subdirectories'])),
+ 'perm' => $imce['perm']
+ );
+}
+
+/**
+ * Ajax operation: upload
+ */
+function imce_js_upload(&$imce) {
+ if ($imce['perm']['upload']) {
+ $_POST['op'] = t('Upload');
+ drupal_get_form('imce_upload_form', array('imce' => &$imce));
+ return array('added' => isset($imce['added']) ? $imce['added'] : NULL, 'dirsize' => format_size($imce['dirsize']));
+ }
+}
+
+/**
+ * Ajax operation: thumbnails
+ */
+function imce_js_thumb(&$imce) {
+ if ($imce['perm']['thumb']) {
+ $_POST['op'] = t('Create thumbnails');
+ return imce_process_fileop($imce);
+ }
+}
+
+/**
+ * Ajax operation: delete
+ */
+function imce_js_delete(&$imce) {
+ if ($imce['perm']['delete']) {
+ $_POST['op'] = t('Delete');
+ return imce_process_fileop($imce);
+ }
+}
+
+/**
+ * Ajax operation: resize
+ */
+function imce_js_resize(&$imce) {
+ if ($imce['perm']['resize']) {
+ $_POST['op'] = t('Resize');
+ return imce_process_fileop($imce);
+ }
+}
+
+/**
+ * Process file operations form
+ */
+function imce_process_fileop(&$imce) {
+ drupal_get_form('imce_fileop_form', array('imce' => &$imce));
+ return array('added' => isset($imce['added']) ? $imce['added'] : NULL, 'removed' => isset($imce['removed']) ? $imce['removed'] : NULL, 'dirsize' => format_size($imce['dirsize']));
+}
\ No newline at end of file
diff --git a/sites/all/modules/imce/inc/imce.page.inc b/sites/all/modules/imce/inc/imce.page.inc
new file mode 100644
index 0000000..32e267c
--- /dev/null
+++ b/sites/all/modules/imce/inc/imce.page.inc
@@ -0,0 +1,1129 @@
+ $account));
+}
+
+/**
+ * Returns the imce page for the specified user and the file scheme.
+ */
+function imce_page($user, $scheme = NULL, $jsop = NULL) {
+ return theme('imce_page', array('content' => imce_content($user, $scheme, $jsop)));
+}
+
+/**
+ * Returns the content of the file browser.
+ */
+function imce_content($user, $scheme = NULL, $jsop = NULL) {
+
+ //execute ajax calls.
+ if ($jsop) {
+ return imce_js($user, $scheme, $jsop);
+ }
+
+ //initiate configuration profile
+ if (!$imce = imce_initiate_profile($user, $scheme)) {
+ return '';
+ }
+ imce_process_profile($imce);//get active directory content
+
+ //Before creating the content let's add main files required for imce to function properly.
+ $path = drupal_get_path('module', 'imce');
+ drupal_add_js($path . '/js/jquery.form.js');
+ drupal_add_js($path . '/js/imce.js');
+ drupal_add_js($path . '/js/imce_extras.js');
+ drupal_add_css($path . '/css/imce-content.css');
+
+ //process forms.
+ $imce_ref = array('imce' => &$imce);
+ $forms = array();
+ if (!$imce['error']) {
+ //process file upload.
+ if (imce_perm_exists($imce, 'upload')) {
+ $forms[] = drupal_get_form('imce_upload_form', $imce_ref);
+ }
+ //process file operations.
+ $forms[] = drupal_get_form('imce_fileop_form', $imce_ref);
+ }
+ $forms = drupal_render($forms);
+
+ //run custom content functions. possible to insert extra forms. content is invisible when js is enabled.
+ foreach (variable_get('imce_custom_content', array()) as $func => $state) {
+ if ($state && function_exists($func) && $output = $func($imce)) {
+ $forms .= $output;
+ }
+ }
+
+ $content = theme('imce_content', array(
+ 'tree' => imce_create_tree($imce),
+ 'forms' => $forms,
+ 'imce_ref' => $imce_ref,
+ ));
+
+ //make necessary changes for js conversion
+ $imce['dir'] = str_replace('%2F', '/', rawurlencode($imce['dir']));
+ unset($imce['files'], $imce['name'], $imce['directories'], $imce['subdirectories'], $imce['filesize'], $imce['quota'], $imce['tuquota'], $imce['thumbnails'], $imce['uid'], $imce['usertab']);
+
+ drupal_add_js($imce_ref, 'setting');
+
+ return $content;
+}
+
+/**
+ * Ajax operations. q=imce&jsop={op}
+ */
+function imce_js($user, $scheme, $jsop = '') {
+ $response = array();
+
+ //data
+ if ($imce = imce_initiate_profile($user, $scheme)) {
+ imce_process_profile($imce);
+ if (!$imce['error']) {
+ module_load_include('inc', 'imce', 'inc/imce.js');
+ if (function_exists($func = 'imce_js_' . $jsop)) {
+ $response['data'] = $func($imce);
+ }
+ // Allow alteration of response.
+ foreach (variable_get('imce_custom_response', array()) as $func => $state) {
+ if ($state && function_exists($func)) {
+ $func($jsop, $response, $imce, $user);
+ }
+ }
+ }
+ }
+ //messages
+ $response['messages'] = drupal_get_messages();
+
+ //disable devel log.
+ $GLOBALS['devel_shutdown'] = FALSE;
+ //for upload we must return plain text header.
+ drupal_add_http_header('Content-Type', (!empty($_POST['html_response']) ? 'text/html' : 'application/json') . '; charset=utf-8');
+ print drupal_json_encode($response);
+ exit();
+}
+
+/**
+ * Upload form.
+ */
+function imce_upload_form($form, &$form_state, $ref) {
+ $imce =& $ref['imce'];
+ $form['imce'] = array(
+ '#type' => 'file',
+ '#title' => t('File'),
+ '#size' => 30,
+ );
+ if (!empty($imce['thumbnails'])) {
+ $form['thumbnails'] = array(
+ '#type' => 'checkboxes',
+ '#title' => t('Create thumbnails'),
+ '#options' => imce_thumbnail_options($imce['thumbnails']),
+ );
+ }
+ $form['upload'] = array(
+ '#type' => 'submit',
+ '#value' => t('Upload'),
+ '#submit' => $imce['perm']['upload'] ? array('imce_upload_submit') : NULL,
+ );
+ $form = array('fset_upload' => array('#type' => 'fieldset', '#title' => t('Upload file')) + $form);
+ $form['html_response'] = array('#type' => 'hidden', '#default_value' => '1');
+ $form['#attributes']['enctype'] = 'multipart/form-data';
+ $form['#action'] = $imce['url'];
+ return $form;
+}
+
+/**
+ * File operations form.
+ */
+function imce_fileop_form($form, &$form_state, $ref) {
+ $imce =& $ref['imce'];
+ $form['filenames'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Selected files'),
+ '#maxlength' => $imce['filenum'] ? $imce['filenum']*255 : NULL,
+ );
+
+ //thumbnail
+ if (!empty($imce['thumbnails']) && imce_perm_exists($imce, 'thumb')) {
+ $form['fset_thumb'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Thumbnails'),
+ ) + imce_thumb_form($imce);
+ }
+
+ //delete
+ if (imce_perm_exists($imce, 'delete')) {
+ $form['fset_delete'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Delete'),
+ ) + imce_delete_form($imce);
+ }
+
+ //resize
+ if (imce_perm_exists($imce, 'resize')) {
+ $form['fset_resize'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Resize'),
+ ) + imce_resize_form($imce);
+ }
+
+ $form['#action'] = $imce['url'];
+ return $form;
+}
+
+/**
+ * Thumbnail form.
+ */
+function imce_thumb_form(&$imce) {
+ $form['thumbnails'] = array(
+ '#type' => 'checkboxes',
+ '#title' => t('Thumbnails'),
+ '#options' => imce_thumbnail_options($imce['thumbnails']),
+ );
+ $form['thumb'] = array(
+ '#type' => 'submit',
+ '#value' => t('Create thumbnails'),
+ '#submit' => $imce['perm']['thumb'] ? array('imce_thumb_submit') : NULL,
+ );
+ return $form;
+}
+
+/**
+ * Delete form.
+ */
+function imce_delete_form(&$imce) {
+ $form['delete'] = array(
+ '#type' => 'submit',
+ '#value' => t('Delete'),
+ '#submit' => $imce['perm']['delete'] ? array('imce_delete_submit') : NULL,
+ );
+ return $form;
+}
+
+/**
+ * Resizing form.
+ */
+function imce_resize_form(&$imce) {
+ $form['width'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Width x Height'),
+ '#size' => 5,
+ '#maxlength' => 4,
+ '#prefix' => '',
+ );
+ $form['height'] = array(
+ '#type' => 'textfield',
+ '#size' => 5,
+ '#maxlength' => 4,
+ '#prefix' => 'x',
+ );
+ $form['resize'] = array(
+ '#type' => 'submit',
+ '#value' => t('Resize'),
+ '#submit' => $imce['perm']['resize'] ? array('imce_resize_submit') : NULL,//permission for submission
+ '#suffix' => '
',
+ );
+ $form['copy'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Create a new image'),
+ '#default_value' => 1,
+ );
+ return $form;
+}
+
+/**
+ * Validate file operations form.
+ */
+function imce_fileop_form_validate($form, &$form_state) {
+ $imce =& $form_state['build_info']['args'][0]['imce'];
+
+ //check if the filenames is empty
+ if ($form_state['values']['filenames'] == '') {
+ return form_error($form['filenames'], t('Please select a file.'));
+ }
+
+ //filenames come separated by colon
+ $filenames = explode(':', $form_state['values']['filenames']);
+ $cnt = count($filenames);
+ //check the number of files.
+ if ($imce['filenum'] && $cnt > $imce['filenum']) {
+ return form_error($form['filenames'], t('You are not allowed to operate on more than %num files.', array('%num' => $imce['filenum'])));
+ }
+
+ //check if there is any illegal choice
+ for ($i = 0; $i < $cnt; $i++) {
+ $filenames[$i] = $filename = rawurldecode($filenames[$i]);
+ if (!isset($imce['files'][$filename])) {
+ watchdog('imce', 'Illegal choice %choice in !name element.', array('%choice' => $filename, '!name' => t('directory (%dir)', array('%dir' => imce_dir_uri($imce)))), WATCHDOG_ERROR);
+ return form_error($form['filenames'], t('An illegal choice has been detected. Please contact the site administrator.'));
+ }
+ }
+
+ $form_state['values']['filenames'] = $filenames;
+}
+
+/**
+ * Submit upload form.
+ */
+function imce_upload_submit($form, &$form_state) {
+ $form_state['redirect'] = FALSE;
+ $imce =& $form_state['build_info']['args'][0]['imce'];
+ // Need to provide extension validatior, otherwise file_save_upload uses the default.
+ $validators['file_validate_extensions'] = array($imce['extensions'] === '*' ? NULL : $imce['extensions']);
+ $validators['imce_validate_all'] = array(&$imce);
+ $diruri = imce_dir_uri($imce);
+
+ //save uploaded file.
+ $replace = variable_get('imce_settings_replace', FILE_EXISTS_RENAME);
+ if ($file = file_save_upload('imce', $validators, $diruri, $replace)) {
+
+ //core bug #54223.
+ if ($replace == FILE_EXISTS_RENAME) {
+ $name = drupal_basename($file->uri);
+ if ($name != $file->filename) {
+ $file->filename = $name;
+ drupal_set_message(t('The file has been renamed to %filename.', array('%filename' => $file->filename)));
+ }
+ }
+
+ $file->uid = $imce['uid'];//global user may not be the owner.
+ $file->status = FILE_STATUS_PERMANENT;
+ file_save($file);
+ imce_file_register($file);
+ drupal_set_message(t('%filename has been uploaded.', array('%filename' => $file->filename)));
+
+ //update file list
+ $img = imce_image_info($file->uri);
+ $file->width = $img ? $img['width'] : 0;
+ $file->height = $img ? $img['height'] : 0;
+ imce_add_file($file, $imce);
+
+ //create thumbnails
+ if (isset($form_state['values']['thumbnails']) && $img) {
+ imce_create_thumbnails($file->filename, $imce, $form_state['values']['thumbnails']);
+ }
+ }
+ else {
+ drupal_set_message(t('Upload failed.'), 'error');
+ }
+}
+
+/**
+ * Submit thumbnail form.
+ */
+function imce_thumb_submit($form, &$form_state) {
+ $form_state['redirect'] = FALSE;
+ $imce =& $form_state['build_info']['args'][0]['imce'];
+ //create thumbnails
+ imce_process_files($form_state['values']['filenames'], $imce, 'imce_create_thumbnails', array($form_state['values']['thumbnails']));
+}
+
+/**
+ * Submit delete form.
+ */
+function imce_delete_submit($form, &$form_state) {
+ $form_state['redirect'] = FALSE;
+ $imce =& $form_state['build_info']['args'][0]['imce'];
+
+ $deleted = imce_process_files($form_state['values']['filenames'], $imce, 'imce_delete_file');
+
+ if (!empty($deleted)) {
+ drupal_set_message(t('File deletion successful: %files.', array('%files' => utf8_encode(implode(', ', $deleted)))));
+ }
+
+}
+
+/**
+ * Submit resize form.
+ */
+function imce_resize_submit($form, &$form_state) {
+ $form_state['redirect'] = FALSE;
+ $imce =& $form_state['build_info']['args'][0]['imce'];
+
+ //check dimensions
+ $width = (int) $form_state['values']['width'];
+ $height = (int) $form_state['values']['height'];
+ list($maxw, $maxh) = $imce['dimensions'] ? explode('x', $imce['dimensions']) : array(0, 0);
+ if ($width < 1 || $height < 1 || ($maxw && ($width > $maxw || $height > $maxh))) {
+ drupal_set_message(t('Please specify dimensions within the allowed range that is from 1x1 to @dimensions.', array('@dimensions' => $imce['dimensions'] ? $imce['dimensions'] : t('unlimited'))), 'error');
+ return;
+ }
+
+ $resized = imce_process_files($form_state['values']['filenames'], $imce, 'imce_resize_image', array($width, $height, $form_state['values']['copy']));
+
+ if (!empty($resized)) {
+ drupal_set_message(t('File resizing successful: %files.', array('%files' => utf8_encode(implode(', ', $resized)))));
+ }
+
+}
+
+/**
+ * Do batch operations on files.
+ * Used by delete, resize, create thumbnail submissions.
+ */
+function imce_process_files($filenames, &$imce, $function, $args = array()) {
+ $args = array_merge(array('', &$imce), $args);
+ $processed = array();
+
+ foreach ($filenames as $filename) {
+ $args[0] = $filename;
+ if (call_user_func_array($function, $args)) {
+ $processed[] = $filename;
+ }
+ }
+
+ return $processed;
+}
+
+/**
+ * Deletes a file in the file list.
+ */
+function imce_delete_file($filename, &$imce) {
+ $uri = imce_dir_uri($imce) . $filename;
+ if (!imce_delete_filepath($uri)) {
+ return FALSE;
+ }
+ imce_remove_file($filename, $imce);
+ return TRUE;
+}
+
+/**
+ * Deletes a file by uri.
+ */
+function imce_delete_filepath($uri) {
+ $file = file_load_multiple(array(), array('uri' => $uri));
+ $file = reset($file);
+
+ // File exists in database
+ if ($file) {
+ $usage = file_usage_list($file);
+ $is_imce = isset($usage['imce']);
+ unset($usage['imce']);
+ // File is in use by an other module.
+ if (!empty($usage)) {
+ drupal_set_message(t('%filename is in use by another application.', array('%filename' => $file->filename)), 'error');
+ return FALSE;
+ }
+ // Force delete file. Prevent running file_usage_list() second time.
+ if (!file_delete($file, TRUE)) {
+ return FALSE;
+ }
+ }
+ // Not in db. Probably loaded via ftp.
+ elseif (!file_unmanaged_delete($uri)) {
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+/**
+ * Create all selected thumbnails.
+ */
+function imce_create_thumbnails($filename, &$imce, $values) {
+ $created = array();
+ foreach ($imce['thumbnails'] as $thumbnail) {
+ if ($values[$thumbnail['name']] && imce_create_thumbnail($filename, $imce, $thumbnail)) {
+ $created[] = $thumbnail['name'];
+ }
+ }
+ if (!empty($created)) {
+ drupal_set_message(t('Thumbnail creation (%thumbnames) successful for %filename.', array('%thumbnames' => implode(', ', $created), '%filename' => utf8_encode($filename))));
+ }
+ return $created;
+}
+
+/**
+ * Create a thumbnail.
+ */
+function imce_create_thumbnail($filename, &$imce, $thumbnail) {
+ //generate thumbnail name
+ $name = $thumbnail['prefix'];
+ if ($thumbnail['suffix'] != '' && $dot = strrpos($filename, '.')) {
+ $name .= substr($filename, 0, $dot);
+ $name .= $thumbnail['suffix'];
+ $name .= substr($filename, $dot);
+ }
+ else {
+ $name .= $filename;
+ }
+ //scale the image
+ list($width, $height) = explode('x', $thumbnail['dimensions']);
+ return imce_resize_image($filename, $imce, $width, $height, TRUE, $name, variable_get('imce_settings_thumb_method', 'scale_and_crop'));
+}
+
+/**
+ * Resize an image in the file list. Also used for thumbnail creation.
+ */
+function imce_resize_image($filename, &$imce, $width, $height, $copy = TRUE, $destname = FALSE, $op = 'resize') {
+ $destdir = imce_dir_uri($imce);
+ $imguri = $destdir . $filename;
+
+ //check if the file is an image
+ if (!$imce['files'][$filename]['width'] || !$img = imce_image_info($imguri)) {
+ drupal_set_message(t('%filename is not an image.', array('%filename' => utf8_encode($filename))), 'error', FALSE);
+ return FALSE;
+ }
+
+ if (substr($op, 0, 5) == 'scale' && !($width < $img['width'] || $height < $img['height'])) {
+ drupal_set_message(t('Scaling up is not allowed.'), 'error', FALSE);
+ return FALSE;
+ }
+
+ //create file object
+ $file = new stdClass();
+ $file->uri = $destdir . $destname;
+ if (!$destname || $destname == $filename) {
+ $file->uri = $copy ? file_create_filename($filename, $destdir) : $imguri;
+ }
+ $file->filename = drupal_basename($file->uri);
+
+ //check if a file having the same properties exists already.
+ if (isset($imce['files'][$file->filename])) {
+ if (($f = $imce['files'][$file->filename]) && $f['width'] == $width && $f['height'] == $height) {
+ drupal_set_message(t('%filename(%dimensions) already exists.', array('%filename' => utf8_encode($file->filename), '%dimensions' => $width . 'x' . $height)), 'error');
+ return FALSE;
+ }
+ }
+
+ //validate file name
+ $errors = file_validate_name_length($file);
+ if (!empty($errors)) {
+ drupal_set_message($errors[0], 'error');
+ return FALSE;
+ }
+
+ //resize image
+ $image = image_load($imguri);
+ $function = 'image_' . $op;
+ if (!$image || !function_exists($function) || !$function($image, $width, $height)) {
+ drupal_set_message(t('%filename cannot be resized to %dimensions', array('%filename' => utf8_encode($filename), '%dimensions' => $width . 'x' . $height)), 'error', FALSE);
+ return FALSE;
+ }
+
+ //copy to a temp file
+ if (!$tempuri = drupal_tempnam('temporary://', 'imce')) {
+ return FALSE;
+ }
+ register_shutdown_function('file_unmanaged_delete', $tempuri);
+ if (!image_save($image, $tempuri) || !$image->info) {
+ return FALSE;
+ }
+
+ //validate quota
+ $file->filesize = $image->info['file_size'];
+ $quotadiff = $file->filename == $filename ? -$imce['files'][$filename]['size'] : 0;
+ if (!imce_validate_quotas($file, $imce, $quotadiff)) {
+ return FALSE;
+ }
+
+ //build the rest of the file object
+ $file->uid = $imce['uid'];
+ $file->filemime = $img['mime'];
+ $file->status = FILE_STATUS_PERMANENT;
+ $file->timestamp = REQUEST_TIME;
+
+ //copy from temp to file uri
+ $destination = $file->uri;
+ $file->uri = $tempuri;
+ if (!$file = file_copy($file, $destination, FILE_EXISTS_REPLACE)) {
+ return FALSE;
+ }
+ imce_file_register($file);
+
+ //update file list
+ //if the file was scaled get the new dimensions
+ if ($op == 'scale') {
+ $img = imce_image_info($file->uri);
+ $width = $img['width'];
+ $height = $img['height'];
+ }
+ $file->width = $width;
+ $file->height = $height;
+ imce_add_file($file, $imce);
+
+ return $file;
+}
+
+/**
+ * Add a new file to the file list.
+ */
+function imce_add_file($file, &$imce) {
+ $imce['dirsize'] += $file->filesize;
+ if (isset($imce['files'][$file->filename])) {
+ $imce['dirsize'] -= $imce['files'][$file->filename]['size'];
+ }
+ $imce['files'][$file->filename] = array(
+ 'name' => $file->filename,
+ 'size' => $file->filesize,
+ 'width' => $file->width,
+ 'height' => $file->height,
+ 'date' => $file->timestamp
+ );
+ if (isset($_GET['jsop'])) {
+ $add = $imce['files'][$file->filename];
+ $add['name'] = rawurlencode($file->filename);
+ $add['fsize'] = format_size($file->filesize);
+ $add['fdate'] = format_date($file->timestamp, 'short');
+ $add['id'] = $file->fid;
+ $imce['added'][] = $add;
+ }
+}
+
+/**
+ * Remove a file from the file list.
+ */
+function imce_remove_file($filename, &$imce) {
+ if (isset($imce['files'][$filename])) {
+ $imce['dirsize'] -= $imce['files'][$filename]['size'];
+ unset($imce['files'][$filename]);
+ if (isset($_GET['jsop'])) {
+ $imce['removed'][] = rawurlencode($filename);
+ }
+ }
+}
+
+/**
+ * Validate uploaded file.
+ */
+function imce_validate_all($file, $imce) {
+
+ //validate image resolution only if filesize validation passes.
+ //because user might have uploaded a very big image
+ //and scaling it may exploit system memory.
+ $errors = imce_validate_filesize($file, $imce['filesize']);
+ //image resolution validation
+ if (empty($errors) && preg_match('/\.(png|gif|jpe?g)$/i', $file->filename)) {
+ $errors = array_merge($errors, file_validate_image_resolution($file, $imce['dimensions']));
+ }
+ //directory quota validation
+ if ($imce['quota']) {
+ $errors = array_merge($errors, imce_validate_quota($file, $imce['quota'], $imce['dirsize']));
+ }
+ //user quota validation. check it if no errors were thrown.
+ if (empty($errors) && $imce['tuquota']) {
+ $errors = imce_validate_tuquota($file, $imce['tuquota'], file_space_used($imce['uid']));
+ }
+ return $errors;
+}
+
+/**
+ * Validate filesize for maximum allowed file size.
+ */
+function imce_validate_filesize($file, $maxsize = 0) {
+ $errors = array();
+ if ($maxsize && $file->filesize > $maxsize) {
+ $errors[] = t('The file is %filesize exceeding the maximum file size of %maxsize.', array('%filesize' => format_size($file->filesize), '%maxsize' => format_size($maxsize)));
+ }
+ return $errors;
+}
+
+/**
+ * Validate filesize for directory quota.
+ */
+function imce_validate_quota($file, $quota = 0, $currentsize = 0) {
+ $errors = array();
+ if ($quota && ($currentsize + $file->filesize) > $quota) {
+ $errors[] = t('%filename is %filesize which would exceed your directory quota. You are currently using %size of %total_quota.', array('%size' => format_size($currentsize), '%total_quota' => format_size($quota), '%filesize' => format_size($file->filesize), '%filename' => utf8_encode($file->filename)));
+ }
+ return $errors;
+}
+
+/**
+ * Validate filesize for total user quota.
+ */
+function imce_validate_tuquota($file, $quota = 0, $currentsize = 0) {
+ $errors = array();
+ if ($quota && ($currentsize + $file->filesize) > $quota) {
+ $errors[] = t('%filename is %filesize which would exceed your total user quota. You are currently using %size of %total_quota.', array('%size' => format_size($currentsize), '%total_quota' => format_size($quota), '%filesize' => format_size($file->filesize), '%filename' => utf8_encode($file->filename)));
+ }
+ return $errors;
+}
+
+/**
+ * Validate both directory and total user quota. Returns true/false not errors.
+ */
+function imce_validate_quotas($file, &$imce, $add = 0) {
+ $errors = imce_validate_quota($file, $imce['quota'], $imce['dirsize'] + $add);
+ if (empty($errors) && $imce['tuquota']) {
+ $errors = imce_validate_tuquota($file, $imce['tuquota'], file_space_used($imce['uid']) + $add);
+ }
+ if (!empty($errors)) {
+ drupal_set_message($errors[0], 'error');
+ return FALSE;
+ }
+ return TRUE;
+}
+
+/**
+ * Checks if the file is an image and returns info.
+ * There are two switchable versions that use image_get_info() and getimagesize()
+ */
+if (variable_get('imce_image_get_info', 0)) {
+ function imce_image_info($file) {
+ $mimes = array('image/jpeg' => IMAGETYPE_JPEG, 'image/gif' => IMAGETYPE_GIF, 'image/png' => IMAGETYPE_PNG);
+ if (is_file($file) && ($dot = strrpos($file, '.')) && in_array(strtolower(substr($file, $dot+1)), array('jpg', 'jpeg', 'gif', 'png')) && ($info = @image_get_info($file)) && isset($mimes[$info['mime_type']]) ) {
+ return array('width' => $info['width'], 'height' => $info['height'], 'type' => $mimes[$info['mime_type']], 'mime' => $info['mime_type']);
+ }
+ return FALSE;
+ }
+}
+else {
+ function imce_image_info($file) {
+ if (is_file($file) && ($dot = strrpos($file, '.')) && in_array(strtolower(substr($file, $dot+1)), array('jpg', 'jpeg', 'gif', 'png')) && ($info = @getimagesize($file)) && in_array($info[2], array(IMAGETYPE_JPEG, IMAGETYPE_GIF, IMAGETYPE_PNG)) ) {
+ return array('width' => $info[0], 'height' => $info[1], 'type' => $info[2], 'mime' => $info['mime']);
+ }
+ return FALSE;
+ }
+}
+
+/**
+ * Return thumbnails as options to be used in upload form.
+ */
+function imce_thumbnail_options($thumbs = array()) {
+ $options = array();
+ foreach ($thumbs as $thumb) {
+ $options[$thumb['name']] = $thumb['name'] . ' (' . $thumb['dimensions'] . ')';
+ }
+ return $options;
+}
+
+/**
+ * Initiate and return configuration profile for the $user.
+ */
+function imce_initiate_profile($user, $scheme = NULL) {
+
+ //check user profile and translate tokens in directory paths and evaluate php paths.
+ if ($imce = imce_user_profile($user, $scheme)) {
+ // Allow alteration of raw profile
+ foreach (variable_get('imce_custom_init', array()) as $func => $state) {
+ if ($state && function_exists($func)) {
+ $func($imce, $user);
+ }
+ }
+ imce_process_directories($imce, $user);
+ if (!empty($imce['directories'])) {
+ $imce['uid'] = (int) $user->uid;
+ $imce['url'] = url($_GET['q']);
+ $imce['clean'] = variable_get('clean_url', 0) == 1;
+ $imce['absurls'] = variable_get('imce_settings_absurls', 0) == 1;
+ $imce['furl'] = file_create_url($imce['scheme'] . '://');
+ $imce['filesize'] *= 1048576;//convert from Mb to byte
+ $imce['quota'] *= 1048576;
+ $imce['tuquota'] *= 1048576;
+ $imce['filenum'] = (int) $imce['filenum'];
+ //check and set the active directory
+ if ($info = imce_working_directory($imce)) {
+ $imce['direct'] = isset($imce['directories'][$info['name']]);
+ $imce['directories'][$info['name']] = $info;
+ $imce['dir'] = $info['name'];
+ $imce['perm'] = $info;//copy permissions of the active directory.
+ unset($imce['perm']['name']);
+ }
+ else {
+ drupal_set_message(t('Unable to get a working directory for the file browser!'), 'error');
+ $imce['dir'] = FALSE;
+ $imce['error'] = TRUE;
+ }
+ return $imce;
+ }
+ drupal_set_message(t('There is no valid directory specified for the file browser!'), 'error');
+ }
+ else {
+ drupal_set_message(t('You do not have access to any configuration profile to use the file browser!'), 'error');
+ }
+
+ return FALSE;
+}
+
+/**
+ * Get files and folders of the actve directory. Do custom processing.
+ */
+function imce_process_profile(&$imce) {
+ //get directory content. do a custom scan if it is set
+ $scan = ($scan = variable_get('imce_custom_scan', '')) && function_exists($scan) ? $scan : 'imce_scan_directory';
+ $imce += $scan($imce['dir'], $imce);
+
+ //run custom process functions
+ foreach (variable_get('imce_custom_process', array()) as $func => $state) {
+ if ($state && function_exists($func)) {
+ $func($imce);
+ }
+ }
+
+ //set subdirectories
+ if (!$imce['error'] && !imce_subdirectories_accessible($imce)) {
+ $imce['subdirectories'] = array();
+ }
+}
+
+/**
+ * Translate tokens and evaluate php in directory names.
+ * Convert directories into an associative array (dirname => info)
+ */
+function imce_process_directories(&$imce, $user) {
+ $directories = $imce['directories'];
+ $paths = array();
+ $translate = array('%uid' => $user->uid);
+
+ foreach ($directories as $directory) {
+ if (substr($directory['name'], 0, 4) == 'php:') {
+ $directory['name'] = eval(substr($directory['name'], 4));
+ //php may return an array of directories
+ if (is_array($directory['name'])) {
+ foreach ($directory['name'] as $name) {
+ $paths[$name] = array('name' => $name) + $directory;
+ }
+ continue;
+ }
+ }
+ else {
+ $directory['name'] = strtr($directory['name'], $translate);
+ }
+ if ($directory['name']) {
+ $paths[$directory['name']] = $directory;
+ }
+ }
+
+ $imce['directories'] = $paths;
+}
+
+/**
+ * Return an available directory for the profile.
+ */
+function imce_working_directory(&$imce) {
+ //Do not use session if there is only one directory assigned.
+ $sess = TRUE;
+ if (count($imce['directories']) < 2) {
+ $perms = reset($imce['directories']);
+ if (!isset($perms['subnav']) || !$perms['subnav']) {
+ $sess = FALSE;
+ }
+ }
+ //check GET.
+ if (isset($_GET['dir'])) {
+ if ($info = imce_directory_info($_GET['dir'], $imce)) {
+ if (imce_check_directory($_GET['dir'], $imce)) {
+ if ($sess) {
+ $_SESSION['imce_directory'] = rawurlencode($info['name']);
+ }
+ }
+ else {
+ $info = FALSE;
+ }
+ }
+ else {
+ imce_inaccessible_directory($_GET['dir'], $imce);
+ }
+ return $info;
+ }
+
+ //check session
+ if ($sess && isset($_SESSION['imce_directory'])) {
+ $dirname = rawurldecode($_SESSION['imce_directory']);
+ if ($info = imce_directory_info($dirname, $imce)) {
+ if (imce_check_directory($dirname, $imce)) {
+ return $info;
+ }
+ }
+ }
+
+ //or the whole list.
+ foreach ($imce['directories'] as $dirname => $info) {
+ $dirname = (string) $dirname;
+ if (imce_check_directory($dirname, $imce)) {
+ if ($sess) {
+ $_SESSION['imce_directory'] = rawurlencode($dirname);
+ }
+ return $info;
+ }
+ }
+
+ return FALSE;
+}
+
+/**
+ * Create a writable directory(any level) under file system directory.
+ */
+function imce_check_directory($dirname, $imce) {
+ $diruri = imce_dir_uri($imce, $dirname);
+
+ if (!imce_reg_dir($dirname) || !file_prepare_directory($diruri, FILE_CREATE_DIRECTORY)) {
+ return imce_inaccessible_directory($dirname, $imce);
+ }
+
+ return TRUE;
+}
+
+/**
+ * Generate and log a directory access error.
+ */
+function imce_inaccessible_directory($dirname, $imce) {
+ if (is_string($dirname)) {
+ $dirname = utf8_encode($dirname);
+ $diruri = imce_dir_uri($imce, $dirname);
+ drupal_set_message(t('Directory %dirname is not accessible.', array('%dirname' => $dirname)), 'error');
+ watchdog('imce', 'Access to %directory was denied.', array('%directory' => $diruri), WATCHDOG_ERROR);
+ }
+ return FALSE;
+}
+
+/**
+ * Return the permissions for a directory that is accessed directly or indirectly.
+ * A child of a predefined directory in the directory list takes its parent's properties.
+ * If it has multiple parents, it gets the properties of the latter in the list.
+ */
+function imce_directory_info($dirname, $imce) {
+
+ if (isset($imce['directories'][$dirname])) {
+ return $imce['directories'][$dirname];
+ }
+
+ $info = FALSE;
+ if (imce_reg_dir($dirname)) {
+ $diruri = imce_dir_uri($imce, $dirname);
+ if (file_prepare_directory($diruri)) {
+ foreach ($imce['directories'] as $name => $prop) {
+ if ($prop['subnav'] && ($name === '.' || strpos($dirname . '/', $name . '/') === 0)) {
+ $info = $prop;
+ $info['name'] = $dirname;
+ }
+ }
+ }
+ }
+
+ return $info;
+}
+
+/**
+ * Detect if the subdirectories are accessible through any directory(not just the current one) in the list.
+ */
+function imce_subdirectories_accessible(&$imce) {
+
+ if (!empty($imce['subdirectories'])) {
+ if (!empty($imce['perm']['subnav'])) {
+ return TRUE;
+ }
+ //checking only the first one is sufficient.
+ $dirname = reset($imce['subdirectories']);
+ if ($imce['dir'] !== '.') {
+ $dirname = $imce['dir'] . '/' . $dirname;
+ }
+
+ //check if any setting is applicable for this subdirectory through any directory in the list.
+ foreach ($imce['directories'] as $name => $info) {
+ $name = (string) $name;
+ if ($info['subnav'] && $dirname != $name && ($name == '.' || strpos($dirname . '/', $name . '/') === 0)) {
+ return TRUE;
+ }
+ }
+ }
+
+ return FALSE;
+}
+
+/**
+ * Check if a permission is given to at least one directory in the list.
+ */
+function imce_perm_exists(&$imce, $perm) {
+ static $perms = array();
+
+ if (isset($perms[$perm])) {
+ return $perms[$perm];
+ }
+
+ if (isset($imce['perm'][$perm]) && $imce['perm'][$perm]) {
+ return $perms[$perm] = TRUE;
+ }
+
+ foreach ($imce['directories'] as $name => $info) {
+ if (isset($info[$perm]) && $info[$perm]) {
+ return $perms[$perm] = TRUE;
+ }
+ }
+
+ return $perms[$perm] = FALSE;
+}
+
+/**
+ * Scan directory and return file list, subdirectories, and total size.
+ */
+function imce_scan_directory($dirname, $imce) {
+
+ $directory = array('dirsize' => 0, 'files' => array(), 'subdirectories' => array(), 'error' => FALSE);
+ $diruri = imce_dir_uri($imce, $dirname);
+
+ if (!is_string($dirname) || $dirname == '' || !$handle = opendir($diruri)) {
+ imce_inaccessible_directory($dirname, $imce);
+ $directory['error'] = TRUE;
+ return $directory;
+ }
+
+ while (($file = readdir($handle)) !== FALSE) {
+
+ // Do not include dot files and folders
+ if (substr($file, 0, 1) === '.') {
+ continue;
+ }
+
+ $path = $diruri . $file;
+
+ if (is_dir($path)) {
+ $directory['subdirectories'][] = $file;
+ continue;
+ }
+
+ $width = $height = 0;
+ if ($img = imce_image_info($path)) {
+ $width = $img['width'];
+ $height = $img['height'];
+ }
+ $size = filesize($path);
+ $date = filemtime($path);
+ $directory['files'][$file] = array(
+ 'name' => $file,
+ 'size' => $size,
+ 'width' => $width,
+ 'height' => $height,
+ 'date' => $date
+ );
+ $directory['dirsize'] += $size;
+ }
+
+ closedir($handle);
+ sort($directory['subdirectories']);
+ return $directory;
+}
+
+/**
+ * Create directory tree.
+ */
+function imce_create_tree(&$imce) {
+ $paths = array();
+ //rearrange paths as arg0=>arg1=>...
+ foreach ($imce['directories'] as $path => $arr) {
+ $tmp =& $paths;
+ if ($path != '.') {
+ $args = explode('/', $path);
+ foreach ($args as $arg) {
+ if (!isset($tmp[$arg])) {
+ $tmp[$arg] = array();
+ }
+ $tmp =& $tmp[$arg];
+ }
+ $tmp[':access:'] = TRUE;
+ }
+ if ("$path" == $imce['dir']) {
+ $tmp[':active:'] = TRUE;
+ foreach ($imce['subdirectories'] as $arg) {
+ $tmp[$arg][':access:'] = TRUE;
+ }
+ }
+ }
+ //set root branch
+ $root = theme('imce_root_text', array('imce_ref' => array('imce' => &$imce)));
+ $q = $imce['clean'] ? '?' : '&';
+ if (isset($imce['directories']['.'])) {
+ $root = '' . $root . ' ';
+ }
+ else {
+ $root = '' . $root . ' ';
+ }
+
+ return $root . imce_tree_html($imce, $paths, $q);
+}
+
+/**
+ * Return tree html.
+ * This is not themable because it is complex and needs to be in a proper format for js processing.
+ */
+function imce_tree_html(&$imce, $paths, $q = '?', $prefix = '', $eprefix = '') {
+ unset($paths[':access:'], $paths[':active:']);
+ $html = '';
+ foreach ($paths as $arg => $children) {
+ $path = $prefix . $arg;
+ $earg = rawurlencode($arg);
+ $epath = $eprefix . $earg;
+ if (isset($children[':access:']) || imce_directory_info($path, $imce)) {
+ $a = '' . $earg . ' ';
+ }
+ else {
+ $a = '' . $earg . ' ';
+ }
+ $ul = imce_tree_html($imce, $children, $q, $path . '/', $epath . '/');
+ $class = $ul ? ' class="expanded"' : (isset($children[':active:']) ? ' class="leaf"' : '');
+ $html .= '' . $a . $ul . '';
+ }
+ if ($html) {
+ $html = '';
+ }
+ return $html;
+}
+
+/**
+ * Return the uri of the active directory
+ */
+function imce_dir_uri($imce, $dir = NULL) {
+ if (!isset($dir)) {
+ $dir = $imce['dir'];
+ }
+ $target = $dir === '.' ? '' : $dir;
+ $uri = $imce['scheme'] . '://' . $target;
+ // Uri is already normalized. Call alterers.
+ drupal_alter('file_stream_wrapper_uri_normalize', $uri, $imce['scheme'], $target);
+ // Add the slash
+ if (substr($uri, -1) !== '/') {
+ $uri .= '/';
+ }
+ return $uri;
+}
+
+/**
+ * Returns the text for the root directory in a directory tree.
+ */
+function theme_imce_root_text($variables) {
+ //$imce = &$variables['imce_ref']['imce'];
+ return '<' . t('root') . '>';
+}
+
+/**
+ * Returns the html for user's file browser tab.
+ */
+function theme_imce_user_page($variables) {
+ global $user;
+ $account = $variables['account'];
+ $options = array();
+ //switch to account's active folder
+ if ($user->uid == 1 && $account->uid != 1) {
+ $imce = imce_initiate_profile($account);
+ $options['query'] = array('dir' => $imce['dir']);
+ }
+ return '';
+}
+
+/**
+ * Registers the file as an IMCE file.
+ */
+function imce_file_register($file) {
+ if (!db_query("SELECT 1 FROM {file_usage} WHERE module = 'imce' AND fid = :fid", array(':fid' => $file->fid))->fetchField()) {
+ file_usage_add($file, 'imce', 'file', $file->fid);
+ }
+}
\ No newline at end of file
diff --git a/sites/all/modules/imce/js/imce.js b/sites/all/modules/imce/js/imce.js
new file mode 100644
index 0000000..17c8f7c
--- /dev/null
+++ b/sites/all/modules/imce/js/imce.js
@@ -0,0 +1,857 @@
+(function($) {
+//Global container.
+window.imce = {tree: {}, findex: [], fids: {}, selected: {}, selcount: 0, ops: {}, cache: {}, urlId: {},
+vars: {previewImages: 1, cache: 1},
+hooks: {load: [], list: [], navigate: [], cache: []},
+
+//initiate imce.
+initiate: function() {
+ imce.conf = Drupal.settings.imce || {};
+ if (imce.conf.error != false) return;
+ imce.ie = (navigator.userAgent.match(/msie (\d+)/i) || ['', 0])[1] * 1;
+ imce.FLW = imce.el('file-list-wrapper'), imce.SBW = imce.el('sub-browse-wrapper');
+ imce.NW = imce.el('navigation-wrapper'), imce.BW = imce.el('browse-wrapper');
+ imce.PW = imce.el('preview-wrapper'), imce.FW = imce.el('forms-wrapper');
+ imce.updateUI();
+ imce.prepareMsgs();//process initial status messages
+ imce.initiateTree();//build directory tree
+ imce.hooks.list.unshift(imce.processRow);//set the default list-hook.
+ imce.initiateList();//process file list
+ imce.initiateOps();//prepare operation tabs
+ imce.refreshOps();
+ // Bind global error handler
+ $(document).ajaxError(imce.ajaxError);
+ imce.invoke('load', window);//run functions set by external applications.
+},
+
+//process navigation tree
+initiateTree: function() {
+ $('#navigation-tree li').each(function(i) {
+ var a = this.firstChild, txt = a.firstChild;
+ txt && (txt.data = imce.decode(txt.data));
+ var branch = imce.tree[a.title] = {'a': a, li: this, ul: this.lastChild.tagName == 'UL' ? this.lastChild : null};
+ if (a.href) imce.dirClickable(branch);
+ imce.dirCollapsible(branch);
+ });
+},
+
+//Add a dir to the tree under parent
+dirAdd: function(dir, parent, clickable) {
+ if (imce.tree[dir]) return clickable ? imce.dirClickable(imce.tree[dir]) : imce.tree[dir];
+ var parent = parent || imce.tree['.'];
+ parent.ul = parent.ul ? parent.ul : parent.li.appendChild(imce.newEl('ul'));
+ var branch = imce.dirCreate(dir, imce.decode(dir.substr(dir.lastIndexOf('/')+1)), clickable);
+ parent.ul.appendChild(branch.li);
+ return branch;
+},
+
+//create list item for navigation tree
+dirCreate: function(dir, text, clickable) {
+ if (imce.tree[dir]) return imce.tree[dir];
+ var branch = imce.tree[dir] = {li: imce.newEl('li'), a: imce.newEl('a')};
+ $(branch.a).addClass('folder').text(text).attr('title', dir).appendTo(branch.li);
+ imce.dirCollapsible(branch);
+ return clickable ? imce.dirClickable(branch) : branch;
+},
+
+//change currently active directory
+dirActivate: function(dir) {
+ if (dir != imce.conf.dir) {
+ if (imce.tree[imce.conf.dir]){
+ $(imce.tree[imce.conf.dir].a).removeClass('active');
+ }
+ $(imce.tree[dir].a).addClass('active');
+ imce.conf.dir = dir;
+ }
+ return imce.tree[imce.conf.dir];
+},
+
+//make a dir accessible
+dirClickable: function(branch) {
+ if (branch.clkbl) return branch;
+ $(branch.a).attr('href', '#').removeClass('disabled').click(function() {imce.navigate(this.title); return false;});
+ branch.clkbl = true;
+ return branch;
+},
+
+//sub-directories expand-collapse ability
+dirCollapsible: function (branch) {
+ if (branch.clpsbl) return branch;
+ $(imce.newEl('span')).addClass('expander').html(' ').click(function() {
+ if (branch.ul) {
+ $(branch.ul).toggle();
+ $(branch.li).toggleClass('expanded');
+ imce.ie && $('#navigation-header').css('top', imce.NW.scrollTop);
+ }
+ else if (branch.clkbl){
+ $(branch.a).click();
+ }
+ }).prependTo(branch.li);
+ branch.clpsbl = true;
+ return branch;
+},
+
+//update navigation tree after getting subdirectories.
+dirSubdirs: function(dir, subdirs) {
+ var branch = imce.tree[dir];
+ if (subdirs && subdirs.length) {
+ var prefix = dir == '.' ? '' : dir +'/';
+ for (var i in subdirs) {//add subdirectories
+ imce.dirAdd(prefix + subdirs[i], branch, true);
+ }
+ $(branch.li).removeClass('leaf').addClass('expanded');
+ $(branch.ul).show();
+ }
+ else if (!branch.ul){//no subdirs->leaf
+ $(branch.li).removeClass('expanded').addClass('leaf');
+ }
+},
+
+//process file list
+initiateList: function(cached) {
+ var L = imce.hooks.list, dir = imce.conf.dir, token = {'%dir': dir == '.' ? $(imce.tree['.'].a).text() : imce.decode(dir)}
+ imce.findex = [], imce.fids = {}, imce.selected = {}, imce.selcount = 0, imce.vars.lastfid = null;
+ imce.tbody = imce.el('file-list').tBodies[0];
+ if (imce.tbody.rows.length) {
+ for (var row, i = 0; row = imce.tbody.rows[i]; i++) {
+ var fid = row.id;
+ imce.findex[i] = imce.fids[fid] = row;
+ if (cached) {
+ if (imce.hasC(row, 'selected')) {
+ imce.selected[imce.vars.lastfid = fid] = row;
+ imce.selcount++;
+ }
+ }
+ else {
+ for (var func, j = 0; func = L[j]; j++) func(row);//invoke list-hook
+ }
+ }
+ }
+ if (!imce.conf.perm.browse) {
+ imce.setMessage(Drupal.t('File browsing is disabled in directory %dir.', token), 'error');
+ }
+},
+
+//add a file to the list. (having properties name,size,formatted size,width,height,date,formatted date)
+fileAdd: function(file) {
+ var row, fid = file.name, i = imce.findex.length, attr = ['name', 'size', 'width', 'height', 'date'];
+ if (!(row = imce.fids[fid])) {
+ row = imce.findex[i] = imce.fids[fid] = imce.tbody.insertRow(i);
+ for (var i in attr) row.insertCell(i).className = attr[i];
+ }
+ row.cells[0].innerHTML = row.id = fid;
+ row.cells[1].innerHTML = file.fsize; row.cells[1].id = file.size;
+ row.cells[2].innerHTML = file.width;
+ row.cells[3].innerHTML = file.height;
+ row.cells[4].innerHTML = file.fdate; row.cells[4].id = file.date;
+ imce.invoke('list', row);
+ if (imce.vars.prvfid == fid) imce.setPreview(fid);
+ if (file.id) imce.urlId[imce.getURL(fid)] = file.id;
+},
+
+//remove a file from the list
+fileRemove: function(fid) {
+ if (!(row = imce.fids[fid])) return;
+ imce.fileDeSelect(fid);
+ imce.findex.splice(row.rowIndex, 1);
+ $(row).remove();
+ delete imce.fids[fid];
+ if (imce.vars.prvfid == fid) imce.setPreview();
+},
+
+//return a file object containing all properties.
+fileGet: function (fid) {
+ var file = imce.fileProps(fid);
+ if (file) {
+ file.name = imce.decode(fid);
+ file.url = imce.getURL(fid);
+ file.relpath = imce.getRelpath(fid);
+ file.id = imce.urlId[file.url] || 0; //file id for newly uploaded files
+ }
+ return file;
+},
+
+//return file properties embedded in html.
+fileProps: function (fid) {
+ var row = imce.fids[fid];
+ return row ? {
+ size: row.cells[1].innerHTML,
+ bytes: row.cells[1].id * 1,
+ width: row.cells[2].innerHTML * 1,
+ height: row.cells[3].innerHTML * 1,
+ date: row.cells[4].innerHTML,
+ time: row.cells[4].id * 1
+ } : null;
+},
+
+//simulate row click. selection-highlighting
+fileClick: function(row, ctrl, shft) {
+ if (!row) return;
+ var fid = typeof(row) == 'string' ? row : row.id;
+ if (ctrl || fid == imce.vars.prvfid) {
+ imce.fileToggleSelect(fid);
+ }
+ else if (shft) {
+ var last = imce.lastFid();
+ var start = last ? imce.fids[last].rowIndex : -1;
+ var end = imce.fids[fid].rowIndex;
+ var step = start > end ? -1 : 1;
+ while (start != end) {
+ start += step;
+ imce.fileSelect(imce.findex[start].id);
+ }
+ }
+ else {
+ for (var fname in imce.selected) {
+ imce.fileDeSelect(fname);
+ }
+ imce.fileSelect(fid);
+ }
+ //set preview
+ imce.setPreview(imce.selcount == 1 ? imce.lastFid() : null);
+},
+
+//file select/deselect functions
+fileSelect: function (fid) {
+ if (imce.selected[fid] || !imce.fids[fid]) return;
+ imce.selected[fid] = imce.fids[imce.vars.lastfid=fid];
+ $(imce.selected[fid]).addClass('selected');
+ imce.selcount++;
+},
+fileDeSelect: function (fid) {
+ if (!imce.selected[fid] || !imce.fids[fid]) return;
+ if (imce.vars.lastfid == fid) imce.vars.lastfid = null;
+ $(imce.selected[fid]).removeClass('selected');
+ delete imce.selected[fid];
+ imce.selcount--;
+},
+fileToggleSelect: function (fid) {
+ imce['file'+ (imce.selected[fid] ? 'De' : '') +'Select'](fid);
+},
+
+//process file operation form and create operation tabs.
+initiateOps: function() {
+ imce.setHtmlOps();
+ imce.setUploadOp();//upload
+ imce.setFileOps();//thumb, delete, resize
+},
+
+//process existing html ops.
+setHtmlOps: function () {
+ $(imce.el('ops-list')).children('li').each(function() {
+ if (!this.firstChild) return $(this).remove();
+ var name = this.id.substr(8);
+ var Op = imce.ops[name] = {div: imce.el('op-content-'+ name), li: imce.el('op-item-'+ name)};
+ Op.a = Op.li.firstChild;
+ Op.title = Op.a.innerHTML;
+ $(Op.a).click(function() {imce.opClick(name); return false;});
+ });
+},
+
+//convert upload form to an op.
+setUploadOp: function () {
+ var el, form = imce.el('imce-upload-form');
+ if (!form) return;
+ $(form).ajaxForm(imce.uploadSettings()).find('fieldset').each(function() {//clean up fieldsets
+ this.removeChild(this.firstChild);
+ $(this).after(this.childNodes);
+ }).remove();
+ // Set html response flag
+ el = form.elements['files[imce]'];
+ if (el && el.files && window.FormData) {
+ if (el = form.elements.html_response) {
+ el.value = 0;
+ }
+ }
+ imce.opAdd({name: 'upload', title: Drupal.t('Upload'), content: form});//add op
+},
+
+//convert fileop form submit buttons to ops.
+setFileOps: function () {
+ var form = imce.el('imce-fileop-form');
+ if (!form) return;
+ $(form.elements.filenames).parent().remove();
+ $(form).find('fieldset').each(function() {//remove fieldsets
+ var $sbmt = $('input:submit', this);
+ if (!$sbmt.length) return;
+ var Op = {name: $sbmt.attr('id').substr(5)};
+ var func = function() {imce.fopSubmit(Op.name); return false;};
+ $sbmt.click(func);
+ Op.title = $(this).children('legend').remove().text() || $sbmt.val();
+ Op.name == 'delete' ? (Op.func = func) : (Op.content = this.childNodes);
+ imce.opAdd(Op);
+ }).remove();
+ imce.vars.opform = $(form).serialize();//serialize remaining parts.
+},
+
+//refresh ops states. enable/disable
+refreshOps: function() {
+ for (var p in imce.conf.perm) {
+ if (imce.conf.perm[p]) imce.opEnable(p);
+ else imce.opDisable(p);
+ }
+},
+
+//add a new file operation
+opAdd: function (op) {
+ var oplist = imce.el('ops-list'), opcons = imce.el('op-contents');
+ var name = op.name || ('op-'+ $(oplist).children('li').length);
+ var title = op.title || 'Untitled';
+ var Op = imce.ops[name] = {title: title};
+ if (op.content) {
+ Op.div = imce.newEl('div');
+ $(Op.div).attr({id: 'op-content-'+ name, 'class': 'op-content'}).appendTo(opcons).append(op.content);
+ }
+ Op.a = imce.newEl('a');
+ Op.li = imce.newEl('li');
+ $(Op.a).attr({href: '#', name: name, title: title}).html('' + title +' ').click(imce.opClickEvent);
+ $(Op.li).attr('id', 'op-item-'+ name).append(Op.a).appendTo(oplist);
+ Op.func = op.func || imce.opVoid;
+ return Op;
+},
+
+//click event for file operations
+opClickEvent: function(e) {
+ imce.opClick(this.name);
+ return false;
+},
+
+//void operation function
+opVoid: function() {},
+
+//perform op click
+opClick: function(name) {
+ var Op = imce.ops[name], oldop = imce.vars.op;
+ if (!Op || Op.disabled) {
+ return imce.setMessage(Drupal.t('You can not perform this operation.'), 'error');
+ }
+ if (Op.div) {
+ if (oldop) {
+ var toggle = oldop == name;
+ imce.opShrink(oldop, toggle ? 'fadeOut' : 'hide');
+ if (toggle) return false;
+ }
+ var left = Op.li.offsetLeft;
+ var $opcon = $('#op-contents').css({left: 0});
+ $(Op.div).fadeIn('normal', function() {
+ setTimeout(function() {
+ if (imce.vars.op) {
+ var $inputs = $('input', imce.ops[imce.vars.op].div);
+ $inputs.eq(0).focus();
+ //form inputs become invisible in IE. Solution is as stupid as the behavior.
+ $('html').hasClass('ie') && $inputs.addClass('dummyie').removeClass('dummyie');
+ }
+ });
+ });
+ var diff = left + $opcon.width() - $('#imce-content').width();
+ $opcon.css({left: diff > 0 ? left - diff - 1 : left});
+ $(Op.li).addClass('active');
+ $(imce.opCloseLink).fadeIn(300);
+ imce.vars.op = name;
+ }
+ Op.func(true);
+ return true;
+},
+
+//enable a file operation
+opEnable: function(name) {
+ var Op = imce.ops[name];
+ if (Op && Op.disabled) {
+ Op.disabled = false;
+ $(Op.li).show();
+ }
+},
+
+//disable a file operation
+opDisable: function(name) {
+ var Op = imce.ops[name];
+ if (Op && !Op.disabled) {
+ Op.div && imce.opShrink(name);
+ $(Op.li).hide();
+ Op.disabled = true;
+ }
+},
+
+//hide contents of a file operation
+opShrink: function(name, effect) {
+ if (imce.vars.op != name) return;
+ var Op = imce.ops[name];
+ $(Op.div).stop(true, true)[effect || 'hide']();
+ $(Op.li).removeClass('active');
+ $(imce.opCloseLink).hide();
+ Op.func(false);
+ imce.vars.op = null;
+},
+
+//navigate to dir
+navigate: function(dir) {
+ if (imce.vars.navbusy || (dir == imce.conf.dir && !confirm(Drupal.t('Do you want to refresh the current directory?')))) return;
+ var cache = imce.vars.cache && dir != imce.conf.dir;
+ var set = imce.navSet(dir, cache);
+ if (cache && imce.cache[dir]) {//load from the cache
+ set.success({data: imce.cache[dir]});
+ set.complete();
+ }
+ else $.ajax(set);//live load
+},
+//ajax navigation settings
+navSet: function (dir, cache) {
+ $(imce.tree[dir].li).addClass('loading');
+ imce.vars.navbusy = dir;
+ return {url: imce.ajaxURL('navigate', dir),
+ type: 'GET',
+ dataType: 'json',
+ success: function(response) {
+ if (response.data && !response.data.error) {
+ if (cache) imce.navCache(imce.conf.dir, dir);//cache the current dir
+ imce.navUpdate(response.data, dir);
+ }
+ imce.processResponse(response);
+ },
+ complete: function () {
+ $(imce.tree[dir].li).removeClass('loading');
+ imce.vars.navbusy = null;
+ }
+ };
+},
+
+//update directory using the given data
+navUpdate: function(data, dir) {
+ var cached = data == imce.cache[dir], olddir = imce.conf.dir;
+ if (cached) data.files.id = 'file-list';
+ $(imce.FLW).html(data.files);
+ imce.dirActivate(dir);
+ imce.dirSubdirs(dir, data.subdirectories);
+ $.extend(imce.conf.perm, data.perm);
+ imce.refreshOps();
+ imce.initiateList(cached);
+ imce.setPreview(imce.selcount == 1 ? imce.lastFid() : null);
+ imce.SBW.scrollTop = 0;
+ imce.invoke('navigate', data, olddir, cached);
+},
+
+//set cache
+navCache: function (dir, newdir) {
+ var C = imce.cache[dir] = {'dir': dir, files: imce.el('file-list'), dirsize: imce.el('dir-size').innerHTML, perm: $.extend({}, imce.conf.perm)};
+ C.files.id = 'cached-list-'+ dir;
+ imce.FW.appendChild(C.files);
+ imce.invoke('cache', C, newdir);
+},
+
+//validate upload form
+uploadValidate: function (data, form, options) {
+ var path = $('#edit-imce').val();
+ if (!path) return false;
+ if (imce.conf.extensions != '*') {
+ var ext = path.substr(path.lastIndexOf('.') + 1);
+ if ((' '+ imce.conf.extensions +' ').indexOf(' '+ ext.toLowerCase() +' ') == -1) {
+ return imce.setMessage(Drupal.t('Only files with the following extensions are allowed: %files-allowed.', {'%files-allowed': imce.conf.extensions}), 'error');
+ }
+ }
+ options.url = imce.ajaxURL('upload');//make url contain current dir.
+ imce.fopLoading('upload', true);
+ return true;
+},
+
+//settings for upload
+uploadSettings: function () {
+ return {
+ beforeSubmit: imce.uploadValidate,
+ success: function (response) {
+ try{
+ imce.processResponse($.parseJSON(response));
+ } catch(e) {}
+ },
+ complete: function () {
+ imce.fopLoading('upload', false);
+ },
+ resetForm: true,
+ dataType: 'text'
+ };
+},
+
+//validate default ops(delete, thumb, resize)
+fopValidate: function(fop) {
+ if (!imce.validateSelCount(1, imce.conf.filenum)) return false;
+ switch (fop) {
+ case 'delete':
+ return confirm(Drupal.t('Delete selected files?'));
+ case 'thumb':
+ if (!$('input:checked', imce.ops['thumb'].div).length) {
+ return imce.setMessage(Drupal.t('Please select a thumbnail.'), 'error');
+ }
+ return imce.validateImage();
+ case 'resize':
+ var w = imce.el('edit-width').value, h = imce.el('edit-height').value;
+ var maxDim = imce.conf.dimensions.split('x');
+ var maxW = maxDim[0]*1, maxH = maxW ? maxDim[1]*1 : 0;
+ if (!(/^[1-9][0-9]*$/).test(w) || !(/^[1-9][0-9]*$/).test(h) || (maxW && (maxW < w*1 || maxH < h*1))) {
+ return imce.setMessage(Drupal.t('Please specify dimensions within the allowed range that is from 1x1 to @dimensions.', {'@dimensions': maxW ? imce.conf.dimensions : Drupal.t('unlimited')}), 'error');
+ }
+ return imce.validateImage();
+ }
+
+ var func = fop +'OpValidate';
+ if (imce[func]) return imce[func](fop);
+ return true;
+},
+
+//submit wrapper for default ops
+fopSubmit: function(fop) {
+ switch (fop) {
+ case 'thumb': case 'delete': case 'resize': return imce.commonSubmit(fop);
+ }
+ var func = fop +'OpSubmit';
+ if (imce[func]) return imce[func](fop);
+},
+
+//common submit function shared by default ops
+commonSubmit: function(fop) {
+ if (!imce.fopValidate(fop)) return false;
+ imce.fopLoading(fop, true);
+ $.ajax(imce.fopSettings(fop));
+},
+
+//settings for default file operations
+fopSettings: function (fop) {
+ return {url: imce.ajaxURL(fop), type: 'POST', dataType: 'json', success: imce.processResponse, complete: function (response) {imce.fopLoading(fop, false);}, data: imce.vars.opform +'&filenames='+ encodeURIComponent(imce.serialNames()) +'&jsop='+ fop + (imce.ops[fop].div ? '&'+ $('input, select, textarea', imce.ops[fop].div).serialize() : '')};
+},
+
+//toggle loading state
+fopLoading: function(fop, state) {
+ var el = imce.el('edit-'+ fop), func = state ? 'addClass' : 'removeClass';
+ if (el) {
+ $(el)[func]('loading');
+ el.disabled = state;
+ }
+ else {
+ $(imce.ops[fop].li)[func]('loading');
+ imce.ops[fop].disabled = state;
+ }
+},
+
+//preview a file.
+setPreview: function (fid) {
+ var row, html = '';
+ imce.vars.prvfid = fid;
+ if (fid && (row = imce.fids[fid])) {
+ var width = row.cells[2].innerHTML * 1;
+ html = imce.vars.previewImages && width ? imce.imgHtml(fid, width, row.cells[3].innerHTML) : imce.decodePlain(fid);
+ html = ''+ html +' ';
+ }
+ imce.el('file-preview').innerHTML = html;
+},
+
+//default file send function. sends the file to the new window.
+send: function (fid) {
+ fid && window.open(imce.getURL(fid));
+},
+
+//add an operation for an external application to which the files are send.
+setSendTo: function (title, func) {
+ imce.send = function (fid) { fid && func(imce.fileGet(fid), window);};
+ var opFunc = function () {
+ if (imce.selcount != 1) return imce.setMessage(Drupal.t('Please select a file.'), 'error');
+ imce.send(imce.vars.prvfid);
+ };
+ imce.vars.prvtitle = title;
+ return imce.opAdd({name: 'sendto', title: title, func: opFunc});
+},
+
+//move initial page messages into log
+prepareMsgs: function () {
+ var msgs;
+ if (msgs = imce.el('imce-messages')) {
+ $('>div', msgs).each(function (){
+ var type = this.className.split(' ')[1];
+ var li = $('>ul li', this);
+ if (li.length) li.each(function () {imce.setMessage(this.innerHTML, type);});
+ else imce.setMessage(this.innerHTML, type);
+ });
+ $(msgs).remove();
+ }
+},
+
+//insert log message
+setMessage: function (msg, type) {
+ var $box = $(imce.msgBox);
+ var logs = imce.el('log-messages') || $(imce.newEl('div')).appendTo('#help-box-content').before(''+ Drupal.t('Log messages') +': ').attr('id', 'log-messages')[0];
+ var msg = ''+ msg +'
';
+ $box.queue(function() {
+ $box.css({opacity: 0, display: 'block'}).html(msg);
+ $box.dequeue();
+ });
+ var q = $box.queue().length, t = imce.vars.msgT || 1000;
+ q = q < 2 ? 1 : q < 3 ? 0.8 : q < 4 ? 0.7 : 0.4;//adjust speed with respect to queue length
+ $box.fadeTo(600 * q, 1).fadeTo(t * q, 1).fadeOut(400 * q);
+ $(logs).append(msg);
+ return false;
+},
+
+//invoke hooks
+invoke: function (hook) {
+ var i, args, func, funcs;
+ if ((funcs = imce.hooks[hook]) && funcs.length) {
+ (args = $.makeArray(arguments)).shift();
+ for (i = 0; func = funcs[i]; i++) func.apply(this, args);
+ }
+},
+
+//process response
+processResponse: function (response) {
+ if (response.data) imce.resData(response.data);
+ if (response.messages) imce.resMsgs(response.messages);
+},
+
+//process response data
+resData: function (data) {
+ var i, added, removed;
+ if (added = data.added) {
+ var cnt = imce.findex.length;
+ for (i in added) {//add new files or update existing
+ imce.fileAdd(added[i]);
+ }
+ if (added.length == 1) {//if it is a single file operation
+ imce.highlight(added[0].name);//highlight
+ }
+ if (imce.findex.length != cnt) {//if new files added, scroll to bottom.
+ $(imce.SBW).animate({scrollTop: imce.SBW.scrollHeight}).focus();
+ }
+ }
+ if (removed = data.removed) for (i in removed) {
+ imce.fileRemove(removed[i]);
+ }
+ imce.conf.dirsize = data.dirsize;
+ imce.updateStat();
+},
+
+//set response messages
+resMsgs: function (msgs) {
+ for (var type in msgs) for (var i in msgs[type]) {
+ imce.setMessage(msgs[type][i], type);
+ }
+},
+
+//return img markup
+imgHtml: function (fid, width, height) {
+ return '' + imce.decodePlain(row.id) + ' ';
+ row.onmousedown = function(e) {
+ var e = e||window.event;
+ imce.fileClick(this, e.ctrlKey, e.shiftKey);
+ return !(e.ctrlKey || e.shiftKey);
+ };
+ row.ondblclick = function(e) {
+ imce.send(this.id);
+ return false;
+ };
+},
+
+//decode urls. uses unescape. can be overridden to use decodeURIComponent
+decode: function (str) {
+ try {
+ return decodeURIComponent(str);
+ } catch(e) {}
+ return str;
+},
+
+//decode and convert to plain text
+decodePlain: function (str) {
+ return Drupal.checkPlain(imce.decode(str));
+},
+
+//global ajax error function
+ajaxError: function (e, response, settings, thrown) {
+ imce.setMessage(Drupal.ajaxError(response, settings.url).replace(/\n/g, ''+ file.name +' ('+ file.size +') ');
+ ii.activeType = null;
+ win.blur();
+ ii.insertAtCursor(ii.activeTextarea, html, type);
+};
+
+})(jQuery);
\ No newline at end of file
diff --git a/sites/all/modules/imce/js/jquery.form.js b/sites/all/modules/imce/js/jquery.form.js
new file mode 100644
index 0000000..b750db6
--- /dev/null
+++ b/sites/all/modules/imce/js/jquery.form.js
@@ -0,0 +1,31 @@
+/*!
+ * jQuery Form Plugin
+ * version: 3.17 (25-SEP-2012)
+ * @requires jQuery v1.3.2 or later
+ */
+(function(c){'use strict';function v(a){var d=a.data;a.isDefaultPrevented()||(a.preventDefault(),c(a.target).ajaxSubmit(d))}function y(a){var d=a.target,g=c(d);if(!g.is(":submit,input:image")){d=g.closest(":submit");if(0===d.length)return;d=d[0]}var f=this;f.clk=d;"image"==d.type&&(void 0!==a.offsetX?(f.clk_x=a.offsetX,f.clk_y=a.offsetY):"function"==typeof c.fn.offset?(g=g.offset(),f.clk_x=a.pageX-g.left,f.clk_y=a.pageY-g.top):(f.clk_x=a.pageX-d.offsetLeft,f.clk_y=a.pageY-d.offsetTop));setTimeout(function(){f.clk=
+f.clk_x=f.clk_y=null},100)}function s(){if(c.fn.ajaxSubmit.debug){var a="[jquery.form] "+Array.prototype.join.call(arguments,"");window.console&&window.console.log?window.console.log(a):window.opera&&window.opera.postError&&window.opera.postError(a)}}var x,z;x=void 0!==c("').val(e.extraData[n].value).appendTo(d)[0]):
+p.push(c('b)return null;for(var g=[],h=a.options,n=(f="select-one"==f)?b+1:h.length,b=f?b:0;b
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $imce_ref)); /* see imce-file-list-tpl.php */?>
+
+
+
''. count($imce['files']) .' ',
+ '!dirsize' => ''. format_size($imce['dirsize']) .' ',
+ '!quota' => ''. ($imce['quota'] ? format_size($imce['quota']) : ($imce['tuquota'] ? format_size($imce['tuquota']) : t('unlimited quota'))) .' '
+ )); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
$file) {?>
+
+
+
\ No newline at end of file
diff --git a/sites/all/modules/imce/tpl/imce-page.tpl.php b/sites/all/modules/imce/tpl/imce-page.tpl.php
new file mode 100644
index 0000000..cfe2185
--- /dev/null
+++ b/sites/all/modules/imce/tpl/imce-page.tpl.php
@@ -0,0 +1,21 @@
+
+
+
+
+ <?php print t('File Browser'); ?>
+
+
+
+
+
+
diff --git a/sites/default/modules/features/popsu_actualites/popsu_actualites.features.field.inc b/sites/default/modules/features/popsu_actualites/popsu_actualites.features.field.inc
deleted file mode 100644
index f53fc7e..0000000
--- a/sites/default/modules/features/popsu_actualites/popsu_actualites.features.field.inc
+++ /dev/null
@@ -1,426 +0,0 @@
- array(
- 'active' => '1',
- 'cardinality' => '1',
- 'deleted' => '0',
- 'entity_types' => array(),
- 'field_name' => 'field_popsu_actu_body',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
- 'indexes' => array(
- 'format' => array(
- 0 => 'format',
- ),
- ),
- 'locked' => '0',
- 'module' => 'text',
- 'settings' => array(),
- 'translatable' => '0',
- 'type' => 'text_with_summary',
- ),
- 'field_instance' => array(
- 'bundle' => 'popsu_actu',
- 'default_value' => NULL,
- 'deleted' => '0',
- 'description' => '',
- 'display' => array(
- 'default' => array(
- 'label' => 'above',
- 'module' => 'text',
- 'settings' => array(),
- 'type' => 'text_default',
- 'weight' => 1,
- ),
- 'teaser' => array(
- 'label' => 'above',
- 'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 0,
- ),
- ),
- 'entity_type' => 'node',
- 'field_name' => 'field_popsu_actu_body',
- 'label' => 'Texte de l\'actualité',
- 'required' => 0,
- 'settings' => array(
- 'display_summary' => 0,
- 'text_processing' => '1',
- 'user_register_form' => FALSE,
- ),
- 'widget' => array(
- 'active' => 1,
- 'module' => 'text',
- 'settings' => array(
- 'rows' => '20',
- 'summary_rows' => 5,
- ),
- 'type' => 'text_textarea_with_summary',
- 'weight' => '12',
- ),
- ),
- );
-
- // Exported field: 'node-popsu_actu-field_popsu_actu_date'.
- $fields['node-popsu_actu-field_popsu_actu_date'] = array(
- 'field_config' => array(
- 'active' => '1',
- 'cardinality' => '1',
- 'deleted' => '0',
- 'entity_types' => array(),
- 'field_name' => 'field_popsu_actu_date',
- 'foreign keys' => array(),
- 'indexes' => array(),
- 'locked' => '0',
- 'module' => 'date',
- 'settings' => array(
- 'cache_count' => '4',
- 'cache_enabled' => 0,
- 'granularity' => array(
- 'day' => 'day',
- 'hour' => 0,
- 'minute' => 0,
- 'month' => 'month',
- 'second' => 0,
- 'year' => 'year',
- ),
- 'timezone_db' => '',
- 'todate' => '',
- 'tz_handling' => 'none',
- ),
- 'translatable' => '0',
- 'type' => 'datetime',
- ),
- 'field_instance' => array(
- 'bundle' => 'popsu_actu',
- 'deleted' => '0',
- 'description' => 'Si vous souhaitez retarder la publication de cette actualité, choisissez une date dans le futur.',
- 'display' => array(
- 'default' => array(
- 'label' => 'above',
- 'module' => 'date',
- 'settings' => array(
- 'format_type' => 'long',
- 'fromto' => 'both',
- 'multiple_from' => '',
- 'multiple_number' => '',
- 'multiple_to' => '',
- ),
- 'type' => 'date_default',
- 'weight' => 2,
- ),
- 'teaser' => array(
- 'label' => 'above',
- 'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 0,
- ),
- ),
- 'entity_type' => 'node',
- 'field_name' => 'field_popsu_actu_date',
- 'label' => 'Date de début de publication de l\'actualité sur la page d\'accueil',
- 'required' => 1,
- 'settings' => array(
- 'default_value' => 'now',
- 'default_value2' => 'same',
- 'default_value_code' => '',
- 'default_value_code2' => '',
- 'user_register_form' => FALSE,
- ),
- 'widget' => array(
- 'active' => 1,
- 'module' => 'date',
- 'settings' => array(
- 'increment' => '15',
- 'input_format' => 'd/m/Y - H:i:s',
- 'input_format_custom' => '',
- 'label_position' => 'above',
- 'text_parts' => array(),
- 'year_range' => '-3:+3',
- ),
- 'type' => 'date_popup',
- 'weight' => '8',
- ),
- ),
- );
-
- // Exported field: 'node-popsu_actu-field_popsu_actu_date_fin'.
- $fields['node-popsu_actu-field_popsu_actu_date_fin'] = array(
- 'field_config' => array(
- 'active' => '1',
- 'cardinality' => '1',
- 'deleted' => '0',
- 'entity_types' => array(),
- 'field_name' => 'field_popsu_actu_date_fin',
- 'foreign keys' => array(),
- 'indexes' => array(),
- 'locked' => '0',
- 'module' => 'date',
- 'settings' => array(
- 'cache_count' => '4',
- 'cache_enabled' => 0,
- 'granularity' => array(
- 'day' => 'day',
- 'hour' => 0,
- 'minute' => 0,
- 'month' => 'month',
- 'second' => 0,
- 'year' => 'year',
- ),
- 'timezone_db' => '',
- 'todate' => '',
- 'tz_handling' => 'none',
- ),
- 'translatable' => '0',
- 'type' => 'datetime',
- ),
- 'field_instance' => array(
- 'bundle' => 'popsu_actu',
- 'deleted' => '0',
- 'description' => 'Par défaut, les actualités restent 30 jours sur la page d\'accueil. Si vous souhaitez rallonger ce délai, modifier cette date.',
- 'display' => array(
- 'default' => array(
- 'label' => 'above',
- 'module' => 'date',
- 'settings' => array(
- 'format_type' => 'long',
- 'fromto' => 'both',
- 'multiple_from' => '',
- 'multiple_number' => '',
- 'multiple_to' => '',
- ),
- 'type' => 'date_default',
- 'weight' => 5,
- ),
- 'teaser' => array(
- 'label' => 'above',
- 'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 0,
- ),
- ),
- 'entity_type' => 'node',
- 'field_name' => 'field_popsu_actu_date_fin',
- 'label' => 'Date de fin de publication de l\'actualité sur la page d\'accueil',
- 'required' => 1,
- 'settings' => array(
- 'default_value' => 'strtotime',
- 'default_value2' => 'same',
- 'default_value_code' => '+ 30 days',
- 'default_value_code2' => '',
- 'user_register_form' => FALSE,
- ),
- 'widget' => array(
- 'active' => 1,
- 'module' => 'date',
- 'settings' => array(
- 'increment' => '15',
- 'input_format' => 'd/m/Y - H:i:s',
- 'input_format_custom' => '',
- 'label_position' => 'above',
- 'text_parts' => array(),
- 'year_range' => '-3:+3',
- ),
- 'type' => 'date_popup',
- 'weight' => '9',
- ),
- ),
- );
-
- // Exported field: 'node-popsu_actu-field_popsu_actu_image'.
- $fields['node-popsu_actu-field_popsu_actu_image'] = array(
- 'field_config' => array(
- 'active' => '1',
- 'cardinality' => '1',
- 'deleted' => '0',
- 'entity_types' => array(),
- 'field_name' => 'field_popsu_actu_image',
- 'foreign keys' => array(
- 'fid' => array(
- 'columns' => array(
- 'fid' => 'fid',
- ),
- 'table' => 'file_managed',
- ),
- ),
- 'indexes' => array(
- 'fid' => array(
- 0 => 'fid',
- ),
- ),
- 'locked' => '0',
- 'module' => 'image',
- 'settings' => array(
- 'default_image' => 0,
- 'uri_scheme' => 'public',
- ),
- 'translatable' => '0',
- 'type' => 'image',
- ),
- 'field_instance' => array(
- 'bundle' => 'popsu_actu',
- 'deleted' => '0',
- 'description' => '',
- 'display' => array(
- 'default' => array(
- 'label' => 'above',
- 'module' => 'image',
- 'settings' => array(
- 'image_link' => '',
- 'image_style' => '',
- ),
- 'type' => 'image',
- 'weight' => 3,
- ),
- 'teaser' => array(
- 'label' => 'above',
- 'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 0,
- ),
- ),
- 'entity_type' => 'node',
- 'field_name' => 'field_popsu_actu_image',
- 'label' => 'Image de l\'actualité',
- 'required' => 0,
- 'settings' => array(
- 'alt_field' => 0,
- 'default_image' => 0,
- 'file_directory' => '',
- 'file_extensions' => 'png gif jpg jpeg',
- 'filefield_paths' => array(
- 'active_updating' => 0,
- 'file_name' => array(
- 'options' => array(
- 'pathauto' => 1,
- 'transliterate' => 1,
- ),
- 'value' => '[file:ffp-name-only-original].[file:ffp-extension-original]',
- ),
- 'file_path' => array(
- 'options' => array(
- 'pathauto' => 1,
- 'transliterate' => 1,
- ),
- 'value' => 'nodes/[node:content-type]/[node:nid]/image',
- ),
- 'retroactive_update' => 0,
- ),
- 'max_filesize' => '',
- 'max_resolution' => '',
- 'min_resolution' => '',
- 'title_field' => 1,
- 'user_register_form' => FALSE,
- ),
- 'widget' => array(
- 'active' => 1,
- 'module' => 'image',
- 'settings' => array(
- 'preview_image_style' => 'thumbnail',
- 'progress_indicator' => 'throbber',
- ),
- 'type' => 'image_image',
- 'weight' => '4',
- ),
- ),
- );
-
- // Exported field: 'node-popsu_actu-field_popsu_actu_soustitre'.
- $fields['node-popsu_actu-field_popsu_actu_soustitre'] = array(
- 'field_config' => array(
- 'active' => '1',
- 'cardinality' => '1',
- 'deleted' => '0',
- 'entity_types' => array(),
- 'field_name' => 'field_popsu_actu_soustitre',
- 'foreign keys' => array(
- 'format' => array(
- 'columns' => array(
- 'format' => 'format',
- ),
- 'table' => 'filter_format',
- ),
- ),
- 'indexes' => array(
- 'format' => array(
- 0 => 'format',
- ),
- ),
- 'locked' => '0',
- 'module' => 'text',
- 'settings' => array(
- 'max_length' => '255',
- ),
- 'translatable' => '0',
- 'type' => 'text',
- ),
- 'field_instance' => array(
- 'bundle' => 'popsu_actu',
- 'default_value' => NULL,
- 'deleted' => '0',
- 'description' => '',
- 'display' => array(
- 'default' => array(
- 'label' => 'above',
- 'module' => 'text',
- 'settings' => array(),
- 'type' => 'text_default',
- 'weight' => 4,
- ),
- 'teaser' => array(
- 'label' => 'above',
- 'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 0,
- ),
- ),
- 'entity_type' => 'node',
- 'field_name' => 'field_popsu_actu_soustitre',
- 'label' => 'Sous-titre de l\'actualité',
- 'required' => 0,
- 'settings' => array(
- 'text_processing' => '0',
- 'user_register_form' => FALSE,
- ),
- 'widget' => array(
- 'active' => 1,
- 'module' => 'text',
- 'settings' => array(
- 'size' => '60',
- ),
- 'type' => 'text_textfield',
- 'weight' => '7',
- ),
- ),
- );
-
- // Translatables
- // Included for use with string extractors like potx.
- t('Date de début de publication de l\'actualité sur la page d\'accueil');
- t('Date de fin de publication de l\'actualité sur la page d\'accueil');
- t('Image de l\'actualité');
- t('Par défaut, les actualités restent 30 jours sur la page d\'accueil. Si vous souhaitez rallonger ce délai, modifier cette date.');
- t('Si vous souhaitez retarder la publication de cette actualité, choisissez une date dans le futur.');
- t('Sous-titre de l\'actualité');
- t('Texte de l\'actualité');
-
- return $fields;
-}
diff --git a/sites/default/modules/features/popsu_actualites/popsu_actualites.features.field_base.inc b/sites/default/modules/features/popsu_actualites/popsu_actualites.features.field_base.inc
new file mode 100644
index 0000000..b51bd37
--- /dev/null
+++ b/sites/default/modules/features/popsu_actualites/popsu_actualites.features.field_base.inc
@@ -0,0 +1,182 @@
+ 1,
+ 'cardinality' => -1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_popsu_actu_attachment',
+ 'indexes' => array(
+ 'fid' => array(
+ 0 => 'fid',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'file',
+ 'settings' => array(
+ 'display_default' => 0,
+ 'display_field' => 0,
+ 'uri_scheme' => 'public',
+ ),
+ 'translatable' => 0,
+ 'type' => 'file',
+ );
+
+ // Exported field_base: 'field_popsu_actu_body'.
+ $field_bases['field_popsu_actu_body'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_popsu_actu_body',
+ 'indexes' => array(
+ 'format' => array(
+ 0 => 'format',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'text',
+ 'settings' => array(),
+ 'translatable' => 0,
+ 'type' => 'text_with_summary',
+ );
+
+ // Exported field_base: 'field_popsu_actu_date'.
+ $field_bases['field_popsu_actu_date'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_popsu_actu_date',
+ 'indexes' => array(),
+ 'locked' => 0,
+ 'module' => 'date',
+ 'settings' => array(
+ 'cache_count' => 4,
+ 'cache_enabled' => 0,
+ 'granularity' => array(
+ 'day' => 'day',
+ 'hour' => 0,
+ 'minute' => 0,
+ 'month' => 'month',
+ 'second' => 0,
+ 'year' => 'year',
+ ),
+ 'timezone_db' => '',
+ 'todate' => '',
+ 'tz_handling' => 'none',
+ ),
+ 'translatable' => 0,
+ 'type' => 'datetime',
+ );
+
+ // Exported field_base: 'field_popsu_actu_date_fin'.
+ $field_bases['field_popsu_actu_date_fin'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_popsu_actu_date_fin',
+ 'indexes' => array(),
+ 'locked' => 0,
+ 'module' => 'date',
+ 'settings' => array(
+ 'cache_count' => 4,
+ 'cache_enabled' => 0,
+ 'granularity' => array(
+ 'day' => 'day',
+ 'hour' => 0,
+ 'minute' => 0,
+ 'month' => 'month',
+ 'second' => 0,
+ 'year' => 'year',
+ ),
+ 'timezone_db' => '',
+ 'todate' => '',
+ 'tz_handling' => 'none',
+ ),
+ 'translatable' => 0,
+ 'type' => 'datetime',
+ );
+
+ // Exported field_base: 'field_popsu_actu_enhome'.
+ $field_bases['field_popsu_actu_enhome'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_popsu_actu_enhome',
+ 'indexes' => array(
+ 'value' => array(
+ 0 => 'value',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'list',
+ 'settings' => array(
+ 'allowed_values' => array(
+ 0 => '',
+ 1 => 'Publié sur la page d\'accueil',
+ ),
+ 'allowed_values_function' => '',
+ ),
+ 'translatable' => 0,
+ 'type' => 'list_boolean',
+ );
+
+ // Exported field_base: 'field_popsu_actu_image'.
+ $field_bases['field_popsu_actu_image'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_popsu_actu_image',
+ 'indexes' => array(
+ 'fid' => array(
+ 0 => 'fid',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'image',
+ 'settings' => array(
+ 'default_image' => 0,
+ 'uri_scheme' => 'public',
+ ),
+ 'translatable' => 0,
+ 'type' => 'image',
+ );
+
+ // Exported field_base: 'field_popsu_actu_soustitre'.
+ $field_bases['field_popsu_actu_soustitre'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_popsu_actu_soustitre',
+ 'indexes' => array(
+ 'format' => array(
+ 0 => 'format',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'text',
+ 'settings' => array(
+ 'max_length' => 255,
+ ),
+ 'translatable' => 0,
+ 'type' => 'text',
+ );
+
+ return $field_bases;
+}
diff --git a/sites/default/modules/features/popsu_actualites/popsu_actualites.features.field_instance.inc b/sites/default/modules/features/popsu_actualites/popsu_actualites.features.field_instance.inc
new file mode 100644
index 0000000..1769c8b
--- /dev/null
+++ b/sites/default/modules/features/popsu_actualites/popsu_actualites.features.field_instance.inc
@@ -0,0 +1,404 @@
+ 'popsu_actu',
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'above',
+ 'module' => 'file',
+ 'settings' => array(),
+ 'type' => 'file_default',
+ 'weight' => 6,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ ),
+ 'entity_type' => 'node',
+ 'field_name' => 'field_popsu_actu_attachment',
+ 'label' => 'Pièces jointes à cette actualité',
+ 'required' => 0,
+ 'settings' => array(
+ 'description_field' => 1,
+ 'file_directory' => '',
+ 'file_extensions' => 'txt pdf zip rar xls doc xlsx docx ppt pptx',
+ 'filefield_paths' => array(
+ 'active_updating' => 0,
+ 'file_name' => array(
+ 'options' => array(
+ 'pathauto' => 1,
+ 'transliterate' => 1,
+ ),
+ 'value' => '[file:ffp-name-only-original].[file:ffp-extension-original]',
+ ),
+ 'file_path' => array(
+ 'options' => array(
+ 'pathauto' => 1,
+ 'transliterate' => 1,
+ ),
+ 'value' => 'nodes/[node:content-type]/[node:nid]/files',
+ ),
+ 'retroactive_update' => 0,
+ ),
+ 'max_filesize' => '',
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'file',
+ 'settings' => array(
+ 'insert' => 0,
+ 'insert_absolute' => FALSE,
+ 'insert_class' => '',
+ 'insert_default' => array(
+ 0 => 'auto',
+ ),
+ 'insert_styles' => array(
+ 0 => 'auto',
+ ),
+ 'insert_width' => '',
+ 'progress_indicator' => 'bar',
+ ),
+ 'type' => 'file_generic',
+ 'weight' => 3,
+ ),
+ );
+
+ // Exported field_instance: 'node-popsu_actu-field_popsu_actu_body'.
+ $field_instances['node-popsu_actu-field_popsu_actu_body'] = array(
+ 'bundle' => 'popsu_actu',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 1,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ ),
+ 'entity_type' => 'node',
+ 'field_name' => 'field_popsu_actu_body',
+ 'label' => 'Texte de l\'actualité',
+ 'required' => 0,
+ 'settings' => array(
+ 'display_summary' => 0,
+ 'text_processing' => 1,
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'text',
+ 'settings' => array(
+ 'rows' => 20,
+ 'summary_rows' => 5,
+ ),
+ 'type' => 'text_textarea_with_summary',
+ 'weight' => 12,
+ ),
+ );
+
+ // Exported field_instance: 'node-popsu_actu-field_popsu_actu_date'.
+ $field_instances['node-popsu_actu-field_popsu_actu_date'] = array(
+ 'bundle' => 'popsu_actu',
+ 'deleted' => 0,
+ 'description' => 'Si vous souhaitez retarder la publication de cette actualité, choisissez une date dans le futur.',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'module' => 'date',
+ 'settings' => array(
+ 'format_type' => 'long',
+ 'fromto' => 'both',
+ 'multiple_from' => '',
+ 'multiple_number' => '',
+ 'multiple_to' => '',
+ ),
+ 'type' => 'date_default',
+ 'weight' => 2,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ ),
+ 'entity_type' => 'node',
+ 'field_name' => 'field_popsu_actu_date',
+ 'label' => 'Date de début de validité de l\'actualité',
+ 'required' => 1,
+ 'settings' => array(
+ 'default_value' => 'now',
+ 'default_value2' => 'same',
+ 'default_value_code' => '',
+ 'default_value_code2' => '',
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'date',
+ 'settings' => array(
+ 'increment' => 15,
+ 'input_format' => 'd/m/Y - H:i:s',
+ 'input_format_custom' => '',
+ 'label_position' => 'above',
+ 'text_parts' => array(),
+ 'year_range' => '-3:+3',
+ ),
+ 'type' => 'date_popup',
+ 'weight' => 9,
+ ),
+ );
+
+ // Exported field_instance: 'node-popsu_actu-field_popsu_actu_date_fin'.
+ $field_instances['node-popsu_actu-field_popsu_actu_date_fin'] = array(
+ 'bundle' => 'popsu_actu',
+ 'deleted' => 0,
+ 'description' => 'Par défaut, les actualités restent 30 jours sur la page d\'accueil. Si vous souhaitez rallonger ce délai, modifier cette date.',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'module' => 'date',
+ 'settings' => array(
+ 'format_type' => 'long',
+ 'fromto' => 'both',
+ 'multiple_from' => '',
+ 'multiple_number' => '',
+ 'multiple_to' => '',
+ ),
+ 'type' => 'date_default',
+ 'weight' => 5,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ ),
+ 'entity_type' => 'node',
+ 'field_name' => 'field_popsu_actu_date_fin',
+ 'label' => 'Date de fin de validité de l\'actualité',
+ 'required' => 1,
+ 'settings' => array(
+ 'default_value' => 'strtotime',
+ 'default_value2' => 'same',
+ 'default_value_code' => '+ 30 days',
+ 'default_value_code2' => '',
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'date',
+ 'settings' => array(
+ 'increment' => 15,
+ 'input_format' => 'd/m/Y - H:i:s',
+ 'input_format_custom' => '',
+ 'label_position' => 'above',
+ 'text_parts' => array(),
+ 'year_range' => '-3:+3',
+ ),
+ 'type' => 'date_popup',
+ 'weight' => 10,
+ ),
+ );
+
+ // Exported field_instance: 'node-popsu_actu-field_popsu_actu_enhome'.
+ $field_instances['node-popsu_actu-field_popsu_actu_enhome'] = array(
+ 'bundle' => 'popsu_actu',
+ 'default_value' => array(
+ 0 => array(
+ 'value' => 1,
+ ),
+ ),
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 7,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ ),
+ 'entity_type' => 'node',
+ 'field_name' => 'field_popsu_actu_enhome',
+ 'label' => 'Publier sur la page d\'accueil',
+ 'required' => 0,
+ 'settings' => array(
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'options',
+ 'settings' => array(
+ 'display_label' => 0,
+ ),
+ 'type' => 'options_onoff',
+ 'weight' => 8,
+ ),
+ );
+
+ // Exported field_instance: 'node-popsu_actu-field_popsu_actu_image'.
+ $field_instances['node-popsu_actu-field_popsu_actu_image'] = array(
+ 'bundle' => 'popsu_actu',
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'module' => 'image',
+ 'settings' => array(
+ 'image_link' => '',
+ 'image_style' => '',
+ ),
+ 'type' => 'image',
+ 'weight' => 3,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ ),
+ 'entity_type' => 'node',
+ 'field_name' => 'field_popsu_actu_image',
+ 'label' => 'Image de l\'actualité',
+ 'required' => 0,
+ 'settings' => array(
+ 'alt_field' => 0,
+ 'default_image' => 0,
+ 'file_directory' => '',
+ 'file_extensions' => 'png gif jpg jpeg',
+ 'filefield_paths' => array(
+ 'active_updating' => 0,
+ 'file_name' => array(
+ 'options' => array(
+ 'pathauto' => 1,
+ 'transliterate' => 1,
+ ),
+ 'value' => '[file:ffp-name-only-original].[file:ffp-extension-original]',
+ ),
+ 'file_path' => array(
+ 'options' => array(
+ 'pathauto' => 1,
+ 'transliterate' => 1,
+ ),
+ 'value' => 'nodes/[node:content-type]/[node:nid]/image',
+ ),
+ 'retroactive_update' => 0,
+ ),
+ 'max_filesize' => '',
+ 'max_resolution' => '',
+ 'min_resolution' => '',
+ 'title_field' => 1,
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'image',
+ 'settings' => array(
+ 'insert' => 0,
+ 'insert_absolute' => FALSE,
+ 'insert_class' => '',
+ 'insert_default' => array(
+ 0 => 'auto',
+ ),
+ 'insert_styles' => array(
+ 0 => 'auto',
+ ),
+ 'insert_width' => '',
+ 'preview_image_style' => 'thumbnail',
+ 'progress_indicator' => 'throbber',
+ ),
+ 'type' => 'image_image',
+ 'weight' => 4,
+ ),
+ );
+
+ // Exported field_instance: 'node-popsu_actu-field_popsu_actu_soustitre'.
+ $field_instances['node-popsu_actu-field_popsu_actu_soustitre'] = array(
+ 'bundle' => 'popsu_actu',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 4,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ ),
+ 'entity_type' => 'node',
+ 'field_name' => 'field_popsu_actu_soustitre',
+ 'label' => 'Sous-titre de l\'actualité',
+ 'required' => 0,
+ 'settings' => array(
+ 'text_processing' => 0,
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'text',
+ 'settings' => array(
+ 'size' => 60,
+ ),
+ 'type' => 'text_textfield',
+ 'weight' => 7,
+ ),
+ );
+
+ // Translatables
+ // Included for use with string extractors like potx.
+ t('Date de début de validité de l\'actualité');
+ t('Date de fin de validité de l\'actualité');
+ t('Image de l\'actualité');
+ t('Par défaut, les actualités restent 30 jours sur la page d\'accueil. Si vous souhaitez rallonger ce délai, modifier cette date.');
+ t('Pièces jointes à cette actualité');
+ t('Publier sur la page d\'accueil');
+ t('Si vous souhaitez retarder la publication de cette actualité, choisissez une date dans le futur.');
+ t('Sous-titre de l\'actualité');
+ t('Texte de l\'actualité');
+
+ return $field_instances;
+}
diff --git a/sites/default/modules/features/popsu_actualites/popsu_actualites.features.inc b/sites/default/modules/features/popsu_actualites/popsu_actualites.features.inc
index 7360562..ba7eec8 100644
--- a/sites/default/modules/features/popsu_actualites/popsu_actualites.features.inc
+++ b/sites/default/modules/features/popsu_actualites/popsu_actualites.features.inc
@@ -4,45 +4,22 @@
* popsu_actualites.features.inc
*/
-/**
- * Implements hook_block_class_features_default_class().
- */
-function popsu_actualites_block_class_features_default_class() {
- return array(
- 'views:actualites-block_1' => array(
- 'module' => 'views',
- 'delta' => 'actualites-block_1',
- 'css_classes' => 'left-nav-level-1',
- ),
- 'views:actualites-block_2' => array(
- 'module' => 'views',
- 'delta' => 'actualites-block_2',
- 'css_classes' => 'left-nav-level-1',
- ),
- );
-}
-
/**
* Implements hook_ctools_plugin_api().
*/
-function popsu_actualites_ctools_plugin_api() {
- list($module, $api) = func_get_args();
+function popsu_actualites_ctools_plugin_api($module = NULL, $api = NULL) {
if ($module == "boxes" && $api == "box") {
return array("version" => "1");
}
- list($module, $api) = func_get_args();
if ($module == "context" && $api == "context") {
return array("version" => "3");
}
- list($module, $api) = func_get_args();
if ($module == "field_group" && $api == "field_group") {
return array("version" => "1");
}
- list($module, $api) = func_get_args();
if ($module == "page_manager" && $api == "pages_default") {
return array("version" => "1");
}
- list($module, $api) = func_get_args();
if ($module == "strongarm" && $api == "strongarm") {
return array("version" => "1");
}
@@ -51,8 +28,8 @@ function popsu_actualites_ctools_plugin_api() {
/**
* Implements hook_views_api().
*/
-function popsu_actualites_views_api() {
- return array("version" => "3.0");
+function popsu_actualites_views_api($module = NULL, $api = NULL) {
+ return array("api" => "3.0");
}
/**
@@ -63,44 +40,30 @@ function popsu_actualites_image_default_styles() {
// Exported image style: popsu-actu-home.
$styles['popsu-actu-home'] = array(
- 'name' => 'popsu-actu-home',
+ 'label' => 'popsu-actu-home',
'effects' => array(
15 => array(
- 'label' => 'Mise à l’échelle et recadrage',
- 'help' => 'La mise à l\'échelle et le recadrage maintiendront les proportions originales de l\'image puis recadreront la dimension la plus large. C\'est très utile pour créer des vignettes carrées sans étirer les images.',
- 'effect callback' => 'image_scale_and_crop_effect',
- 'dimensions callback' => 'image_resize_dimensions',
- 'form callback' => 'image_resize_form',
- 'summary theme' => 'image_resize_summary',
- 'module' => 'image',
'name' => 'image_scale_and_crop',
'data' => array(
- 'width' => '206',
- 'height' => '156',
+ 'width' => 206,
+ 'height' => 156,
),
- 'weight' => '1',
+ 'weight' => 1,
),
),
);
// Exported image style: popsu-actu-listing.
$styles['popsu-actu-listing'] = array(
- 'name' => 'popsu-actu-listing',
+ 'label' => 'popsu-actu-listing',
'effects' => array(
16 => array(
- 'label' => 'Mise à l’échelle et recadrage',
- 'help' => 'La mise à l\'échelle et le recadrage maintiendront les proportions originales de l\'image puis recadreront la dimension la plus large. C\'est très utile pour créer des vignettes carrées sans étirer les images.',
- 'effect callback' => 'image_scale_and_crop_effect',
- 'dimensions callback' => 'image_resize_dimensions',
- 'form callback' => 'image_resize_form',
- 'summary theme' => 'image_resize_summary',
- 'module' => 'image',
'name' => 'image_scale_and_crop',
'data' => array(
- 'width' => '220',
- 'height' => '168',
+ 'width' => 220,
+ 'height' => 168,
),
- 'weight' => '1',
+ 'weight' => 1,
),
),
);
@@ -122,5 +85,6 @@ function popsu_actualites_node_info() {
'help' => '',
),
);
+ drupal_alter('node_info', $items);
return $items;
}
diff --git a/sites/default/modules/features/popsu_actualites/popsu_actualites.field_group.inc b/sites/default/modules/features/popsu_actualites/popsu_actualites.field_group.inc
index 7964b22..e54b3f7 100644
--- a/sites/default/modules/features/popsu_actualites/popsu_actualites.field_group.inc
+++ b/sites/default/modules/features/popsu_actualites/popsu_actualites.field_group.inc
@@ -26,7 +26,8 @@ function popsu_actualites_field_group_info() {
0 => 'field_popsu_actu_date',
1 => 'field_popsu_actu_soustitre',
2 => 'field_popsu_actu_date_fin',
- 3 => 'title',
+ 3 => 'field_popsu_actu_enhome',
+ 4 => 'title',
),
'format_type' => 'tab',
'format_settings' => array(
@@ -51,7 +52,7 @@ function popsu_actualites_field_group_info() {
$field_group->parent_name = '';
$field_group->data = array(
'label' => 'Image',
- 'weight' => '2',
+ 'weight' => '4',
'children' => array(
0 => 'field_popsu_actu_image',
),
diff --git a/sites/default/modules/features/popsu_actualites/popsu_actualites.info b/sites/default/modules/features/popsu_actualites/popsu_actualites.info
index 85298d4..051f58c 100644
--- a/sites/default/modules/features/popsu_actualites/popsu_actualites.info
+++ b/sites/default/modules/features/popsu_actualites/popsu_actualites.info
@@ -2,21 +2,17 @@ name = POPSU Actualités
description = POPSU - Type de contenu Colloques
core = 7.x
package = POPSU
-php = 5.2.4
version = 7.x-1.0-beta10
project = popsu_actualites
-dependencies[] = ctools
dependencies[] = date
dependencies[] = field_group
dependencies[] = filefield_paths
dependencies[] = image
+dependencies[] = list
dependencies[] = page_manager
dependencies[] = popsu_structure
dependencies[] = strongarm
-dependencies[] = views
dependencies[] = views_content
-features[block_class][] = views:actualites-block_1
-features[block_class][] = views:actualites-block_2
features[box][] = popsu_logo_popsuneutral
features[context][] = popsu-actualites-listing
features[context][] = popsu-actualites-node
@@ -27,15 +23,24 @@ features[ctools][] = field_group:field_group:1
features[ctools][] = page_manager:pages_default:1
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
-features[features_api][] = api:1
-features[field][] = node-popsu_actu-field_popsu_actu_body
-features[field][] = node-popsu_actu-field_popsu_actu_date
-features[field][] = node-popsu_actu-field_popsu_actu_date_fin
-features[field][] = node-popsu_actu-field_popsu_actu_image
-features[field][] = node-popsu_actu-field_popsu_actu_soustitre
+features[features_api][] = api:2
+features[field_base][] = field_popsu_actu_attachment
+features[field_base][] = field_popsu_actu_body
+features[field_base][] = field_popsu_actu_date
+features[field_base][] = field_popsu_actu_date_fin
+features[field_base][] = field_popsu_actu_enhome
+features[field_base][] = field_popsu_actu_image
+features[field_base][] = field_popsu_actu_soustitre
features[field_group][] = group_popsu_actu_basic|node|popsu_actu|form
features[field_group][] = group_popsu_actu_image|node|popsu_actu|form
features[field_group][] = group_popsu_actu_texte|node|popsu_actu|form
+features[field_instance][] = node-popsu_actu-field_popsu_actu_attachment
+features[field_instance][] = node-popsu_actu-field_popsu_actu_body
+features[field_instance][] = node-popsu_actu-field_popsu_actu_date
+features[field_instance][] = node-popsu_actu-field_popsu_actu_date_fin
+features[field_instance][] = node-popsu_actu-field_popsu_actu_enhome
+features[field_instance][] = node-popsu_actu-field_popsu_actu_image
+features[field_instance][] = node-popsu_actu-field_popsu_actu_soustitre
features[image][] = popsu-actu-home
features[image][] = popsu-actu-listing
features[node][] = popsu_actu
@@ -56,4 +61,7 @@ features[variable][] = page_title_type_popsu_actu
features[variable][] = page_title_type_popsu_actu_showfield
features[variable][] = pathauto_node_popsu_actu_pattern
features[variable][] = publishcontent_popsu_actu
+features[variable][] = xmlsitemap_settings_node_popsu_actu
features[views_view][] = actualites
+features_exclude[dependencies][views] = views
+features_exclude[dependencies][panels] = panels
diff --git a/sites/default/modules/features/popsu_actualites/popsu_actualites.pages_default.inc b/sites/default/modules/features/popsu_actualites/popsu_actualites.pages_default.inc
index f711e37..053ed25 100644
--- a/sites/default/modules/features/popsu_actualites/popsu_actualites.pages_default.inc
+++ b/sites/default/modules/features/popsu_actualites/popsu_actualites.pages_default.inc
@@ -61,230 +61,241 @@ function popsu_actualites_default_page_manager_handlers() {
);
$display->cache = array();
$display->title = '';
+ $display->uuid = 'd0d44175-6be3-49eb-957a-3bd9b1d9c38c';
+ $display->storage_type = 'page_manager';
+ $display->storage_id = 'node_view_panel_context_12';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-1';
- $pane->panel = 'footer';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_popsu_actu_soustitre';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'title',
- 'formatter' => 'text_default',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(),
- 'context' => 'argument_entity_id:node_1',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $display->content['new-1'] = $pane;
- $display->panels['footer'][0] = 'new-1';
- $pane = new stdClass();
- $pane->pid = 'new-2';
- $pane->panel = 'footer';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_popsu_actu_date';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'title',
- 'formatter' => 'date_default',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(
- 'format_type' => 'popsu_yyyy_mm_dd',
- 'multiple_number' => '',
- 'multiple_from' => '',
- 'multiple_to' => '',
- 'fromto' => 'both',
- ),
- 'context' => 'argument_entity_id:node_1',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $display->content['new-2'] = $pane;
- $display->panels['footer'][1] = 'new-2';
- $pane = new stdClass();
- $pane->pid = 'new-3';
- $pane->panel = 'footer';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_popsu_actu_body';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'title',
- 'formatter' => 'text_default',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(),
- 'context' => 'argument_entity_id:node_1',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_id' => '',
- 'css_class' => 'layout-64p',
- );
- $pane->extras = array();
- $pane->position = 2;
- $pane->locks = array();
- $display->content['new-3'] = $pane;
- $display->panels['footer'][2] = 'new-3';
- $pane = new stdClass();
- $pane->pid = 'new-4';
- $pane->panel = 'footer';
- $pane->type = 'views_panes';
- $pane->subtype = 'actualites-panel_pane_2';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'arguments' => array(
- 'nid' => '%node:nid',
- ),
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 3;
- $pane->locks = array();
- $display->content['new-4'] = $pane;
- $display->panels['footer'][3] = 'new-4';
- $pane = new stdClass();
- $pane->pid = 'new-5';
- $pane->panel = 'footer';
- $pane->type = 'views_panes';
- $pane->subtype = 'actualites-panel_pane_3';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'arguments' => array(
- 'nid' => '%node:nid',
- ),
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 4;
- $pane->locks = array();
- $display->content['new-5'] = $pane;
- $display->panels['footer'][4] = 'new-5';
- $pane = new stdClass();
- $pane->pid = 'new-6';
- $pane->panel = 'header';
- $pane->type = 'custom';
- $pane->subtype = 'custom';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'admin_title' => 'Actualités - Titre - A venir ou passées',
- 'title' => '',
- 'body' => 'Actualites a venir
+ $pane = new stdClass();
+ $pane->pid = 'new-e40cf02e-a1a8-479b-a6e3-1bdba41e02f0';
+ $pane->panel = 'footer';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_popsu_actu_soustitre';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'title',
+ 'formatter' => 'text_default',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(),
+ 'context' => 'argument_entity_id:node_1',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = 'e40cf02e-a1a8-479b-a6e3-1bdba41e02f0';
+ $display->content['new-e40cf02e-a1a8-479b-a6e3-1bdba41e02f0'] = $pane;
+ $display->panels['footer'][0] = 'new-e40cf02e-a1a8-479b-a6e3-1bdba41e02f0';
+ $pane = new stdClass();
+ $pane->pid = 'new-023bb002-6c73-45e4-8300-ebf1bb78fc6e';
+ $pane->panel = 'footer';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_popsu_actu_date';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'title',
+ 'formatter' => 'date_default',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(
+ 'format_type' => 'popsu_yyyy_mm_dd',
+ 'multiple_number' => '',
+ 'multiple_from' => '',
+ 'multiple_to' => '',
+ 'fromto' => 'both',
+ ),
+ 'context' => 'argument_entity_id:node_1',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = '023bb002-6c73-45e4-8300-ebf1bb78fc6e';
+ $display->content['new-023bb002-6c73-45e4-8300-ebf1bb78fc6e'] = $pane;
+ $display->panels['footer'][1] = 'new-023bb002-6c73-45e4-8300-ebf1bb78fc6e';
+ $pane = new stdClass();
+ $pane->pid = 'new-87a6bcca-c696-4405-be4b-ed4516cf34a6';
+ $pane->panel = 'footer';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_popsu_actu_body';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'title',
+ 'formatter' => 'text_default',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(),
+ 'context' => 'argument_entity_id:node_1',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_id' => '',
+ 'css_class' => 'layout-64p',
+ );
+ $pane->extras = array();
+ $pane->position = 2;
+ $pane->locks = array();
+ $pane->uuid = '87a6bcca-c696-4405-be4b-ed4516cf34a6';
+ $display->content['new-87a6bcca-c696-4405-be4b-ed4516cf34a6'] = $pane;
+ $display->panels['footer'][2] = 'new-87a6bcca-c696-4405-be4b-ed4516cf34a6';
+ $pane = new stdClass();
+ $pane->pid = 'new-f3d686ff-7c21-413c-ab53-f51c34e5e775';
+ $pane->panel = 'footer';
+ $pane->type = 'views_panes';
+ $pane->subtype = 'actualites-panel_pane_2';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'arguments' => array(
+ 'nid' => '%node:nid',
+ ),
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 3;
+ $pane->locks = array();
+ $pane->uuid = 'f3d686ff-7c21-413c-ab53-f51c34e5e775';
+ $display->content['new-f3d686ff-7c21-413c-ab53-f51c34e5e775'] = $pane;
+ $display->panels['footer'][3] = 'new-f3d686ff-7c21-413c-ab53-f51c34e5e775';
+ $pane = new stdClass();
+ $pane->pid = 'new-fc2a42c0-dd25-4872-8f98-8ae2780e5116';
+ $pane->panel = 'footer';
+ $pane->type = 'views_panes';
+ $pane->subtype = 'actualites-panel_pane_3';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'arguments' => array(
+ 'nid' => '%node:nid',
+ ),
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 4;
+ $pane->locks = array();
+ $pane->uuid = 'fc2a42c0-dd25-4872-8f98-8ae2780e5116';
+ $display->content['new-fc2a42c0-dd25-4872-8f98-8ae2780e5116'] = $pane;
+ $display->panels['footer'][4] = 'new-fc2a42c0-dd25-4872-8f98-8ae2780e5116';
+ $pane = new stdClass();
+ $pane->pid = 'new-9fe66e75-0f7a-497c-9ffc-c21d5bf061c1';
+ $pane->panel = 'header';
+ $pane->type = 'custom';
+ $pane->subtype = 'custom';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'admin_title' => 'Actualités - Titre - A venir ou passées',
+ 'title' => '',
+ 'body' => 'Actualites a venir
Actualites passees ',
- 'format' => 'php_code',
- 'substitute' => 1,
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array();
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $display->content['new-6'] = $pane;
- $display->panels['header'][0] = 'new-6';
- $pane = new stdClass();
- $pane->pid = 'new-7';
- $pane->panel = 'header';
- $pane->type = 'node_title';
- $pane->subtype = 'node_title';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'link' => 0,
- 'context' => 'argument_entity_id:node_1',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_id' => 'page-title-secondary-actu',
- 'css_class' => 'page-title-secondary',
- );
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $display->content['new-7'] = $pane;
- $display->panels['header'][1] = 'new-7';
- $pane = new stdClass();
- $pane->pid = 'new-8';
- $pane->panel = 'left';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_popsu_actu_image';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'title',
- 'formatter' => 'image',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(
- 'image_style' => '',
- 'image_link' => '',
- ),
- 'context' => 'argument_entity_id:node_1',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_id' => 'panel-actu-grande-image',
- 'css_class' => 'image-decallee',
- );
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $display->content['new-8'] = $pane;
- $display->panels['left'][0] = 'new-8';
+ 'format' => 'php_code',
+ 'substitute' => 1,
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array();
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '9fe66e75-0f7a-497c-9ffc-c21d5bf061c1';
+ $display->content['new-9fe66e75-0f7a-497c-9ffc-c21d5bf061c1'] = $pane;
+ $display->panels['header'][0] = 'new-9fe66e75-0f7a-497c-9ffc-c21d5bf061c1';
+ $pane = new stdClass();
+ $pane->pid = 'new-b0ef292b-5304-47f3-8b50-b3d901e52e00';
+ $pane->panel = 'header';
+ $pane->type = 'node_title';
+ $pane->subtype = 'node_title';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'link' => 0,
+ 'context' => 'argument_entity_id:node_1',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_id' => 'page-title-secondary-actu',
+ 'css_class' => 'page-title-secondary',
+ );
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = 'b0ef292b-5304-47f3-8b50-b3d901e52e00';
+ $display->content['new-b0ef292b-5304-47f3-8b50-b3d901e52e00'] = $pane;
+ $display->panels['header'][1] = 'new-b0ef292b-5304-47f3-8b50-b3d901e52e00';
+ $pane = new stdClass();
+ $pane->pid = 'new-47e94db5-efe8-4cbc-9eed-ed063d49c319';
+ $pane->panel = 'left';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_popsu_actu_image';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'title',
+ 'formatter' => 'image',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(
+ 'image_style' => '',
+ 'image_link' => '',
+ ),
+ 'context' => 'argument_entity_id:node_1',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_id' => 'panel-actu-grande-image',
+ 'css_class' => 'image-decallee',
+ );
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '47e94db5-efe8-4cbc-9eed-ed063d49c319';
+ $display->content['new-47e94db5-efe8-4cbc-9eed-ed063d49c319'] = $pane;
+ $display->panels['left'][0] = 'new-47e94db5-efe8-4cbc-9eed-ed063d49c319';
$display->hide_title = PANELS_TITLE_NONE;
$display->title_pane = '0';
$handler->conf['display'] = $display;
@@ -362,80 +373,85 @@ function popsu_actualites_default_page_manager_pages() {
);
$display->cache = array();
$display->title = 'Actualités, appels d\'offre et consultations';
+ $display->uuid = 'c6b465ec-1b7c-414a-848a-27b5bf692a45';
+ $display->storage_type = 'page_manager';
+ $display->storage_id = 'page_popsu_actualites_panel_context';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-1';
- $pane->panel = 'left';
- $pane->type = 'views';
- $pane->subtype = 'actualites';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'override_pager_settings' => 0,
- 'use_pager' => 0,
- 'nodes_per_page' => '0',
- 'pager_id' => '0',
- 'offset' => '0',
- 'more_link' => 0,
- 'feed_icons' => 0,
- 'panel_args' => 0,
- 'link_to_view' => 0,
- 'args' => '',
- 'url' => '',
- 'display' => 'block_3',
- 'override_title' => 1,
- 'override_title_text' => 'Actualites a venir',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_id' => '',
- 'css_class' => 'listing-actu listing-actu-avenir',
- );
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $display->content['new-1'] = $pane;
- $display->panels['left'][0] = 'new-1';
- $pane = new stdClass();
- $pane->pid = 'new-2';
- $pane->panel = 'left';
- $pane->type = 'views';
- $pane->subtype = 'actualites';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'override_pager_settings' => 0,
- 'use_pager' => 0,
- 'nodes_per_page' => '0',
- 'pager_id' => '0',
- 'offset' => '0',
- 'more_link' => 0,
- 'feed_icons' => 0,
- 'panel_args' => 0,
- 'link_to_view' => 0,
- 'args' => '',
- 'url' => '',
- 'display' => 'block_4',
- 'override_title' => 1,
- 'override_title_text' => 'Actualites archivees',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_id' => 'pane-actu-passees',
- 'css_class' => 'layout-88p listing-actu listing-actu-passe',
- );
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $display->content['new-2'] = $pane;
- $display->panels['left'][1] = 'new-2';
+ $pane = new stdClass();
+ $pane->pid = 'new-9871e640-6e35-4ffc-98ee-5ef37753686c';
+ $pane->panel = 'left';
+ $pane->type = 'views';
+ $pane->subtype = 'actualites';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'override_pager_settings' => 0,
+ 'use_pager' => 0,
+ 'nodes_per_page' => '0',
+ 'pager_id' => '0',
+ 'offset' => '0',
+ 'more_link' => 0,
+ 'feed_icons' => 0,
+ 'panel_args' => 0,
+ 'link_to_view' => 0,
+ 'args' => '',
+ 'url' => '',
+ 'display' => 'block_3',
+ 'override_title' => 1,
+ 'override_title_text' => 'Actualités',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_id' => '',
+ 'css_class' => 'listing-actu listing-actu-avenir',
+ );
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '9871e640-6e35-4ffc-98ee-5ef37753686c';
+ $display->content['new-9871e640-6e35-4ffc-98ee-5ef37753686c'] = $pane;
+ $display->panels['left'][0] = 'new-9871e640-6e35-4ffc-98ee-5ef37753686c';
+ $pane = new stdClass();
+ $pane->pid = 'new-43500ad1-83c5-4fe7-9c81-782c0ca4d697';
+ $pane->panel = 'left';
+ $pane->type = 'views';
+ $pane->subtype = 'actualites';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'override_pager_settings' => 0,
+ 'use_pager' => 0,
+ 'nodes_per_page' => '0',
+ 'pager_id' => '0',
+ 'offset' => '0',
+ 'more_link' => 0,
+ 'feed_icons' => 0,
+ 'panel_args' => 0,
+ 'link_to_view' => 0,
+ 'args' => '',
+ 'url' => '',
+ 'display' => 'block_4',
+ 'override_title' => 1,
+ 'override_title_text' => 'Actualites archivees',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_id' => 'pane-actu-passees',
+ 'css_class' => 'layout-88p listing-actu listing-actu-passe',
+ );
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = '43500ad1-83c5-4fe7-9c81-782c0ca4d697';
+ $display->content['new-43500ad1-83c5-4fe7-9c81-782c0ca4d697'] = $pane;
+ $display->panels['left'][1] = 'new-43500ad1-83c5-4fe7-9c81-782c0ca4d697';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = '0';
$handler->conf['display'] = $display;
diff --git a/sites/default/modules/features/popsu_actualites/popsu_actualites.strongarm.inc b/sites/default/modules/features/popsu_actualites/popsu_actualites.strongarm.inc
index 0aaa34f..1a351ce 100644
--- a/sites/default/modules/features/popsu_actualites/popsu_actualites.strongarm.inc
+++ b/sites/default/modules/features/popsu_actualites/popsu_actualites.strongarm.inc
@@ -14,7 +14,7 @@ function popsu_actualites_strongarm() {
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'additional_settings__active_tab_popsu_actu';
- $strongarm->value = 'edit-page-title';
+ $strongarm->value = 'edit-xmlsitemap';
$export['additional_settings__active_tab_popsu_actu'] = $strongarm;
$strongarm = new stdClass();
@@ -43,14 +43,39 @@ function popsu_actualites_strongarm() {
$strongarm->api_version = 1;
$strongarm->name = 'field_bundle_settings_node__popsu_actu';
$strongarm->value = array(
- 'view_modes' => array(),
+ 'view_modes' => array(
+ 'teaser' => array(
+ 'custom_settings' => TRUE,
+ ),
+ 'full' => array(
+ 'custom_settings' => FALSE,
+ ),
+ 'rss' => array(
+ 'custom_settings' => FALSE,
+ ),
+ 'search_index' => array(
+ 'custom_settings' => FALSE,
+ ),
+ 'search_result' => array(
+ 'custom_settings' => FALSE,
+ ),
+ 'diff_standard' => array(
+ 'custom_settings' => FALSE,
+ ),
+ 'token' => array(
+ 'custom_settings' => FALSE,
+ ),
+ ),
'extra_fields' => array(
'form' => array(
'title' => array(
'weight' => '6',
),
'path' => array(
- 'weight' => '3',
+ 'weight' => '5',
+ ),
+ 'xmlsitemap' => array(
+ 'weight' => '30',
),
),
'display' => array(),
@@ -134,5 +159,15 @@ function popsu_actualites_strongarm() {
$strongarm->value = 1;
$export['publishcontent_popsu_actu'] = $strongarm;
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'xmlsitemap_settings_node_popsu_actu';
+ $strongarm->value = array(
+ 'status' => '1',
+ 'priority' => '0.5',
+ );
+ $export['xmlsitemap_settings_node_popsu_actu'] = $strongarm;
+
return $export;
}
diff --git a/sites/default/modules/features/popsu_actualites/popsu_actualites.views_default.inc b/sites/default/modules/features/popsu_actualites/popsu_actualites.views_default.inc
index 63f00a3..3c53864 100644
--- a/sites/default/modules/features/popsu_actualites/popsu_actualites.views_default.inc
+++ b/sites/default/modules/features/popsu_actualites/popsu_actualites.views_default.inc
@@ -85,16 +85,16 @@ function popsu_actualites_views_default_views() {
$handler->display->display_options['fields']['field_popsu_actu_soustitre']['label'] = '';
$handler->display->display_options['fields']['field_popsu_actu_soustitre']['exclude'] = TRUE;
$handler->display->display_options['fields']['field_popsu_actu_soustitre']['alter']['alter_text'] = TRUE;
- $handler->display->display_options['fields']['field_popsu_actu_soustitre']['alter']['text'] = '[field_popsu_actu_soustitre] - ';
+ $handler->display->display_options['fields']['field_popsu_actu_soustitre']['alter']['text'] = '[field_popsu_actu_soustitre]';
$handler->display->display_options['fields']['field_popsu_actu_soustitre']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['field_popsu_actu_soustitre']['hide_empty'] = TRUE;
- /* Champ: Contenu : Date de début de publication de l'actualité sur la page d'accueil */
+ /* Champ: Contenu : Date de début de validité de l'actualité */
$handler->display->display_options['fields']['field_popsu_actu_date']['id'] = 'field_popsu_actu_date';
$handler->display->display_options['fields']['field_popsu_actu_date']['table'] = 'field_data_field_popsu_actu_date';
$handler->display->display_options['fields']['field_popsu_actu_date']['field'] = 'field_popsu_actu_date';
$handler->display->display_options['fields']['field_popsu_actu_date']['label'] = '';
$handler->display->display_options['fields']['field_popsu_actu_date']['alter']['alter_text'] = TRUE;
- $handler->display->display_options['fields']['field_popsu_actu_date']['alter']['text'] = '[field_popsu_actu_soustitre][field_popsu_actu_date]';
+ $handler->display->display_options['fields']['field_popsu_actu_date']['alter']['text'] = '[field_popsu_actu_soustitre]';
$handler->display->display_options['fields']['field_popsu_actu_date']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['field_popsu_actu_date']['settings'] = array(
'format_type' => 'short',
@@ -133,7 +133,7 @@ function popsu_actualites_views_default_views() {
$handler->display->display_options['fields']['view_node']['alter']['text'] = 'voir toutes les actualités ';
$handler->display->display_options['fields']['view_node']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['view_node']['text'] = 'voir toutes les actualités';
- /* Critère de tri: Contenu : Date de début de publication de l'actualité sur la page d'accueil (field_popsu_actu_date) */
+ /* Critère de tri: Contenu : Date de début de validité de l'actualité (field_popsu_actu_date) */
$handler->display->display_options['sorts']['field_popsu_actu_date_value']['id'] = 'field_popsu_actu_date_value';
$handler->display->display_options['sorts']['field_popsu_actu_date_value']['table'] = 'field_data_field_popsu_actu_date';
$handler->display->display_options['sorts']['field_popsu_actu_date_value']['field'] = 'field_popsu_actu_date_value';
@@ -169,7 +169,7 @@ function popsu_actualites_views_default_views() {
$handler->display->display_options['pager']['options']['items_per_page'] = '1';
$handler->display->display_options['pager']['options']['offset'] = '0';
$handler->display->display_options['defaults']['sorts'] = FALSE;
- /* Critère de tri: Contenu : Date de début de publication de l'actualité sur la page d'accueil (field_popsu_actu_date) */
+ /* Critère de tri: Contenu : Date de début de validité de l'actualité (field_popsu_actu_date) */
$handler->display->display_options['sorts']['field_popsu_actu_date_value']['id'] = 'field_popsu_actu_date_value';
$handler->display->display_options['sorts']['field_popsu_actu_date_value']['table'] = 'field_data_field_popsu_actu_date';
$handler->display->display_options['sorts']['field_popsu_actu_date_value']['field'] = 'field_popsu_actu_date_value';
@@ -189,18 +189,25 @@ function popsu_actualites_views_default_views() {
$handler->display->display_options['filters']['type']['value'] = array(
'popsu_actu' => 'popsu_actu',
);
- /* Critère de filtrage: Contenu : Date de début de publication de l'actualité sur la page d'accueil (field_popsu_actu_date) */
+ /* Critère de filtrage: Contenu : Date de début de validité de l'actualité (field_popsu_actu_date) */
$handler->display->display_options['filters']['field_popsu_actu_date_value']['id'] = 'field_popsu_actu_date_value';
$handler->display->display_options['filters']['field_popsu_actu_date_value']['table'] = 'field_data_field_popsu_actu_date';
$handler->display->display_options['filters']['field_popsu_actu_date_value']['field'] = 'field_popsu_actu_date_value';
$handler->display->display_options['filters']['field_popsu_actu_date_value']['operator'] = '<=';
$handler->display->display_options['filters']['field_popsu_actu_date_value']['default_date'] = 'now';
- /* Critère de filtrage: Contenu : Date de fin de publication de l'actualité sur la page d'accueil (field_popsu_actu_date_fin) */
+ /* Critère de filtrage: Contenu : Date de fin de validité de l'actualité (field_popsu_actu_date_fin) */
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['id'] = 'field_popsu_actu_date_fin_value';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['table'] = 'field_data_field_popsu_actu_date_fin';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['field'] = 'field_popsu_actu_date_fin_value';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['operator'] = '>=';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['default_date'] = 'now';
+ /* Critère de filtrage: Contenu : Publier sur la page d'accueil (field_popsu_actu_enhome) */
+ $handler->display->display_options['filters']['field_popsu_actu_enhome_value']['id'] = 'field_popsu_actu_enhome_value';
+ $handler->display->display_options['filters']['field_popsu_actu_enhome_value']['table'] = 'field_data_field_popsu_actu_enhome';
+ $handler->display->display_options['filters']['field_popsu_actu_enhome_value']['field'] = 'field_popsu_actu_enhome_value';
+ $handler->display->display_options['filters']['field_popsu_actu_enhome_value']['value'] = array(
+ 1 => '1',
+ );
$handler->display->display_options['pane_category']['name'] = 'Volets de vue';
$handler->display->display_options['link_to_view'] = '0';
@@ -238,7 +245,7 @@ function popsu_actualites_views_default_views() {
$handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
$handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
$handler->display->display_options['defaults']['sorts'] = FALSE;
- /* Critère de tri: Contenu : Date de début de publication de l'actualité sur la page d'accueil (field_popsu_actu_date) */
+ /* Critère de tri: Contenu : Date de début de validité de l'actualité (field_popsu_actu_date) */
$handler->display->display_options['sorts']['field_popsu_actu_date_value']['id'] = 'field_popsu_actu_date_value';
$handler->display->display_options['sorts']['field_popsu_actu_date_value']['table'] = 'field_data_field_popsu_actu_date';
$handler->display->display_options['sorts']['field_popsu_actu_date_value']['field'] = 'field_popsu_actu_date_value';
@@ -258,13 +265,13 @@ function popsu_actualites_views_default_views() {
$handler->display->display_options['filters']['type']['value'] = array(
'popsu_actu' => 'popsu_actu',
);
- /* Critère de filtrage: Contenu : Date de fin de publication de l'actualité sur la page d'accueil (field_popsu_actu_date_fin) */
+ /* Critère de filtrage: Contenu : Date de fin de validité de l'actualité (field_popsu_actu_date_fin) */
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['id'] = 'field_popsu_actu_date_fin_value';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['table'] = 'field_data_field_popsu_actu_date_fin';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['field'] = 'field_popsu_actu_date_fin_value';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['operator'] = '>';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['default_date'] = 'now';
- /* Critère de filtrage: Contenu : Date de début de publication de l'actualité sur la page d'accueil (field_popsu_actu_date) */
+ /* Critère de filtrage: Contenu : Date de début de validité de l'actualité (field_popsu_actu_date) */
$handler->display->display_options['filters']['field_popsu_actu_date_value']['id'] = 'field_popsu_actu_date_value';
$handler->display->display_options['filters']['field_popsu_actu_date_value']['table'] = 'field_data_field_popsu_actu_date';
$handler->display->display_options['filters']['field_popsu_actu_date_value']['field'] = 'field_popsu_actu_date_value';
@@ -321,13 +328,13 @@ function popsu_actualites_views_default_views() {
$handler->display->display_options['filters']['type']['value'] = array(
'popsu_actu' => 'popsu_actu',
);
- /* Critère de filtrage: Contenu : Date de fin de publication de l'actualité sur la page d'accueil (field_popsu_actu_date_fin) */
+ /* Critère de filtrage: Contenu : Date de fin de validité de l'actualité (field_popsu_actu_date_fin) */
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['id'] = 'field_popsu_actu_date_fin_value';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['table'] = 'field_data_field_popsu_actu_date_fin';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['field'] = 'field_popsu_actu_date_fin_value';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['operator'] = '<=';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['default_date'] = 'now';
- /* Critère de filtrage: Contenu : Date de début de publication de l'actualité sur la page d'accueil (field_popsu_actu_date) */
+ /* Critère de filtrage: Contenu : Date de début de validité de l'actualité (field_popsu_actu_date) */
$handler->display->display_options['filters']['field_popsu_actu_date_value']['id'] = 'field_popsu_actu_date_value';
$handler->display->display_options['filters']['field_popsu_actu_date_value']['table'] = 'field_data_field_popsu_actu_date';
$handler->display->display_options['filters']['field_popsu_actu_date_value']['field'] = 'field_popsu_actu_date_value';
@@ -458,7 +465,7 @@ display: none;
$handler->display->display_options['filters']['type']['value'] = array(
'popsu_actu' => 'popsu_actu',
);
- /* Critère de filtrage: Contenu : Date de début de publication de l'actualité sur la page d'accueil (field_popsu_actu_date) */
+ /* Critère de filtrage: Contenu : Date de début de validité de l'actualité (field_popsu_actu_date) */
$handler->display->display_options['filters']['field_popsu_actu_date_value']['id'] = 'field_popsu_actu_date_value';
$handler->display->display_options['filters']['field_popsu_actu_date_value']['table'] = 'field_data_field_popsu_actu_date';
$handler->display->display_options['filters']['field_popsu_actu_date_value']['field'] = 'field_popsu_actu_date_value';
@@ -479,7 +486,7 @@ display: none;
/* Display: Actualites A venir Block */
$handler = $view->new_display('block', 'Actualites A venir Block', 'block_3');
$handler->display->display_options['defaults']['title'] = FALSE;
- $handler->display->display_options['title'] = 'Actualites a venir';
+ $handler->display->display_options['title'] = 'Actualités, appels d\'offre et consultations';
$handler->display->display_options['defaults']['css_class'] = FALSE;
$handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
$handler->display->display_options['defaults']['pager'] = FALSE;
@@ -510,7 +517,7 @@ display: none;
$handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
$handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['title']['link_to_node'] = FALSE;
- /* Champ: Contenu : Date de début de publication de l'actualité sur la page d'accueil */
+ /* Champ: Contenu : Date de début de validité de l'actualité */
$handler->display->display_options['fields']['field_popsu_actu_date']['id'] = 'field_popsu_actu_date';
$handler->display->display_options['fields']['field_popsu_actu_date']['table'] = 'field_data_field_popsu_actu_date';
$handler->display->display_options['fields']['field_popsu_actu_date']['field'] = 'field_popsu_actu_date';
@@ -524,7 +531,7 @@ display: none;
'multiple_from' => '',
'multiple_to' => '',
);
- /* Champ: Contenu : Date de fin de publication de l'actualité sur la page d'accueil */
+ /* Champ: Contenu : Date de fin de validité de l'actualité */
$handler->display->display_options['fields']['field_popsu_actu_date_fin']['id'] = 'field_popsu_actu_date_fin';
$handler->display->display_options['fields']['field_popsu_actu_date_fin']['table'] = 'field_data_field_popsu_actu_date_fin';
$handler->display->display_options['fields']['field_popsu_actu_date_fin']['field'] = 'field_popsu_actu_date_fin';
@@ -549,7 +556,7 @@ display: none;
$handler->display->display_options['fields']['field_popsu_actu_soustitre']['field'] = 'field_popsu_actu_soustitre';
$handler->display->display_options['fields']['field_popsu_actu_soustitre']['label'] = '';
$handler->display->display_options['fields']['field_popsu_actu_soustitre']['alter']['alter_text'] = TRUE;
- $handler->display->display_options['fields']['field_popsu_actu_soustitre']['alter']['text'] = '[field_popsu_actu_soustitre] - [field_popsu_actu_date_fin]';
+ $handler->display->display_options['fields']['field_popsu_actu_soustitre']['alter']['text'] = '[field_popsu_actu_soustitre]';
$handler->display->display_options['fields']['field_popsu_actu_soustitre']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['field_popsu_actu_soustitre']['empty'] = '[field_popsu_actu_date_fin]';
$handler->display->display_options['fields']['field_popsu_actu_soustitre']['hide_empty'] = TRUE;
@@ -578,8 +585,33 @@ display: none;
'image_style' => 'popsu-actu-listing',
'image_link' => '',
);
+ /* Champ: Contenu : Pièces jointes à cette actualité */
+ $handler->display->display_options['fields']['field_popsu_actu_attachment']['id'] = 'field_popsu_actu_attachment';
+ $handler->display->display_options['fields']['field_popsu_actu_attachment']['table'] = 'field_data_field_popsu_actu_attachment';
+ $handler->display->display_options['fields']['field_popsu_actu_attachment']['field'] = 'field_popsu_actu_attachment';
+ $handler->display->display_options['fields']['field_popsu_actu_attachment']['label'] = '';
+ $handler->display->display_options['fields']['field_popsu_actu_attachment']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['field_popsu_actu_attachment']['click_sort_column'] = 'fid';
+ $handler->display->display_options['fields']['field_popsu_actu_attachment']['delta_offset'] = '0';
+ $handler->display->display_options['fields']['field_popsu_actu_attachment']['separator'] = ' ';
+ /* Champ: Contenu : Lien de modification */
+ $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
+ $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
+ $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
+ $handler->display->display_options['fields']['edit_node']['label'] = '';
+ $handler->display->display_options['fields']['edit_node']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['edit_node']['hide_empty'] = TRUE;
+ /* Champ: Contenu : Lien de publication */
+ $handler->display->display_options['fields']['publishcontent']['id'] = 'publishcontent';
+ $handler->display->display_options['fields']['publishcontent']['table'] = 'node';
+ $handler->display->display_options['fields']['publishcontent']['field'] = 'publishcontent';
+ $handler->display->display_options['fields']['publishcontent']['label'] = '';
+ $handler->display->display_options['fields']['publishcontent']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['publishcontent']['hide_empty'] = TRUE;
+ $handler->display->display_options['fields']['publishcontent']['unpublish'] = 'Supprimer';
+ $handler->display->display_options['fields']['publishcontent']['publish'] = 'Récupérer dans la corbeille';
$handler->display->display_options['defaults']['sorts'] = FALSE;
- /* Critère de tri: Contenu : Date de début de publication de l'actualité sur la page d'accueil (field_popsu_actu_date) */
+ /* Critère de tri: Contenu : Date de début de validité de l'actualité (field_popsu_actu_date) */
$handler->display->display_options['sorts']['field_popsu_actu_date_value']['id'] = 'field_popsu_actu_date_value';
$handler->display->display_options['sorts']['field_popsu_actu_date_value']['table'] = 'field_data_field_popsu_actu_date';
$handler->display->display_options['sorts']['field_popsu_actu_date_value']['field'] = 'field_popsu_actu_date_value';
@@ -599,13 +631,13 @@ display: none;
$handler->display->display_options['filters']['type']['value'] = array(
'popsu_actu' => 'popsu_actu',
);
- /* Critère de filtrage: Contenu : Date de fin de publication de l'actualité sur la page d'accueil (field_popsu_actu_date_fin) */
+ /* Critère de filtrage: Contenu : Date de fin de validité de l'actualité (field_popsu_actu_date_fin) */
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['id'] = 'field_popsu_actu_date_fin_value';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['table'] = 'field_data_field_popsu_actu_date_fin';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['field'] = 'field_popsu_actu_date_fin_value';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['operator'] = '>';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['default_date'] = 'now';
- /* Critère de filtrage: Contenu : Date de début de publication de l'actualité sur la page d'accueil (field_popsu_actu_date) */
+ /* Critère de filtrage: Contenu : Date de début de validité de l'actualité (field_popsu_actu_date) */
$handler->display->display_options['filters']['field_popsu_actu_date_value']['id'] = 'field_popsu_actu_date_value';
$handler->display->display_options['filters']['field_popsu_actu_date_value']['table'] = 'field_data_field_popsu_actu_date';
$handler->display->display_options['filters']['field_popsu_actu_date_value']['field'] = 'field_popsu_actu_date_value';
@@ -658,7 +690,7 @@ display: none;
$handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
$handler->display->display_options['fields']['title']['element_label_colon'] = FALSE;
$handler->display->display_options['fields']['title']['link_to_node'] = FALSE;
- /* Champ: Contenu : Date de début de publication de l'actualité sur la page d'accueil */
+ /* Champ: Contenu : Date de début de validité de l'actualité */
$handler->display->display_options['fields']['field_popsu_actu_date']['id'] = 'field_popsu_actu_date';
$handler->display->display_options['fields']['field_popsu_actu_date']['table'] = 'field_data_field_popsu_actu_date';
$handler->display->display_options['fields']['field_popsu_actu_date']['field'] = 'field_popsu_actu_date';
@@ -672,7 +704,7 @@ display: none;
'multiple_from' => '',
'multiple_to' => '',
);
- /* Champ: Contenu : Date de fin de publication de l'actualité sur la page d'accueil */
+ /* Champ: Contenu : Date de fin de validité de l'actualité */
$handler->display->display_options['fields']['field_popsu_actu_date_fin']['id'] = 'field_popsu_actu_date_fin';
$handler->display->display_options['fields']['field_popsu_actu_date_fin']['table'] = 'field_data_field_popsu_actu_date_fin';
$handler->display->display_options['fields']['field_popsu_actu_date_fin']['field'] = 'field_popsu_actu_date_fin';
@@ -728,8 +760,33 @@ display: none;
'image_style' => 'popsu-actu-listing',
'image_link' => '',
);
+ /* Champ: Contenu : Pièces jointes à cette actualité */
+ $handler->display->display_options['fields']['field_popsu_actu_attachment']['id'] = 'field_popsu_actu_attachment';
+ $handler->display->display_options['fields']['field_popsu_actu_attachment']['table'] = 'field_data_field_popsu_actu_attachment';
+ $handler->display->display_options['fields']['field_popsu_actu_attachment']['field'] = 'field_popsu_actu_attachment';
+ $handler->display->display_options['fields']['field_popsu_actu_attachment']['label'] = '';
+ $handler->display->display_options['fields']['field_popsu_actu_attachment']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['field_popsu_actu_attachment']['click_sort_column'] = 'fid';
+ $handler->display->display_options['fields']['field_popsu_actu_attachment']['delta_offset'] = '0';
+ $handler->display->display_options['fields']['field_popsu_actu_attachment']['separator'] = ' ';
+ /* Champ: Contenu : Lien de modification */
+ $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
+ $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
+ $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
+ $handler->display->display_options['fields']['edit_node']['label'] = '';
+ $handler->display->display_options['fields']['edit_node']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['edit_node']['hide_empty'] = TRUE;
+ /* Champ: Contenu : Lien de publication */
+ $handler->display->display_options['fields']['publishcontent']['id'] = 'publishcontent';
+ $handler->display->display_options['fields']['publishcontent']['table'] = 'node';
+ $handler->display->display_options['fields']['publishcontent']['field'] = 'publishcontent';
+ $handler->display->display_options['fields']['publishcontent']['label'] = '';
+ $handler->display->display_options['fields']['publishcontent']['element_label_colon'] = FALSE;
+ $handler->display->display_options['fields']['publishcontent']['hide_empty'] = TRUE;
+ $handler->display->display_options['fields']['publishcontent']['unpublish'] = 'Supprimer';
+ $handler->display->display_options['fields']['publishcontent']['publish'] = 'Récupérer dans la corbeille';
$handler->display->display_options['defaults']['sorts'] = FALSE;
- /* Critère de tri: Contenu : Date de début de publication de l'actualité sur la page d'accueil (field_popsu_actu_date) */
+ /* Critère de tri: Contenu : Date de début de validité de l'actualité (field_popsu_actu_date) */
$handler->display->display_options['sorts']['field_popsu_actu_date_value']['id'] = 'field_popsu_actu_date_value';
$handler->display->display_options['sorts']['field_popsu_actu_date_value']['table'] = 'field_data_field_popsu_actu_date';
$handler->display->display_options['sorts']['field_popsu_actu_date_value']['field'] = 'field_popsu_actu_date_value';
@@ -749,13 +806,13 @@ display: none;
$handler->display->display_options['filters']['type']['value'] = array(
'popsu_actu' => 'popsu_actu',
);
- /* Critère de filtrage: Contenu : Date de fin de publication de l'actualité sur la page d'accueil (field_popsu_actu_date_fin) */
+ /* Critère de filtrage: Contenu : Date de fin de validité de l'actualité (field_popsu_actu_date_fin) */
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['id'] = 'field_popsu_actu_date_fin_value';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['table'] = 'field_data_field_popsu_actu_date_fin';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['field'] = 'field_popsu_actu_date_fin_value';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['operator'] = '<=';
$handler->display->display_options['filters']['field_popsu_actu_date_fin_value']['default_date'] = 'now';
- /* Critère de filtrage: Contenu : Date de début de publication de l'actualité sur la page d'accueil (field_popsu_actu_date) */
+ /* Critère de filtrage: Contenu : Date de début de validité de l'actualité (field_popsu_actu_date) */
$handler->display->display_options['filters']['field_popsu_actu_date_value']['id'] = 'field_popsu_actu_date_value';
$handler->display->display_options['filters']['field_popsu_actu_date_value']['table'] = 'field_data_field_popsu_actu_date';
$handler->display->display_options['filters']['field_popsu_actu_date_value']['field'] = 'field_popsu_actu_date_value';
@@ -780,8 +837,7 @@ display: none;
t('dernier »'),
t('/actualites'),
t('[title] '),
- t('[field_popsu_actu_soustitre] - '),
- t('[field_popsu_actu_soustitre][field_popsu_actu_date]'),
+ t('[field_popsu_actu_soustitre]'),
t('[field_popsu_actu_body] '),
t('Modifier cette actu'),
t('voir toutes les actualités '),
@@ -801,13 +857,15 @@ display: none;
t('Tout'),
t('Actualites CSS titre switcher'),
t('Actualites A venir Block'),
+ t('Actualités, appels d\'offre et consultations'),
t('du [field_popsu_actu_date] au [field_popsu_actu_date_fin]'),
t('[field_popsu_actu_date]'),
- t('[field_popsu_actu_soustitre] - [field_popsu_actu_date_fin]'),
t('[field_popsu_actu_date_fin]'),
t('[field_popsu_actu_image]
[field_popsu_actu_body]
'),
t('[field_popsu_actu_body]'),
+ t('Supprimer'),
+ t('Récupérer dans la corbeille'),
t('POPSU - Actualites - Block A venir'),
t('Actualites Passees Block'),
t('[title]
diff --git a/sites/default/modules/features/popsu_structure/popsu_structure.box.inc b/sites/default/modules/features/popsu_structure/popsu_structure.box.inc
index 0b691cb..5eca706 100644
--- a/sites/default/modules/features/popsu_structure/popsu_structure.box.inc
+++ b/sites/default/modules/features/popsu_structure/popsu_structure.box.inc
@@ -19,21 +19,19 @@ function popsu_structure_default_box() {
$box->description = 'Google Analytics tracking code';
$box->options = array(
'body' => array(
- 'value' => '',
'format' => 'php_code',
),
+ 'additional_classes' => '',
);
$export['popsu_google_analytics'] = $box;
@@ -46,9 +44,9 @@ function popsu_structure_default_box() {
$box->description = 'POPSU Logo Baseline (box)';
$box->options = array(
'body' => array(
- 'value' => 'PLATE-FORME';
+ $box->description = 'POPSU Logo POPSU Metropoles (box)';
+ $box->options = array(
+ 'body' => array(
+ 'value' => 'Aller à l\'accueil de POPSU Metropoles ',
+ 'format' => 'php_code',
+ ),
+ 'additional_classes' => '',
+ );
+ $export['popsu_logo_popsumetropoles'] = $box;
+
+ $box = new stdClass();
+ $box->disabled = FALSE; /* Edit this to true to make a default box disabled initially */
+ $box->api_version = 1;
+ $box->delta = 'popsu_logo_popsumonde';
+ $box->plugin_key = 'simple';
+ $box->title = '';
+ $box->description = 'POPSU Logo POPSU Monde (box)';
+ $box->options = array(
+ 'body' => array(
+ 'value' => 'Aller à l\'accueil de POPSU Monde
+',
+ 'format' => 'php_code',
+ ),
+ 'additional_classes' => '',
+ );
+ $export['popsu_logo_popsumonde'] = $box;
+
+ $box = new stdClass();
+ $box->disabled = FALSE; /* Edit this to true to make a default box disabled initially */
+ $box->api_version = 1;
+ $box->delta = 'popsu_logo_popsuterrritoires';
+ $box->plugin_key = 'simple';
+ $box->title = '';
+ $box->description = 'POPSU Logo POPSU Territoires (box)';
+ $box->options = array(
+ 'body' => array(
+ 'value' => 'Aller à l\'accueil de POPSU Territoires ',
+ 'format' => 'php_code',
+ ),
+ 'additional_classes' => '',
+ );
+ $export['popsu_logo_popsuterrritoires'] = $box;
+
$box = new stdClass();
$box->disabled = FALSE; /* Edit this to true to make a default box disabled initially */
$box->api_version = 1;
@@ -112,8 +159,8 @@ DE STRATÉGIES URBAINES',
$box->description = 'POPSU Trigger de menu niveau 1 (box)';
$box->options = array(
'body' => array(
- 'value' => '
-
+ 'value' => '
+
',
'format' => 'php_code',
),
diff --git a/sites/default/modules/features/popsu_structure/popsu_structure.context.inc b/sites/default/modules/features/popsu_structure/popsu_structure.context.inc
index 8076b98..8630417 100644
--- a/sites/default/modules/features/popsu_structure/popsu_structure.context.inc
+++ b/sites/default/modules/features/popsu_structure/popsu_structure.context.inc
@@ -32,18 +32,18 @@ function popsu_structure_context_default_contexts() {
'region' => 'content',
'weight' => '-10',
),
- 'menu-menu-popsu-menu-footer' => array(
- 'module' => 'menu',
- 'delta' => 'menu-popsu-menu-footer',
- 'region' => 'footer',
- 'weight' => '-10',
- ),
'menu-menu-popsu-footer-droite' => array(
'module' => 'menu',
'delta' => 'menu-popsu-footer-droite',
'region' => 'footer',
'weight' => '-10',
),
+ 'menu-menu-popsu-menu-footer' => array(
+ 'module' => 'menu',
+ 'delta' => 'menu-popsu-menu-footer',
+ 'region' => 'footer',
+ 'weight' => '-10',
+ ),
),
),
);
diff --git a/sites/default/modules/features/popsu_structure/popsu_structure.features.inc b/sites/default/modules/features/popsu_structure/popsu_structure.features.inc
index 1e2a0d7..90fae00 100644
--- a/sites/default/modules/features/popsu_structure/popsu_structure.features.inc
+++ b/sites/default/modules/features/popsu_structure/popsu_structure.features.inc
@@ -4,71 +4,19 @@
* popsu_structure.features.inc
*/
-/**
- * Implements hook_block_class_features_default_class().
- */
-function popsu_structure_block_class_features_default_class() {
- return array(
- 'menu:menu-popsu-menu-footer' => array(
- 'module' => 'menu',
- 'delta' => 'menu-popsu-menu-footer',
- 'css_classes' => 'menu-footer menu-inline',
- ),
- 'menu:menu-popus-menu-header' => array(
- 'module' => 'menu',
- 'delta' => 'menu-popus-menu-header',
- 'css_classes' => 'span1 menu-header',
- ),
- 'menu_block:1' => array(
- 'module' => 'menu_block',
- 'delta' => '1',
- 'css_classes' => 'left-nav left-nav-level-2',
- ),
- 'menu_block:2' => array(
- 'module' => 'menu_block',
- 'delta' => '2',
- 'css_classes' => 'left-nav left-nav-level-0',
- ),
- 'menu_block:3' => array(
- 'module' => 'menu_block',
- 'delta' => '3',
- 'css_classes' => 'left-nav left-nav-level-1',
- ),
- 'menu_block:4' => array(
- 'module' => 'menu_block',
- 'delta' => '4',
- 'css_classes' => 'left-nav left-nav-level-1',
- ),
- 'menu_block:5' => array(
- 'module' => 'menu_block',
- 'delta' => '5',
- 'css_classes' => 'left-nav left-nav-level-2',
- ),
- 'menu_block:6' => array(
- 'module' => 'menu_block',
- 'delta' => '6',
- 'css_classes' => 'left-nav left-nav-level-1',
- ),
- );
-}
-
/**
* Implements hook_ctools_plugin_api().
*/
-function popsu_structure_ctools_plugin_api() {
- list($module, $api) = func_get_args();
+function popsu_structure_ctools_plugin_api($module = NULL, $api = NULL) {
if ($module == "boxes" && $api == "box") {
return array("version" => "1");
}
- list($module, $api) = func_get_args();
if ($module == "context" && $api == "context") {
return array("version" => "3");
}
- list($module, $api) = func_get_args();
if ($module == "panels" && $api == "layouts") {
return array("version" => "1");
}
- list($module, $api) = func_get_args();
if ($module == "strongarm" && $api == "strongarm") {
return array("version" => "1");
}
diff --git a/sites/default/modules/features/popsu_structure/popsu_structure.info b/sites/default/modules/features/popsu_structure/popsu_structure.info
index 55a6158..2a47ada 100644
--- a/sites/default/modules/features/popsu_structure/popsu_structure.info
+++ b/sites/default/modules/features/popsu_structure/popsu_structure.info
@@ -2,7 +2,6 @@ name = POPSU Structure du site
description = POPSU - Structure du site
core = 7.x
package = POPSU
-php = 5.2.4
version = 7.x-1.0-beta9
project = popsu_structure
dependencies[] = block
@@ -22,19 +21,14 @@ dependencies[] = search
dependencies[] = uuid
dependencies[] = uuid_features
dependencies[] = uuid_path
-features[block_class][] = menu:menu-popsu-menu-footer
-features[block_class][] = menu:menu-popus-menu-header
-features[block_class][] = menu_block:1
-features[block_class][] = menu_block:2
-features[block_class][] = menu_block:3
-features[block_class][] = menu_block:4
-features[block_class][] = menu_block:5
-features[block_class][] = menu_block:6
features[box][] = popsu_google_analytics
features[box][] = popsu_logo_baseline
features[box][] = popsu_logo_popsu1
features[box][] = popsu_logo_popsu2
features[box][] = popsu_logo_popsueurope
+features[box][] = popsu_logo_popsumetropoles
+features[box][] = popsu_logo_popsumonde
+features[box][] = popsu_logo_popsuterrritoires
features[box][] = popsu_menu_trigger
features[context][] = popsu-structure-global
features[context][] = popsu-structure-homepage
@@ -43,5 +37,5 @@ features[ctools][] = boxes:box:1
features[ctools][] = context:context:3
features[ctools][] = panels:layouts:1
features[ctools][] = strongarm:strongarm:1
-features[features_api][] = api:1
+features[features_api][] = api:2
features[panels_layout][] = popsu_70_30_accordion
diff --git a/sites/default/modules/features/popsu_villes/popsu_villes.features.field_base.inc b/sites/default/modules/features/popsu_villes/popsu_villes.features.field_base.inc
new file mode 100644
index 0000000..14ebb33
--- /dev/null
+++ b/sites/default/modules/features/popsu_villes/popsu_villes.features.field_base.inc
@@ -0,0 +1,210 @@
+ 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_popsu_ville_body',
+ 'indexes' => array(
+ 'format' => array(
+ 0 => 'format',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'text',
+ 'settings' => array(),
+ 'translatable' => 0,
+ 'type' => 'text_with_summary',
+ );
+
+ // Exported field_base: 'field_popsu_ville_coordinateur'.
+ $field_bases['field_popsu_ville_coordinateur'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_popsu_ville_coordinateur',
+ 'indexes' => array(
+ 'format' => array(
+ 0 => 'format',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'text',
+ 'settings' => array(),
+ 'translatable' => 0,
+ 'type' => 'text_long',
+ );
+
+ // Exported field_base: 'field_popsu_ville_equipe'.
+ $field_bases['field_popsu_ville_equipe'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_popsu_ville_equipe',
+ 'indexes' => array(
+ 'format' => array(
+ 0 => 'format',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'text',
+ 'settings' => array(),
+ 'translatable' => 0,
+ 'type' => 'text_long',
+ );
+
+ // Exported field_base: 'field_popsu_ville_images_illustr'.
+ $field_bases['field_popsu_ville_images_illustr'] = array(
+ 'active' => 1,
+ 'cardinality' => -1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_popsu_ville_images_illustr',
+ 'indexes' => array(
+ 'fid' => array(
+ 0 => 'fid',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'image',
+ 'settings' => array(
+ 'default_image' => 0,
+ 'uri_scheme' => 'public',
+ ),
+ 'translatable' => 0,
+ 'type' => 'image',
+ );
+
+ // Exported field_base: 'field_popsu_ville_images_small'.
+ $field_bases['field_popsu_ville_images_small'] = array(
+ 'active' => 1,
+ 'cardinality' => -1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_popsu_ville_images_small',
+ 'indexes' => array(
+ 'fid' => array(
+ 0 => 'fid',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'image',
+ 'settings' => array(
+ 'default_image' => 0,
+ 'uri_scheme' => 'public',
+ ),
+ 'translatable' => 0,
+ 'type' => 'image',
+ );
+
+ // Exported field_base: 'field_popsu_ville_partenairesimg'.
+ $field_bases['field_popsu_ville_partenairesimg'] = array(
+ 'active' => 1,
+ 'cardinality' => -1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_popsu_ville_partenairesimg',
+ 'indexes' => array(
+ 'fid' => array(
+ 0 => 'fid',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'image',
+ 'settings' => array(
+ 'default_image' => 0,
+ 'uri_scheme' => 'public',
+ ),
+ 'translatable' => 0,
+ 'type' => 'image',
+ );
+
+ // Exported field_base: 'field_popsu_ville_partenairestxt'.
+ $field_bases['field_popsu_ville_partenairestxt'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_popsu_ville_partenairestxt',
+ 'indexes' => array(
+ 'format' => array(
+ 0 => 'format',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'text',
+ 'settings' => array(),
+ 'translatable' => 0,
+ 'type' => 'text_long',
+ );
+
+ // Exported field_base: 'field_popsu_ville_popsu'.
+ $field_bases['field_popsu_ville_popsu'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_popsu_ville_popsu',
+ 'indexes' => array(
+ 'tid' => array(
+ 0 => 'tid',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'taxonomy',
+ 'settings' => array(
+ 'allowed_values' => array(
+ 0 => array(
+ 'vocabulary' => 'popsu_popsu',
+ 'parent' => 0,
+ ),
+ ),
+ 'options_list_callback' => 'i18n_taxonomy_allowed_values',
+ ),
+ 'translatable' => 0,
+ 'type' => 'taxonomy_term_reference',
+ );
+
+ // Exported field_base: 'field_popsu_ville_ville'.
+ $field_bases['field_popsu_ville_ville'] = array(
+ 'active' => 1,
+ 'cardinality' => 1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_popsu_ville_ville',
+ 'indexes' => array(
+ 'tid' => array(
+ 0 => 'tid',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'taxonomy',
+ 'settings' => array(
+ 'allowed_values' => array(
+ 0 => array(
+ 'vocabulary' => 'popsu_villes',
+ 'parent' => 0,
+ ),
+ ),
+ 'options_list_callback' => 'i18n_taxonomy_allowed_values',
+ ),
+ 'translatable' => 0,
+ 'type' => 'taxonomy_term_reference',
+ );
+
+ return $field_bases;
+}
diff --git a/sites/default/modules/features/popsu_villes/popsu_villes.features.field_instance.inc b/sites/default/modules/features/popsu_villes/popsu_villes.features.field_instance.inc
new file mode 100644
index 0000000..3109361
--- /dev/null
+++ b/sites/default/modules/features/popsu_villes/popsu_villes.features.field_instance.inc
@@ -0,0 +1,489 @@
+ 'popsu_ville',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 0,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ ),
+ 'entity_type' => 'node',
+ 'field_name' => 'field_popsu_ville_body',
+ 'label' => 'Texte d\'introduction',
+ 'required' => 0,
+ 'settings' => array(
+ 'display_summary' => 0,
+ 'text_processing' => 1,
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'text',
+ 'settings' => array(
+ 'rows' => 20,
+ 'summary_rows' => 5,
+ ),
+ 'type' => 'text_textarea_with_summary',
+ 'weight' => 2,
+ ),
+ );
+
+ // Exported field_instance: 'node-popsu_ville-field_popsu_ville_coordinateur'.
+ $field_instances['node-popsu_ville-field_popsu_ville_coordinateur'] = array(
+ 'bundle' => 'popsu_ville',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 2,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ ),
+ 'entity_type' => 'node',
+ 'field_name' => 'field_popsu_ville_coordinateur',
+ 'label' => 'Coordinateur des acteurs',
+ 'required' => 0,
+ 'settings' => array(
+ 'text_processing' => 1,
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'text',
+ 'settings' => array(
+ 'rows' => 5,
+ ),
+ 'type' => 'text_textarea',
+ 'weight' => 4,
+ ),
+ );
+
+ // Exported field_instance: 'node-popsu_ville-field_popsu_ville_equipe'.
+ $field_instances['node-popsu_ville-field_popsu_ville_equipe'] = array(
+ 'bundle' => 'popsu_ville',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 1,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ ),
+ 'entity_type' => 'node',
+ 'field_name' => 'field_popsu_ville_equipe',
+ 'label' => 'Equipe de recherche',
+ 'required' => 0,
+ 'settings' => array(
+ 'text_processing' => 1,
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'text',
+ 'settings' => array(
+ 'rows' => 5,
+ ),
+ 'type' => 'text_textarea',
+ 'weight' => 3,
+ ),
+ );
+
+ // Exported field_instance:
+ // 'node-popsu_ville-field_popsu_ville_images_illustr'.
+ $field_instances['node-popsu_ville-field_popsu_ville_images_illustr'] = array(
+ 'bundle' => 'popsu_ville',
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 3,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ ),
+ 'entity_type' => 'node',
+ 'field_name' => 'field_popsu_ville_images_illustr',
+ 'label' => 'Grandes images d\'illustration',
+ 'required' => 0,
+ 'settings' => array(
+ 'alt_field' => 0,
+ 'default_image' => 0,
+ 'file_directory' => '',
+ 'file_extensions' => 'png gif jpg jpeg',
+ 'filefield_paths' => array(
+ 'active_updating' => 0,
+ 'file_name' => array(
+ 'options' => array(
+ 'pathauto' => 1,
+ 'transliterate' => 1,
+ ),
+ 'value' => '[file:ffp-name-only-original].[file:ffp-extension-original]',
+ ),
+ 'file_path' => array(
+ 'options' => array(
+ 'pathauto' => 1,
+ 'transliterate' => 1,
+ ),
+ 'value' => 'nodes/[node:content-type]/[node:nid]/illustr',
+ ),
+ 'retroactive_update' => 0,
+ ),
+ 'max_filesize' => '',
+ 'max_resolution' => '',
+ 'min_resolution' => '',
+ 'title_field' => 1,
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'image',
+ 'settings' => array(
+ 'insert' => 0,
+ 'insert_absolute' => FALSE,
+ 'insert_class' => '',
+ 'insert_default' => array(
+ 0 => 'auto',
+ ),
+ 'insert_styles' => array(
+ 0 => 'auto',
+ ),
+ 'insert_width' => '',
+ 'preview_image_style' => 'thumbnail',
+ 'progress_indicator' => 'throbber',
+ ),
+ 'type' => 'image_image',
+ 'weight' => 5,
+ ),
+ );
+
+ // Exported field_instance: 'node-popsu_ville-field_popsu_ville_images_small'.
+ $field_instances['node-popsu_ville-field_popsu_ville_images_small'] = array(
+ 'bundle' => 'popsu_ville',
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 4,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ ),
+ 'entity_type' => 'node',
+ 'field_name' => 'field_popsu_ville_images_small',
+ 'label' => 'Petites images d\'illustration',
+ 'required' => 0,
+ 'settings' => array(
+ 'alt_field' => 0,
+ 'default_image' => 0,
+ 'file_directory' => '',
+ 'file_extensions' => 'png gif jpg jpeg',
+ 'filefield_paths' => array(
+ 'active_updating' => 0,
+ 'file_name' => array(
+ 'options' => array(
+ 'pathauto' => 1,
+ 'transliterate' => 1,
+ ),
+ 'value' => '[file:ffp-name-only-original].[file:ffp-extension-original]',
+ ),
+ 'file_path' => array(
+ 'options' => array(
+ 'pathauto' => 1,
+ 'transliterate' => 1,
+ ),
+ 'value' => 'nodes/[node:content-type]/[node:nid]/small',
+ ),
+ 'retroactive_update' => 0,
+ ),
+ 'max_filesize' => '',
+ 'max_resolution' => '',
+ 'min_resolution' => '',
+ 'title_field' => 1,
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'image',
+ 'settings' => array(
+ 'insert' => 0,
+ 'insert_absolute' => FALSE,
+ 'insert_class' => '',
+ 'insert_default' => array(
+ 0 => 'auto',
+ ),
+ 'insert_styles' => array(
+ 0 => 'auto',
+ ),
+ 'insert_width' => '',
+ 'preview_image_style' => 'thumbnail',
+ 'progress_indicator' => 'throbber',
+ ),
+ 'type' => 'image_image',
+ 'weight' => 6,
+ ),
+ );
+
+ // Exported field_instance:
+ // 'node-popsu_ville-field_popsu_ville_partenairesimg'.
+ $field_instances['node-popsu_ville-field_popsu_ville_partenairesimg'] = array(
+ 'bundle' => 'popsu_ville',
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 8,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ ),
+ 'entity_type' => 'node',
+ 'field_name' => 'field_popsu_ville_partenairesimg',
+ 'label' => 'Logos des partenaires',
+ 'required' => 0,
+ 'settings' => array(
+ 'alt_field' => 0,
+ 'default_image' => 0,
+ 'file_directory' => '',
+ 'file_extensions' => 'png gif jpg jpeg',
+ 'filefield_paths' => array(
+ 'active_updating' => 0,
+ 'file_name' => array(
+ 'options' => array(
+ 'pathauto' => 1,
+ 'transliterate' => 1,
+ ),
+ 'value' => '[file:ffp-name-only-original].[file:ffp-extension-original]',
+ ),
+ 'file_path' => array(
+ 'options' => array(
+ 'pathauto' => 1,
+ 'transliterate' => 1,
+ ),
+ 'value' => 'nodes/[node:content-type]/[node:nid]/partenaireslogo',
+ ),
+ 'retroactive_update' => 0,
+ ),
+ 'max_filesize' => '',
+ 'max_resolution' => '',
+ 'min_resolution' => '',
+ 'title_field' => 1,
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'image',
+ 'settings' => array(
+ 'insert' => 0,
+ 'insert_absolute' => FALSE,
+ 'insert_class' => '',
+ 'insert_default' => array(
+ 0 => 'auto',
+ ),
+ 'insert_styles' => array(
+ 0 => 'auto',
+ ),
+ 'insert_width' => '',
+ 'preview_image_style' => 'thumbnail',
+ 'progress_indicator' => 'throbber',
+ ),
+ 'type' => 'image_image',
+ 'weight' => 7,
+ ),
+ );
+
+ // Exported field_instance:
+ // 'node-popsu_ville-field_popsu_ville_partenairestxt'.
+ $field_instances['node-popsu_ville-field_popsu_ville_partenairestxt'] = array(
+ 'bundle' => 'popsu_ville',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'module' => 'text',
+ 'settings' => array(),
+ 'type' => 'text_default',
+ 'weight' => 7,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ ),
+ 'entity_type' => 'node',
+ 'field_name' => 'field_popsu_ville_partenairestxt',
+ 'label' => 'Texte des partenaires',
+ 'required' => 0,
+ 'settings' => array(
+ 'text_processing' => 0,
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'text',
+ 'settings' => array(
+ 'rows' => 5,
+ ),
+ 'type' => 'text_textarea',
+ 'weight' => 8,
+ ),
+ );
+
+ // Exported field_instance: 'node-popsu_ville-field_popsu_ville_popsu'.
+ $field_instances['node-popsu_ville-field_popsu_ville_popsu'] = array(
+ 'bundle' => 'popsu_ville',
+ 'default_value' => array(
+ 0 => array(
+ 'tid' => 1,
+ ),
+ ),
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 5,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ ),
+ 'entity_type' => 'node',
+ 'field_name' => 'field_popsu_ville_popsu',
+ 'label' => 'POPSU',
+ 'required' => 1,
+ 'settings' => array(
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'options',
+ 'settings' => array(),
+ 'type' => 'options_select',
+ 'weight' => 1,
+ ),
+ );
+
+ // Exported field_instance: 'node-popsu_ville-field_popsu_ville_ville'.
+ $field_instances['node-popsu_ville-field_popsu_ville_ville'] = array(
+ 'bundle' => 'popsu_ville',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'hidden',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 6,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ ),
+ 'entity_type' => 'node',
+ 'field_name' => 'field_popsu_ville_ville',
+ 'label' => 'Ville',
+ 'required' => 1,
+ 'settings' => array(
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 1,
+ 'module' => 'options',
+ 'settings' => array(),
+ 'type' => 'options_select',
+ 'weight' => 2,
+ ),
+ );
+
+ // Translatables
+ // Included for use with string extractors like potx.
+ t('Coordinateur des acteurs');
+ t('Equipe de recherche');
+ t('Grandes images d\'illustration');
+ t('Logos des partenaires');
+ t('POPSU');
+ t('Petites images d\'illustration');
+ t('Texte d\'introduction');
+ t('Texte des partenaires');
+ t('Ville');
+
+ return $field_instances;
+}
diff --git a/sites/default/modules/features/popsu_villes/popsu_villes.features.inc b/sites/default/modules/features/popsu_villes/popsu_villes.features.inc
index 75571b9..813f4d9 100644
--- a/sites/default/modules/features/popsu_villes/popsu_villes.features.inc
+++ b/sites/default/modules/features/popsu_villes/popsu_villes.features.inc
@@ -7,24 +7,19 @@
/**
* Implements hook_ctools_plugin_api().
*/
-function popsu_villes_ctools_plugin_api() {
- list($module, $api) = func_get_args();
+function popsu_villes_ctools_plugin_api($module = NULL, $api = NULL) {
if ($module == "boxes" && $api == "box") {
return array("version" => "1");
}
- list($module, $api) = func_get_args();
if ($module == "context" && $api == "context") {
return array("version" => "3");
}
- list($module, $api) = func_get_args();
if ($module == "field_group" && $api == "field_group") {
return array("version" => "1");
}
- list($module, $api) = func_get_args();
if ($module == "page_manager" && $api == "pages_default") {
return array("version" => "1");
}
- list($module, $api) = func_get_args();
if ($module == "strongarm" && $api == "strongarm") {
return array("version" => "1");
}
@@ -33,8 +28,8 @@ function popsu_villes_ctools_plugin_api() {
/**
* Implements hook_views_api().
*/
-function popsu_villes_views_api() {
- return array("version" => "3.0");
+function popsu_villes_views_api($module = NULL, $api = NULL) {
+ return array("api" => "3.0");
}
/**
@@ -45,47 +40,30 @@ function popsu_villes_image_default_styles() {
// Exported image style: popsu-villes-grande-image.
$styles['popsu-villes-grande-image'] = array(
- 'name' => 'popsu-villes-grande-image',
+ 'label' => 'popsu-villes-grande-image',
'effects' => array(
- 2 => array(
- 'label' => 'Adaptive',
- 'help' => 'Adaptive image scale according to client resolution.',
- 'effect callback' => 'image_scale_effect',
- 'dimensions callback' => 'image_scale_dimensions',
- 'form callback' => 'adaptive_image_scale_form',
- 'summary theme' => 'adaptive_image_scale_summary',
- 'module' => 'adaptive_image',
- 'name' => 'adaptive_image',
+ 21 => array(
+ 'name' => 'image_scale_and_crop',
'data' => array(
- 'resolutions' => '1382, 992, 768, 480',
- 'mobile_first' => 1,
- 'height' => '',
- 'width' => '1382',
- 'upscale' => '',
+ 'width' => 485,
+ 'height' => 324,
),
- 'weight' => '2',
+ 'weight' => 1,
),
),
);
// Exported image style: popsu-villes-listing-small.
$styles['popsu-villes-listing-small'] = array(
- 'name' => 'popsu-villes-listing-small',
+ 'label' => 'popsu-villes-listing-small',
'effects' => array(
5 => array(
- 'label' => 'Mise à l’échelle et recadrage',
- 'help' => 'La mise à l\'échelle et le recadrage maintiendront les proportions originales de l\'image puis recadreront la dimension la plus large. C\'est très utile pour créer des vignettes carrées sans étirer les images.',
- 'effect callback' => 'image_scale_and_crop_effect',
- 'dimensions callback' => 'image_resize_dimensions',
- 'form callback' => 'image_resize_form',
- 'summary theme' => 'image_resize_summary',
- 'module' => 'image',
'name' => 'image_scale_and_crop',
'data' => array(
- 'width' => '101',
- 'height' => '87',
+ 'width' => 101,
+ 'height' => 87,
),
- 'weight' => '1',
+ 'weight' => 1,
),
),
);
@@ -107,5 +85,6 @@ function popsu_villes_node_info() {
'help' => '',
),
);
+ drupal_alter('node_info', $items);
return $items;
}
diff --git a/sites/default/modules/features/popsu_villes/popsu_villes.info b/sites/default/modules/features/popsu_villes/popsu_villes.info
index 4642a2e..5b5f268 100644
--- a/sites/default/modules/features/popsu_villes/popsu_villes.info
+++ b/sites/default/modules/features/popsu_villes/popsu_villes.info
@@ -2,7 +2,6 @@ name = POPSU Villes
description = POPSU - Type de contenu Villes
core = 7.x
package = POPSU
-php = 5.2.4
version = 7.x-1.0-beta9
project = popsu_villes
dependencies[] = block
@@ -13,6 +12,7 @@ dependencies[] = field_group
dependencies[] = filefield_paths
dependencies[] = image
dependencies[] = menu_block
+dependencies[] = node
dependencies[] = page_manager
dependencies[] = popsu_structure
dependencies[] = popsu_taxonomies
@@ -28,20 +28,31 @@ features[ctools][] = field_group:field_group:1
features[ctools][] = page_manager:pages_default:1
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
-features[features_api][] = api:1
-features[field][] = node-popsu_ville-field_popsu_ville_body
-features[field][] = node-popsu_ville-field_popsu_ville_coordinateur
-features[field][] = node-popsu_ville-field_popsu_ville_equipe
-features[field][] = node-popsu_ville-field_popsu_ville_images_illustr
-features[field][] = node-popsu_ville-field_popsu_ville_images_small
-features[field][] = node-popsu_ville-field_popsu_ville_partenairesimg
-features[field][] = node-popsu_ville-field_popsu_ville_partenairestxt
+features[features_api][] = api:2
+features[field_base][] = field_popsu_ville_body
+features[field_base][] = field_popsu_ville_coordinateur
+features[field_base][] = field_popsu_ville_equipe
+features[field_base][] = field_popsu_ville_images_illustr
+features[field_base][] = field_popsu_ville_images_small
+features[field_base][] = field_popsu_ville_partenairesimg
+features[field_base][] = field_popsu_ville_partenairestxt
+features[field_base][] = field_popsu_ville_popsu
+features[field_base][] = field_popsu_ville_ville
features[field_group][] = group_popsu_ville_basic|node|popsu_ville|form
features[field_group][] = group_popsu_ville_coordo|node|popsu_ville|form
features[field_group][] = group_popsu_ville_equipe|node|popsu_ville|form
features[field_group][] = group_popsu_ville_images|node|popsu_ville|form
features[field_group][] = group_popsu_ville_intro|node|popsu_ville|form
features[field_group][] = group_popsu_ville_partenaires|node|popsu_ville|form
+features[field_instance][] = node-popsu_ville-field_popsu_ville_body
+features[field_instance][] = node-popsu_ville-field_popsu_ville_coordinateur
+features[field_instance][] = node-popsu_ville-field_popsu_ville_equipe
+features[field_instance][] = node-popsu_ville-field_popsu_ville_images_illustr
+features[field_instance][] = node-popsu_ville-field_popsu_ville_images_small
+features[field_instance][] = node-popsu_ville-field_popsu_ville_partenairesimg
+features[field_instance][] = node-popsu_ville-field_popsu_ville_partenairestxt
+features[field_instance][] = node-popsu_ville-field_popsu_ville_popsu
+features[field_instance][] = node-popsu_ville-field_popsu_ville_ville
features[image][] = popsu-villes-grande-image
features[image][] = popsu-villes-listing-small
features[node][] = popsu_ville
@@ -53,4 +64,5 @@ features[variable][] = menu_parent_popsu_ville
features[variable][] = node_options_popsu_ville
features[variable][] = node_preview_popsu_ville
features[variable][] = node_submitted_popsu_ville
+features[variable][] = xmlsitemap_settings_node_popsu_ville
features[views_view][] = villes
diff --git a/sites/default/modules/features/popsu_villes/popsu_villes.pages_default.inc b/sites/default/modules/features/popsu_villes/popsu_villes.pages_default.inc
index b7c5e13..15085fa 100644
--- a/sites/default/modules/features/popsu_villes/popsu_villes.pages_default.inc
+++ b/sites/default/modules/features/popsu_villes/popsu_villes.pages_default.inc
@@ -77,303 +77,343 @@ function popsu_villes_default_page_manager_handlers() {
);
$display->cache = array();
$display->title = '%node:title';
+ $display->uuid = '2a15c48c-e269-41d7-900d-2968a7252ef3';
+ $display->storage_type = 'page_manager';
+ $display->storage_id = 'node_view_panel_context_2';
$display->content = array();
$display->panels = array();
- $pane = new stdClass();
- $pane->pid = 'new-1';
- $pane->panel = 'footer';
- $pane->type = 'views_panes';
- $pane->subtype = 'colloques-panel_pane_1';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'arguments' => array(
- 'field_popsu_colloque_ville_tid' => '%taxonomy_term:tid',
- 'field_popsu_colloque_popsu_tid' => '%taxonomy_term_2:tid',
- ),
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_id' => 'pane-colloque',
- 'css_class' => 'pane-74-26',
- );
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $display->content['new-1'] = $pane;
- $display->panels['footer'][0] = 'new-1';
- $pane = new stdClass();
- $pane->pid = 'new-2';
- $pane->panel = 'footer';
- $pane->type = 'views_panes';
- $pane->subtype = 'publications-panel_pane_1';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'arguments' => array(
- 'field_popsu_publication_ville_tid' => '%taxonomy_term:tid',
- 'field_popsu_publication_popsu_tid' => '%taxonomy_term_2:tid',
- ),
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_id' => 'pane-publication',
- 'css_class' => 'layout-88p pane-74-26 clearfix',
- );
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $display->content['new-2'] = $pane;
- $display->panels['footer'][1] = 'new-2';
- $pane = new stdClass();
- $pane->pid = 'new-3';
- $pane->panel = 'footer';
- $pane->type = 'custom';
- $pane->subtype = 'custom';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'admin_title' => 'POPSU Fermeture de liste',
- 'title' => '',
- 'body' => '
',
- 'format' => 'php_code',
- 'substitute' => 0,
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_id' => '',
- 'css_class' => 'border-last layout-64-5p',
- );
- $pane->extras = array();
- $pane->position = 2;
- $pane->locks = array();
- $display->content['new-3'] = $pane;
- $display->panels['footer'][2] = 'new-3';
- $pane = new stdClass();
- $pane->pid = 'new-4';
- $pane->panel = 'left';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_popsu_ville_images_illustr';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'title',
- 'formatter' => 'image',
- 'delta_limit' => '0',
- 'delta_offset' => '0',
- 'delta_reversed' => 0,
- 'formatter_settings' => array(
- 'image_style' => 'popsu-villes-grande-image',
- 'image_link' => '',
- ),
- 'context' => 'argument_entity_id:node_1',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_id' => 'panel-ville-grande-image',
- 'css_class' => 'image-decallee',
- );
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $display->content['new-4'] = $pane;
- $display->panels['left'][0] = 'new-4';
- $pane = new stdClass();
- $pane->pid = 'new-5';
- $pane->panel = 'left';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_popsu_ville_body';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'title',
- 'formatter' => 'text_default',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(),
- 'context' => 'argument_entity_id:node_1',
- 'override_title' => 1,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_id' => 'panel-ville-texte-intro',
- 'css_class' => 'layout-88p',
- );
- $pane->extras = array();
- $pane->position = 1;
- $pane->locks = array();
- $display->content['new-5'] = $pane;
- $display->panels['left'][1] = 'new-5';
- $pane = new stdClass();
- $pane->pid = 'new-6';
- $pane->panel = 'right';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_popsu_ville_equipe';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'title',
- 'formatter' => 'text_default',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(),
- 'context' => 'argument_entity_id:node_1',
- 'override_title' => 0,
- 'override_title_text' => '',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_id' => 'accordion-h2-ville-equipe',
- 'css_class' => 'accordion-h2-ex accordion-h2-panel',
- );
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $display->content['new-6'] = $pane;
- $display->panels['right'][0] = 'new-6';
- $pane = new stdClass();
- $pane->pid = 'new-7';
- $pane->panel = 'right';
- $pane->type = 'entity_field';
- $pane->subtype = 'node:field_popsu_ville_coordinateur';
- $pane->shown = TRUE;
- $pane->access = array();
- $pane->configuration = array(
- 'label' => 'title',
- 'formatter' => 'text_default',
- 'delta_limit' => 0,
- 'delta_offset' => '0',
- 'delta_reversed' => FALSE,
- 'formatter_settings' => array(),
- 'context' => 'argument_entity_id:node_1',
- 'override_title' => 1,
- 'override_title_text' => 'Coordinateur',
- 'body' => '
',
- 'format' => 'php_code',
- 'substitute' => 0,
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_id' => '',
- 'css_class' => 'border-last',
- );
- $pane->extras = array();
- $pane->position = 3;
- $pane->locks = array();
- $display->content['new-9'] = $pane;
- $display->panels['right'][3] = 'new-9';
- $pane = new stdClass();
- $pane->pid = 'new-10';
- $pane->panel = 'top';
- $pane->type = 'node_links';
- $pane->subtype = 'node_links';
- $pane->shown = FALSE;
- $pane->access = array();
- $pane->configuration = array(
- 'override_title' => 0,
- 'override_title_text' => '',
- 'build_mode' => 'full',
- 'identifier' => '',
- 'link' => 1,
- 'context' => 'argument_entity_id:node_1',
- );
- $pane->cache = array();
- $pane->style = array(
- 'settings' => NULL,
- );
- $pane->css = array(
- 'css_id' => '',
- 'css_class' => 'admin-add-item',
- );
- $pane->extras = array();
- $pane->position = 0;
- $pane->locks = array();
- $display->content['new-10'] = $pane;
- $display->panels['top'][0] = 'new-10';
+ $pane = new stdClass();
+ $pane->pid = 'new-19dd72c5-0fb3-4d57-a1d9-dec43cd726bb';
+ $pane->panel = 'footer';
+ $pane->type = 'views_panes';
+ $pane->subtype = 'colloques-panel_pane_1';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'arguments' => array(
+ 'field_popsu_colloque_ville_tid' => '%taxonomy_term:tid',
+ 'field_popsu_colloque_popsu_tid' => '%taxonomy_term_2:tid',
+ ),
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_id' => 'pane-colloque',
+ 'css_class' => 'pane-74-26',
+ );
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '19dd72c5-0fb3-4d57-a1d9-dec43cd726bb';
+ $display->content['new-19dd72c5-0fb3-4d57-a1d9-dec43cd726bb'] = $pane;
+ $display->panels['footer'][0] = 'new-19dd72c5-0fb3-4d57-a1d9-dec43cd726bb';
+ $pane = new stdClass();
+ $pane->pid = 'new-20e52524-8591-4ca9-9cf9-b0812e4c1b22';
+ $pane->panel = 'footer';
+ $pane->type = 'views_panes';
+ $pane->subtype = 'publications-panel_pane_1';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'arguments' => array(
+ 'field_popsu_publication_ville_tid' => '%taxonomy_term:tid',
+ 'field_popsu_publication_popsu_tid' => '%taxonomy_term_2:tid',
+ ),
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_id' => 'pane-publication',
+ 'css_class' => 'layout-88p pane-74-26 clearfix',
+ );
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = '20e52524-8591-4ca9-9cf9-b0812e4c1b22';
+ $display->content['new-20e52524-8591-4ca9-9cf9-b0812e4c1b22'] = $pane;
+ $display->panels['footer'][1] = 'new-20e52524-8591-4ca9-9cf9-b0812e4c1b22';
+ $pane = new stdClass();
+ $pane->pid = 'new-0847f350-e4ae-4918-94a5-88bbb2d8d2fb';
+ $pane->panel = 'footer';
+ $pane->type = 'custom';
+ $pane->subtype = 'custom';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'admin_title' => 'POPSU Fermeture de liste',
+ 'title' => '',
+ 'body' => '
',
+ 'format' => 'php_code',
+ 'substitute' => 0,
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_id' => '',
+ 'css_class' => 'border-last layout-64-5p',
+ );
+ $pane->extras = array();
+ $pane->position = 2;
+ $pane->locks = array();
+ $pane->uuid = '0847f350-e4ae-4918-94a5-88bbb2d8d2fb';
+ $display->content['new-0847f350-e4ae-4918-94a5-88bbb2d8d2fb'] = $pane;
+ $display->panels['footer'][2] = 'new-0847f350-e4ae-4918-94a5-88bbb2d8d2fb';
+ $pane = new stdClass();
+ $pane->pid = 'new-4d97b26b-b3c7-4cf9-859f-7c86e93f4610';
+ $pane->panel = 'left';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_popsu_ville_images_illustr';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'title',
+ 'formatter' => 'image',
+ 'delta_limit' => '0',
+ 'delta_offset' => '0',
+ 'delta_reversed' => 0,
+ 'formatter_settings' => array(
+ 'image_style' => 'popsu-villes-grande-image',
+ 'image_link' => '',
+ ),
+ 'context' => 'argument_entity_id:node_1',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_id' => 'panel-ville-grande-image',
+ 'css_class' => 'image-decallee captioned',
+ );
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '4d97b26b-b3c7-4cf9-859f-7c86e93f4610';
+ $display->content['new-4d97b26b-b3c7-4cf9-859f-7c86e93f4610'] = $pane;
+ $display->panels['left'][0] = 'new-4d97b26b-b3c7-4cf9-859f-7c86e93f4610';
+ $pane = new stdClass();
+ $pane->pid = 'new-95496ef6-19e2-49c4-8c59-f3d251199a84';
+ $pane->panel = 'left';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_popsu_ville_body';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'title',
+ 'formatter' => 'text_default',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(),
+ 'context' => 'argument_entity_id:node_1',
+ 'override_title' => 1,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_id' => 'panel-ville-texte-intro',
+ 'css_class' => 'layout-88p',
+ );
+ $pane->extras = array();
+ $pane->position = 1;
+ $pane->locks = array();
+ $pane->uuid = '95496ef6-19e2-49c4-8c59-f3d251199a84';
+ $display->content['new-95496ef6-19e2-49c4-8c59-f3d251199a84'] = $pane;
+ $display->panels['left'][1] = 'new-95496ef6-19e2-49c4-8c59-f3d251199a84';
+ $pane = new stdClass();
+ $pane->pid = 'new-8633443c-8d55-49e3-9e83-f316d9a5e06c';
+ $pane->panel = 'right';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_popsu_ville_equipe';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'title',
+ 'formatter' => 'text_default',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(),
+ 'context' => 'argument_entity_id:node_1',
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_id' => 'accordion-h2-ville-equipe',
+ 'css_class' => 'accordion-h2-ex accordion-h2-panel',
+ );
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = '8633443c-8d55-49e3-9e83-f316d9a5e06c';
+ $display->content['new-8633443c-8d55-49e3-9e83-f316d9a5e06c'] = $pane;
+ $display->panels['right'][0] = 'new-8633443c-8d55-49e3-9e83-f316d9a5e06c';
+ $pane = new stdClass();
+ $pane->pid = 'new-b7d934ba-cbdf-49d0-be81-f39b3cfc5f4c';
+ $pane->panel = 'right';
+ $pane->type = 'entity_field';
+ $pane->subtype = 'node:field_popsu_ville_coordinateur';
+ $pane->shown = TRUE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'label' => 'title',
+ 'formatter' => 'text_default',
+ 'delta_limit' => 0,
+ 'delta_offset' => '0',
+ 'delta_reversed' => FALSE,
+ 'formatter_settings' => array(),
+ 'context' => 'argument_entity_id:node_1',
+ 'override_title' => 1,
+ 'override_title_text' => 'Coordinateur',
+ 'body' => '
',
+ 'format' => 'php_code',
+ 'substitute' => 0,
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_id' => '',
+ 'css_class' => 'border-last',
+ );
+ $pane->extras = array();
+ $pane->position = 4;
+ $pane->locks = array();
+ $pane->uuid = 'beaed20f-342d-4553-ad2e-9527df2d46e1';
+ $display->content['new-beaed20f-342d-4553-ad2e-9527df2d46e1'] = $pane;
+ $display->panels['right'][4] = 'new-beaed20f-342d-4553-ad2e-9527df2d46e1';
+ $pane = new stdClass();
+ $pane->pid = 'new-c976aec7-6650-4c5c-bb9c-4a44e7872566';
+ $pane->panel = 'top';
+ $pane->type = 'node_links';
+ $pane->subtype = 'node_links';
+ $pane->shown = FALSE;
+ $pane->access = array();
+ $pane->configuration = array(
+ 'override_title' => 0,
+ 'override_title_text' => '',
+ 'build_mode' => 'full',
+ 'identifier' => '',
+ 'link' => 1,
+ 'context' => 'argument_entity_id:node_1',
+ );
+ $pane->cache = array();
+ $pane->style = array(
+ 'settings' => NULL,
+ );
+ $pane->css = array(
+ 'css_id' => '',
+ 'css_class' => 'admin-add-item',
+ );
+ $pane->extras = array();
+ $pane->position = 0;
+ $pane->locks = array();
+ $pane->uuid = 'c976aec7-6650-4c5c-bb9c-4a44e7872566';
+ $display->content['new-c976aec7-6650-4c5c-bb9c-4a44e7872566'] = $pane;
+ $display->panels['top'][0] = 'new-c976aec7-6650-4c5c-bb9c-4a44e7872566';
$display->hide_title = PANELS_TITLE_FIXED;
$display->title_pane = '0';
$handler->conf['display'] = $display;
diff --git a/sites/default/modules/features/popsu_villes/popsu_villes.strongarm.inc b/sites/default/modules/features/popsu_villes/popsu_villes.strongarm.inc
index 44b80e4..f954a5b 100644
--- a/sites/default/modules/features/popsu_villes/popsu_villes.strongarm.inc
+++ b/sites/default/modules/features/popsu_villes/popsu_villes.strongarm.inc
@@ -34,6 +34,9 @@ function popsu_villes_strongarm() {
'token' => array(
'custom_settings' => FALSE,
),
+ 'diff_standard' => array(
+ 'custom_settings' => FALSE,
+ ),
),
'extra_fields' => array(
'form' => array(
@@ -97,5 +100,15 @@ function popsu_villes_strongarm() {
$strongarm->value = 0;
$export['node_submitted_popsu_ville'] = $strongarm;
+ $strongarm = new stdClass();
+ $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+ $strongarm->api_version = 1;
+ $strongarm->name = 'xmlsitemap_settings_node_popsu_ville';
+ $strongarm->value = array(
+ 'status' => '1',
+ 'priority' => '0.8',
+ );
+ $export['xmlsitemap_settings_node_popsu_ville'] = $strongarm;
+
return $export;
}
diff --git a/sites/default/modules/features/popsu_villes/popsu_villes.views_default.inc b/sites/default/modules/features/popsu_villes/popsu_villes.views_default.inc
index 2c3ca2a..7173afe 100644
--- a/sites/default/modules/features/popsu_villes/popsu_villes.views_default.inc
+++ b/sites/default/modules/features/popsu_villes/popsu_villes.views_default.inc
@@ -66,13 +66,11 @@ function popsu_villes_views_default_views() {
$handler = $view->new_display('page', 'Page', 'page_1');
$handler->display->display_options['defaults']['title'] = FALSE;
$handler->display->display_options['title'] = 'Villes';
- $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
$handler->display->display_options['path'] = 'villes';
/* Display: Villes par POPSU Pane */
$handler = $view->new_display('panel_pane', 'Villes par POPSU Pane', 'panel_pane_1');
$handler->display->display_options['defaults']['css_class'] = FALSE;
- $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
$handler->display->display_options['defaults']['style_plugin'] = FALSE;
$handler->display->display_options['style_plugin'] = 'list';
$handler->display->display_options['style_options']['row_class'] = 'span2';
@@ -141,7 +139,6 @@ function popsu_villes_views_default_views() {
/* Display: Villes par ThemeTrans Pane */
$handler = $view->new_display('panel_pane', 'Villes par ThemeTrans Pane', 'panel_pane_2');
$handler->display->display_options['defaults']['css_class'] = FALSE;
- $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
$handler->display->display_options['defaults']['style_plugin'] = FALSE;
$handler->display->display_options['style_plugin'] = 'list';
$handler->display->display_options['style_options']['row_class'] = 'span2';
diff --git a/sites/default/themes/popsu/css/screen.css b/sites/default/themes/popsu/css/screen.css
index 5836172..4391243 100644
--- a/sites/default/themes/popsu/css/screen.css
+++ b/sites/default/themes/popsu/css/screen.css
@@ -711,7 +711,12 @@ a:hover {
margin-left: 100px; }
/* line 555, ../../vendor/gems/compass_twitter_bootstrap-2.0.3/stylesheets/compass_twitter_bootstrap/_mixins.scss */
-.span2, body.context-popsu-1 #header-wrapper #block-boxes-popsu_logo_popsu2, body.context-popsu-1 #header-wrapper #block-boxes-popsu_logo_popsueurope, body.context-popsu-2 #header-wrapper #block-boxes-popsu_logo_popsu1, body.context-popsu-2 #header-wrapper #block-boxes-popsu_logo_popsueurope, body.context-popsu-europe #header-wrapper #block-boxes-popsu_logo_popsu1, body.context-popsu-europe #header-wrapper #block-boxes-popsu_logo_popsu2 {
+.span2, body.context-popsu-1 #header-wrapper #block-boxes-popsu_logo_popsu2,
+body.context-popsu-1 #header-wrapper #block-boxes-popsu_logo_popsueurope,
+body.context-popsu-2 #header-wrapper #block-boxes-popsu_logo_popsu1,
+body.context-popsu-2 #header-wrapper #block-boxes-popsu_logo_popsueurope,
+body.context-popsu-europe #header-wrapper #block-boxes-popsu_logo_popsu1,
+body.context-popsu-europe #header-wrapper #block-boxes-popsu_logo_popsu2 {
width: 140px; }
/* line 556, ../../vendor/gems/compass_twitter_bootstrap-2.0.3/stylesheets/compass_twitter_bootstrap/_mixins.scss */
@@ -727,7 +732,15 @@ a:hover {
margin-left: 260px; }
/* line 555, ../../vendor/gems/compass_twitter_bootstrap-2.0.3/stylesheets/compass_twitter_bootstrap/_mixins.scss */
-.span4, body.context-popsu-1 #header-wrapper #block-boxes-popsu_logo_popsu1, body.context-popsu-2 #header-wrapper #block-boxes-popsu_logo_popsu2, body.context-popsu-europe #header-wrapper #block-boxes-popsu_logo_popsueurope, body.popsu-actu-section #header-wrapper #boxes-box-popsu_logo_popsuneutral, #main-wrapper #sidebar-first {
+.span4,
+body.context-popsu-1 #header-wrapper #block-boxes-popsu_logo_popsu1,
+body.context-popsu-2 #header-wrapper #block-boxes-popsu_logo_popsu2,
+body.context-popsu-europe #header-wrapper #block-boxes-popsu_logo_popsueurope,
+body.context-popsu-monde #header-wrapper #block-boxes-popsu_logo_popsumonde,
+body.context-popsu-territoires #header-wrapper #block-boxes-popsu_logo_popsuterrritoires,
+body.context-popsu-metropoles #header-wrapper #block-boxes-popsu_logo_popsumetropoles,
+body.popsu-actu-section #header-wrapper #boxes-box-popsu_logo_popsuneutral,
+#main-wrapper #sidebar-first {
width: 300px; }
/* line 556, ../../vendor/gems/compass_twitter_bootstrap-2.0.3/stylesheets/compass_twitter_bootstrap/_mixins.scss */
diff --git a/sites/default/themes/popsu/img/body-pattern-wide-trans.png b/sites/default/themes/popsu/img/body-pattern-wide-trans.png
index 1b4a870..d8cdc7a 100644
Binary files a/sites/default/themes/popsu/img/body-pattern-wide-trans.png and b/sites/default/themes/popsu/img/body-pattern-wide-trans.png differ
diff --git a/sites/default/themes/popsu/img/body-pattern-wide-trans_OLD.png b/sites/default/themes/popsu/img/body-pattern-wide-trans_OLD.png
new file mode 100644
index 0000000..1b4a870
Binary files /dev/null and b/sites/default/themes/popsu/img/body-pattern-wide-trans_OLD.png differ
diff --git a/sites/default/themes/popsu/img/carte/points/points_carte_1-2-3-5.png b/sites/default/themes/popsu/img/carte/points/points_carte_1-2-3-5.png
new file mode 100644
index 0000000..a71928a
Binary files /dev/null and b/sites/default/themes/popsu/img/carte/points/points_carte_1-2-3-5.png differ
diff --git a/sites/default/themes/popsu/img/carte/points/points_carte_1-2-5.png b/sites/default/themes/popsu/img/carte/points/points_carte_1-2-5.png
new file mode 100644
index 0000000..4cbc5a4
Binary files /dev/null and b/sites/default/themes/popsu/img/carte/points/points_carte_1-2-5.png differ
diff --git a/sites/default/themes/popsu/img/carte/points/points_carte_1-3-5.png b/sites/default/themes/popsu/img/carte/points/points_carte_1-3-5.png
new file mode 100644
index 0000000..759d115
Binary files /dev/null and b/sites/default/themes/popsu/img/carte/points/points_carte_1-3-5.png differ
diff --git a/sites/default/themes/popsu/img/carte/points/points_carte_1-5.png b/sites/default/themes/popsu/img/carte/points/points_carte_1-5.png
new file mode 100644
index 0000000..009d39f
Binary files /dev/null and b/sites/default/themes/popsu/img/carte/points/points_carte_1-5.png differ
diff --git a/sites/default/themes/popsu/img/carte/points/points_carte_2-3-5.png b/sites/default/themes/popsu/img/carte/points/points_carte_2-3-5.png
new file mode 100644
index 0000000..8a1c7a0
Binary files /dev/null and b/sites/default/themes/popsu/img/carte/points/points_carte_2-3-5.png differ
diff --git a/sites/default/themes/popsu/img/carte/points/points_carte_2-5.png b/sites/default/themes/popsu/img/carte/points/points_carte_2-5.png
new file mode 100644
index 0000000..e993749
Binary files /dev/null and b/sites/default/themes/popsu/img/carte/points/points_carte_2-5.png differ
diff --git a/sites/default/themes/popsu/img/carte/points/points_carte_5.png b/sites/default/themes/popsu/img/carte/points/points_carte_5.png
new file mode 100644
index 0000000..f6b8462
Binary files /dev/null and b/sites/default/themes/popsu/img/carte/points/points_carte_5.png differ
diff --git a/sites/default/themes/popsu/img/icons/facebook.png b/sites/default/themes/popsu/img/icons/facebook.png
new file mode 100644
index 0000000..7b52e14
Binary files /dev/null and b/sites/default/themes/popsu/img/icons/facebook.png differ
diff --git a/sites/default/themes/popsu/img/icons/twitter.png b/sites/default/themes/popsu/img/icons/twitter.png
new file mode 100644
index 0000000..ceff741
Binary files /dev/null and b/sites/default/themes/popsu/img/icons/twitter.png differ
diff --git a/sites/default/themes/popsu/img/icons/youtube-white.png b/sites/default/themes/popsu/img/icons/youtube-white.png
new file mode 100644
index 0000000..5522a61
Binary files /dev/null and b/sites/default/themes/popsu/img/icons/youtube-white.png differ
diff --git a/sites/default/themes/popsu/img/logos/logo-pages-froides-avec-baseline.png b/sites/default/themes/popsu/img/logos/logo-pages-froides-avec-baseline.png
index 9ac3ae6..9240cca 100644
Binary files a/sites/default/themes/popsu/img/logos/logo-pages-froides-avec-baseline.png and b/sites/default/themes/popsu/img/logos/logo-pages-froides-avec-baseline.png differ
diff --git a/sites/default/themes/popsu/img/logos/logo-pages-froides-avec-baseline_OLD.png b/sites/default/themes/popsu/img/logos/logo-pages-froides-avec-baseline_OLD.png
new file mode 100644
index 0000000..9ac3ae6
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/logo-pages-froides-avec-baseline_OLD.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsu1/logo-small-home-trans-old.png b/sites/default/themes/popsu/img/logos/popsu1/logo-small-home-trans-old.png
new file mode 100644
index 0000000..21ea9ff
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/popsu1/logo-small-home-trans-old.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsu1/logo-small-home-trans.png b/sites/default/themes/popsu/img/logos/popsu1/logo-small-home-trans.png
index 21ea9ff..d247c92 100644
Binary files a/sites/default/themes/popsu/img/logos/popsu1/logo-small-home-trans.png and b/sites/default/themes/popsu/img/logos/popsu1/logo-small-home-trans.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsu2/logo-small-home-trans-old.png b/sites/default/themes/popsu/img/logos/popsu2/logo-small-home-trans-old.png
new file mode 100644
index 0000000..f567e9c
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/popsu2/logo-small-home-trans-old.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsu2/logo-small-home-trans.png b/sites/default/themes/popsu/img/logos/popsu2/logo-small-home-trans.png
index f567e9c..7112333 100644
Binary files a/sites/default/themes/popsu/img/logos/popsu2/logo-small-home-trans.png and b/sites/default/themes/popsu/img/logos/popsu2/logo-small-home-trans.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsueurope/logo-small-home-trans-old.png b/sites/default/themes/popsu/img/logos/popsueurope/logo-small-home-trans-old.png
new file mode 100644
index 0000000..071eefa
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/popsueurope/logo-small-home-trans-old.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsueurope/logo-small-home-trans.png b/sites/default/themes/popsu/img/logos/popsueurope/logo-small-home-trans.png
index 071eefa..7e6f2d2 100644
Binary files a/sites/default/themes/popsu/img/logos/popsueurope/logo-small-home-trans.png and b/sites/default/themes/popsu/img/logos/popsueurope/logo-small-home-trans.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsumetropoles/logo-sidebar-trans.png b/sites/default/themes/popsu/img/logos/popsumetropoles/logo-sidebar-trans.png
new file mode 100644
index 0000000..1a8208f
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/popsumetropoles/logo-sidebar-trans.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsumetropoles/logo-small-home-trans.png b/sites/default/themes/popsu/img/logos/popsumetropoles/logo-small-home-trans.png
new file mode 100644
index 0000000..a421ae5
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/popsumetropoles/logo-small-home-trans.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsumetropoles/logo-small-trans.png b/sites/default/themes/popsu/img/logos/popsumetropoles/logo-small-trans.png
new file mode 100644
index 0000000..a07d6b6
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/popsumetropoles/logo-small-trans.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsumetropoles/logo-small-trans_new.png b/sites/default/themes/popsu/img/logos/popsumetropoles/logo-small-trans_new.png
new file mode 100644
index 0000000..a07d6b6
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/popsumetropoles/logo-small-trans_new.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsumetropoles/logo-small-trans_old.png b/sites/default/themes/popsu/img/logos/popsumetropoles/logo-small-trans_old.png
new file mode 100644
index 0000000..7a1d9bf
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/popsumetropoles/logo-small-trans_old.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsumonde/logo-sidebar-trans.png b/sites/default/themes/popsu/img/logos/popsumonde/logo-sidebar-trans.png
new file mode 100644
index 0000000..1e64f3d
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/popsumonde/logo-sidebar-trans.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsumonde/logo-small-home-trans.png b/sites/default/themes/popsu/img/logos/popsumonde/logo-small-home-trans.png
new file mode 100644
index 0000000..4f2e4a5
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/popsumonde/logo-small-home-trans.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsumonde/logo-small-trans.png b/sites/default/themes/popsu/img/logos/popsumonde/logo-small-trans.png
new file mode 100644
index 0000000..5b43662
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/popsumonde/logo-small-trans.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsumonde/logo-small-trans_new.png b/sites/default/themes/popsu/img/logos/popsumonde/logo-small-trans_new.png
new file mode 100644
index 0000000..5b43662
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/popsumonde/logo-small-trans_new.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsumonde/logo-small-trans_old.png b/sites/default/themes/popsu/img/logos/popsumonde/logo-small-trans_old.png
new file mode 100644
index 0000000..edc42bc
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/popsumonde/logo-small-trans_old.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsuterritoires/logo-sidebar-trans.png b/sites/default/themes/popsu/img/logos/popsuterritoires/logo-sidebar-trans.png
new file mode 100644
index 0000000..f1e045a
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/popsuterritoires/logo-sidebar-trans.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsuterritoires/logo-small-home-trans.png b/sites/default/themes/popsu/img/logos/popsuterritoires/logo-small-home-trans.png
new file mode 100644
index 0000000..39b8b34
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/popsuterritoires/logo-small-home-trans.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsuterritoires/logo-small-trans.png b/sites/default/themes/popsu/img/logos/popsuterritoires/logo-small-trans.png
new file mode 100644
index 0000000..1898b41
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/popsuterritoires/logo-small-trans.png differ
diff --git a/sites/default/themes/popsu/img/logos/popsuterritoires/logo-small-trans_old.png b/sites/default/themes/popsu/img/logos/popsuterritoires/logo-small-trans_old.png
new file mode 100644
index 0000000..ee988b2
Binary files /dev/null and b/sites/default/themes/popsu/img/logos/popsuterritoires/logo-small-trans_old.png differ
diff --git a/sites/default/themes/popsu/js/script.js b/sites/default/themes/popsu/js/script.js
index cf59885..92b63ae 100644
--- a/sites/default/themes/popsu/js/script.js
+++ b/sites/default/themes/popsu/js/script.js
@@ -120,6 +120,7 @@
trigger: "hover",
content: ""
});
/* BRUXELLES */
@@ -163,6 +164,7 @@
trigger: "hover",
content: ""
});
/* Hambourg */
@@ -189,6 +191,7 @@
"POPSU France 1 POPSU France 2 POPSU Europe POPSU Métropoles POPSU France 1 POPSU France 2 POPSU Europe POPSU Métropoles POPSU France 1 POPSU France 2 POPSU Europe POPSU Métropoles POPSU France 1 POPSU France 2 POPSU Europe POPSU Métropoles POPSU France 1 POPSU France 2 POPSU Europe POPSU Métropoles