alecpl
2009-09-15 34aec72131fee81697685f9781358e4871ea0150
- Support skins in 'archive' and 'markasjunk' plugins


4 files modified
5 files renamed
30 ■■■■■ changed files
CHANGELOG 1 ●●●● patch | view | raw | blame | history
plugins/archive/archive.js 4 ●●●● patch | view | raw | blame | history
plugins/archive/archive.php 18 ●●●●● patch | view | raw | blame | history
plugins/archive/skins/default/archive_act.png patch | view | raw | blame | history
plugins/archive/skins/default/archive_pas.png patch | view | raw | blame | history
plugins/archive/skins/default/foldericon.png patch | view | raw | blame | history
plugins/markasjunk/markasjunk.php 7 ●●●● patch | view | raw | blame | history
plugins/markasjunk/skins/default/junk_act.png patch | view | raw | blame | history
plugins/markasjunk/skins/default/junk_pas.png patch | view | raw | blame | history
CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
- Support skins in 'archive' and 'markasjunk' plugins
- Added 'html_editor' hook (#1486068)
- Fix DB constraint violation when populating messages cache (#1486052)
- Password: added password strength options (#1486062)
plugins/archive/archive.js
@@ -29,8 +29,8 @@
    
    // set css style for archive folder
    var li;
    if (rcmail.env.archive_folder && (li = rcmail.get_folder_li(rcmail.env.archive_folder)))
      $(li).css('background-image', 'url(plugins/archive/foldericon.png)');
    if (rcmail.env.archive_folder && rcmail.env.archive_folder_icon && (li = rcmail.get_folder_li(rcmail.env.archive_folder)))
      $(li).css('background-image', 'url(' + rcmail.env.archive_folder_icon + ')');
  })
}
plugins/archive/archive.php
@@ -17,18 +17,22 @@
  {
    $this->register_action('plugin.archive', array($this, 'request_action'));
    # There is no "Archived flags"
    # $GLOBALS['IMAP_FLAGS']['ARCHIVED'] = 'Archive';
    // There is no "Archived flags"
    // $GLOBALS['IMAP_FLAGS']['ARCHIVED'] = 'Archive';
    
    $rcmail = rcmail::get_instance();
    if ($rcmail->task == 'mail' && ($rcmail->action == '' || $rcmail->action == 'show') && ($archive_folder = $rcmail->config->get('archive_mbox'))) {
    if ($rcmail->task == 'mail' && ($rcmail->action == '' || $rcmail->action == 'show')
      && ($archive_folder = $rcmail->config->get('archive_mbox'))) {
      $skin_path = 'skins/'.$rcmail->output->config['skin'];
      $this->include_script('archive.js');
      $this->add_texts('localization', true);
      $this->add_button(
        array(
            'command' => 'plugin.archive',
            'imagepas' => 'archive_pas.png',
            'imageact' => 'archive_act.png',
            'imagepas' => $skin_path.'/archive_pas.png',
            'imageact' => $skin_path.'/archive_act.png',
            'title' => 'buttontitle',
            'domain' => $this->ID,
        ),
@@ -39,13 +43,13 @@
      // set env variable for client
      $rcmail->output->set_env('archive_folder', $archive_folder);
      $rcmail->output->set_env('archive_folder_icon', $this->url($skin_path.'/foldericon.png'));
      // add archive folder to the list of default mailboxes
      if (($default_folders = $rcmail->config->get('default_imap_folders')) && !in_array($archive_folder, $default_folders)) {
        $default_folders[] = $archive_folder;
        $rcmail->config->set('default_imap_folders', $default_folders);
      }
      }
    }
    else if ($rcmail->task == 'settings') {
      $dont_override = $rcmail->config->get('dont_override', array());
plugins/archive/skins/default/archive_act.png

plugins/archive/skins/default/archive_pas.png

plugins/archive/skins/default/foldericon.png

plugins/markasjunk/markasjunk.php
@@ -20,10 +20,13 @@
    
    $rcmail = rcmail::get_instance();
    if ($rcmail->action == '' || $rcmail->action == 'show') {
      $skin_path = 'skins/'.$rcmail->output->config['skin'];
      $this->include_script('markasjunk.js');
      $this->add_texts('localization', true);
      $this->add_button(array('command' => 'plugin.markasjunk', 'imagepas' => 'junk_pas.png',
        'imageact' => 'junk_act.png', 'title' => 'markasjunk.buttontitle'), 'toolbar');
      $this->add_button(array('command' => 'plugin.markasjunk',
        'imagepas' => $skin_path.'/junk_pas.png',
        'imageact' => $skin_path.'/junk_act.png',
    'title' => 'markasjunk.buttontitle'), 'toolbar');
    }
  }
plugins/markasjunk/skins/default/junk_act.png

plugins/markasjunk/skins/default/junk_pas.png