Revert "Backported the canned responses feature to this release branch"

Thomas

2013-10-17 f0b2ed87fc67f8bbba522a60395099cb0d622c6a

Revert "Backported the canned responses feature to this release branch"

This reverts commit 92a3c4020d891ebf66b19ee337b05eafec3ff56b.

 program/include/rcmail.php

@@ -341,31 +341,6 @@
    return $list;
  }

  /**
   * Getter for compose responses.
   * These are stored in local config and user preferences.
   *
   * @param boolean True to sort the list alphabetically
   * @return array List of the current user's stored responses
   */
  public function get_compose_responses($sorted = false)
  {
    $responses = array();
    foreach ($this->config->get('compose_responses', array()) as $response) {
      if (empty($response['key']))
        $response['key'] = substr(md5($response['name']), 0, 16);
      $k = $sorted ? strtolower($response['name']) : $response['key'];
      $responses[$k] = $response;
    }

    // sort list by name
    if ($sorted) {
      ksort($responses, SORT_LOCALE_STRING);
    }

    return array_values($responses);
  }


  /**
   * Init output object for GUI and add common scripts.

 program/include/rcmail_output_html.php

@@ -1176,7 +1176,7 @@

        // generate html code for button
        if ($btn_content) {
            $attrib_str = html::attrib_string($attrib, array_merge(html::$common_attrib, $link_attrib));
            $attrib_str = html::attrib_string($attrib, $link_attrib);
            $out = sprintf('<a%s>%s</a>', $attrib_str, $btn_content);
        }


 program/js/app.js

@@ -252,14 +252,12 @@
        }
        else if (this.env.action == 'compose') {
          this.env.address_group_stack = [];
          this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel',
            'toggle-editor', 'list-adresses', 'pushgroup', 'search', 'reset-search', 'extwin',
            'insert-response', 'save-response'];
          this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel', 'toggle-editor', 'list-adresses', 'pushgroup', 'search', 'reset-search', 'extwin'];

          if (this.env.drafts_mailbox)
            this.env.compose_commands.push('savedraft')

          this.enable_command(this.env.compose_commands, 'identities', 'responses', true);
          this.enable_command(this.env.compose_commands, 'identities', true);

          // add more commands (not enabled)
          $.merge(this.env.compose_commands, ['add-recipient', 'firstpage', 'previouspage', 'nextpage', 'lastpage']);
@@ -268,23 +266,6 @@
            this.env.spellcheck.spelling_state_observer = function(s) { ref.spellcheck_state(); };
            this.env.compose_commands.push('spellcheck')
            this.enable_command('spellcheck', true);
          }

          // init canned response functions
          if (this.gui_objects.responseslist) {
            $('a.insertresponse', this.gui_objects.responseslist)
              .attr('unselectable', 'on')
              .mousedown(function(e){ return rcube_event.cancel(e); })
              .mouseup(function(e){
                ref.command('insert-response', $(this).attr('rel'));
                $(document.body).trigger('mouseup');  // hides the menu
                return rcube_event.cancel(e);
              });

              // avoid textarea loosing focus when hitting the save-response button/link
              for (var i=0; this.buttons['save-response'] && i < this.buttons['save-response'].length; i++) {
                $('#'+this.buttons['save-response'][i].id).mousedown(function(e){ return rcube_event.cancel(e); })
              }
          }

          document.onmouseup = function(e){ return p.doc_mouse_up(e); };
@@ -393,7 +374,7 @@
        break;

      case 'settings':
        this.enable_command('preferences', 'identities', 'responses', 'save', 'folders', true);
        this.enable_command('preferences', 'identities', 'save', 'folders', true);

        if (this.env.action == 'identities') {
          this.enable_command('add', this.env.identities_level < 2);
@@ -414,9 +395,6 @@
          parent.rcmail.enable_command('purge', this.env.messagecount);
          $("input[type='text']").first().select();
        }
        else if (this.env.action == 'responses') {
          this.enable_command('add', true);
        }

        if (this.gui_objects.identitieslist) {
          this.identity_list = new rcube_list_widget(this.gui_objects.identitieslist, {multiselect:false, draggable:false, keyboard:false});
@@ -433,22 +411,8 @@
          this.sections_list.init();
          this.sections_list.focus();
        }
        else if (this.gui_objects.subscriptionlist) {
        else if (this.gui_objects.subscriptionlist)
          this.init_subscription_list();
        }
        else if (this.gui_objects.responseslist) {
          this.responses_list = new rcube_list_widget(this.gui_objects.responseslist, {multiselect:false, draggable:false, keyboard:false});
          this.responses_list.addEventListener('select', function(list){
            var win, id = list.get_single_selection();
            p.enable_command('delete', !!id);
            if (id && (win = p.get_frame_window(p.env.contentframe))) {
              p.set_busy(true);
              p.location_href({ _action:'edit-response', _key:id, _framed:1 }, win);
            }
          });
          this.responses_list.init();
          this.responses_list.focus();
        }

        break;

@@ -735,13 +699,6 @@
      case 'add':
        if (this.task == 'addressbook')
          this.load_contact(0, 'add');
        else if (this.task == 'settings' && this.env.action == 'responses') {
          var frame;
          if ((frame = this.get_frame_window(this.env.contentframe))) {
            this.set_busy(true);
            this.location_href({ _action:'add-response', _framed:1 }, frame);
          }
        }
        else if (this.task == 'settings') {
          this.identity_list.clear_selection();
          this.load_identity(0, 'add-identity');
@@ -805,10 +762,7 @@
        // addressbook task
        else if (this.task == 'addressbook')
          this.delete_contacts();
        // settings: canned response
        else if (this.task == 'settings' && this.env.action == 'responses')
          this.delete_response();
        // settings: user identities
        // user settings task
        else if (this.task == 'settings')
          this.delete_identity();
        break;
@@ -1180,7 +1134,6 @@
      // user settings commands
      case 'preferences':
      case 'identities':
      case 'responses':
      case 'folders':
        this.goto_url('settings/' + command);
        break;
@@ -3279,154 +3232,6 @@
    return true;
  };

  this.insert_response = function(key)
  {
    var insert = this.env.textresponses[key] ? this.env.textresponses[key].text : null;
    if (!insert)
      return false;

    // insert into tinyMCE editor
    if ($("input[name='_is_html']").val() == '1') {
      var editor = tinyMCE.get(this.env.composebody);
      editor.getWin().focus(); // correct focus in IE & Chrome
      editor.selection.setContent(insert, { format:'text' });
    }
    // replace selection in compose textarea
    else {
      var textarea = rcube_find_object(this.env.composebody),
        selection = $(textarea).is(':focus') ? this.get_input_selection(textarea) : { start:0, end:0 },
        inp_value = textarea.value;
        pre = inp_value.substring(0, selection.start),
        end = inp_value.substring(selection.end, inp_value.length);

      // insert response text
      textarea.value = pre + insert + end;

      // set caret after inserted text
      this.set_caret_pos(textarea, selection.start + insert.length);
      textarea.focus();
    }
  };

  /**
   * Open the dialog to save a new canned response
   */
  this.save_response = function()
  {
    var sigstart, text = '', strip = false;

    // get selected text from tinyMCE editor
    if ($("input[name='_is_html']").val() == '1') {
      var editor = tinyMCE.get(this.env.composebody);
      editor.getWin().focus(); // correct focus in IE & Chrome
      text = editor.selection.getContent({ format:'text' });

      if (!text) {
        text = editor.getContent({ format:'text' });
        strip = true;
      }
    }
    // get selected text from compose textarea
    else {
      var textarea = rcube_find_object(this.env.composebody), sigstart;
      if (textarea && $(textarea).is(':focus')) {
        text = this.get_input_selection(textarea).text;
      }

      if (!text && textarea) {
        text = textarea.value;
        strip = true;
      }
    }

    // strip off signature
    if (strip) {
      sigstart = text.indexOf('-- \n');
      if (sigstart > 0) {
        text = text.substring(0, sigstart);
      }
    }

    // show dialog to enter a name and to modify the text to be saved
    var buttons = {},
      html = '<form class="propform">' +
      '<div class="prop block"><label>' + this.get_label('responsename') + '</label>' +
      '<input type="text" name="name" id="ffresponsename" size="40" /></div>' +
      '<div class="prop block"><label>' + this.get_label('responsetext') + '</label>' +
      '<textarea name="text" id="ffresponsetext" cols="40" rows="8"></textarea></div>' +
      '</form>';

    buttons[this.gettext('save')] = function(e) {
      var name = $('#ffresponsename').val(),
        text = $('#ffresponsetext').val();

      if (!text) {
        $('#ffresponsetext').select();
        return false;
      }
      if (!name)
        name = text.substring(0,40);

      var lock = ref.display_message(ref.get_label('savingresponse'), 'loading');
      ref.http_post('settings/responses', { _insert:1, _name:name, _text:text }, lock);
      $(this).dialog('close');
    };

    buttons[this.gettext('cancel')] = function() {
      $(this).dialog('close');
    };

    this.show_popup_dialog(html, this.gettext('savenewresponse'), buttons);

    $('#ffresponsetext').val(text);
    $('#ffresponsename').select();
  };

  this.add_response_item = function(response)
  {
    var key = response.key;
    this.env.textresponses[key] = response;

    // append to responses list
    if (this.gui_objects.responseslist) {
      var li = $('<li>').appendTo(this.gui_objects.responseslist);
      $('<a>').addClass('insertresponse active')
        .attr('href', '#')
        .attr('rel', key)
        .html(this.quote_html(response.name))
        .appendTo(li)
        .mousedown(function(e){
          return rcube_event.cancel(e);
        })
        .mouseup(function(e){
          ref.command('insert-response', key);
          $(document.body).trigger('mouseup');  // hides the menu
          return rcube_event.cancel(e);
        });
    }
  };

  this.edit_responses = function()
  {
    // TODO: implement inline editing of responses
  };

  this.delete_response = function(key)
  {
    if (!key && this.responses_list) {
      var selection = this.responses_list.get_selection();
      key = selection[0];
    }

    // submit delete request
    if (key && confirm(this.get_label('deleteresponseconfirm'))) {
      this.http_post('settings/delete-response', { _key: key }, false);
      return true;
    }

    return false;
  };

  this.stop_spellchecking = function()
  {
    var ed;
@@ -5327,42 +5132,6 @@
    }
  };

  this.update_response_row = function(response, oldkey)
  {
    var row, col, list = this.responses_list;

    if (list && oldkey && list.rows[oldkey] && (row = list.rows[oldkey].obj)) {
      $(row.cells[0]).html(response.name);
      // update references because the key likely changed
      row.id = 'rcmrow'+response.key;
      list.init_row(row);
      list.select(response.key);
      delete list.rows[oldkey];
    }
    else if (list) {
      row = $('<tr>').attr('id', 'rcmrow'+response.key).get(0);
      col = $('<td>').addClass('name').html(response.name).appendTo(row);
      list.insert_row(row);
      list.select(response.key);
    }
  };

  this.remove_response = function(key)
  {
    var frame;

    if (this.env.textresponses) {
      delete this.env.textresponses[key];
    }

    if (this.responses_list) {
      this.responses_list.remove_row(key);
      if (this.env.contentframe && (frame = this.get_frame_window(this.env.contentframe))) {
        frame.location.href = this.env.blankpage;
      }
    }
  };


  /*********************************************************/
  /*********        folder manager methods         *********/
@@ -6041,7 +5810,7 @@
  };

  // open a jquery UI dialog with the given content
  this.show_popup_dialog = function(html, title, buttons)
  this.show_popup_dialog = function(html, title)
  {
    // forward call to parent window
    if (this.is_framed()) {
@@ -6053,7 +5822,6 @@
      .html(html)
      .dialog({
        title: title,
        buttons: buttons,
        modal: true,
        resizable: true,
        width: 580,
@@ -6063,7 +5831,7 @@
      // resize and center popup
      var win = $(window), w = win.width(), h = win.height(),
        width = popup.width(), height = popup.height();
      popup.dialog('option', { height: Math.min(h-40, height+75 + (buttons ? 50 : 0)), width: Math.min(w-20, width+50) })
      popup.dialog('option', { height: Math.min(h-40, height+50), width: Math.min(w-20, width+50) })
        .dialog('option', 'position', ['center', 'center']);  // only works in a separate call (!?)
  };

@@ -6904,14 +6672,6 @@
  /*********            helper methods            *********/
  /********************************************************/

  /**
   * Quote html entities
   */
  this.quote_html = function(str)
  {
    return String(str).replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
  };

  // get window.opener.rcmail if available
  this.opener = function()
  {
@@ -6974,57 +6734,6 @@
      range.moveStart('character', pos);
      range.select();
    }
  };

  // get selected text from an input field
  // http://stackoverflow.com/questions/7186586/how-to-get-the-selected-text-in-textarea-using-jquery-in-internet-explorer-7
  this.get_input_selection = function(obj)
  {
    var start = 0, end = 0,
      normalizedValue, range,
      textInputRange, len, endRange;

    if (typeof obj.selectionStart == "number" && typeof obj.selectionEnd == "number") {
      normalizedValue = obj.value;
      start = obj.selectionStart;
      end = obj.selectionEnd;
    }
    else {
      range = document.selection.createRange();

      if (range && range.parentElement() == obj) {
        len = obj.value.length;
        normalizedValue = obj.value; //.replace(/\r\n/g, "\n");

        // create a working TextRange that lives only in the input
        textInputRange = obj.createTextRange();
        textInputRange.moveToBookmark(range.getBookmark());

        // Check if the start and end of the selection are at the very end
        // of the input, since moveStart/moveEnd doesn't return what we want
        // in those cases
        endRange = obj.createTextRange();
        endRange.collapse(false);

        if (textInputRange.compareEndPoints("StartToEnd", endRange) > -1) {
          start = end = len;
        }
        else {
          start = -textInputRange.moveStart("character", -len);
          start += normalizedValue.slice(0, start).split("\n").length - 1;

          if (textInputRange.compareEndPoints("EndToEnd", endRange) > -1) {
            end = len;
          }
          else {
            end = -textInputRange.moveEnd("character", -len);
            end += normalizedValue.slice(0, end).split("\n").length - 1;
          }
        }
      }
    }

    return { start:start, end:end, text:normalizedValue.substr(start, end-start) };
  };

  // disable/enable all fields of a form

 program/lib/Roundcube/html.php

@@ -3,7 +3,7 @@
/*
 +-----------------------------------------------------------------------+
 | This file is part of the Roundcube Webmail client                     |
 | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
 | Copyright (C) 2005-2011, The Roundcube Dev Team                       |
 |                                                                       |
 | Licensed under the GNU General Public License version 3 or            |
 | any later version with exceptions for skins & plugins.                |
@@ -32,8 +32,8 @@

    public static $doctype = 'xhtml';
    public static $lc_tags = true;
    public static $common_attrib = array('id','class','style','title','align','unselectable');
    public static $containers = array('iframe','div','span','p','h1','h2','h3','ul','form','textarea','table','thead','tbody','tr','th','td','style','script');
    public static $common_attrib = array('id','class','style','title','align');
    public static $containers = array('iframe','div','span','p','h1','h2','h3','form','textarea','table','thead','tbody','tr','th','td','style','script');


    /**

 program/lib/Roundcube/rcube_user.php

@@ -163,16 +163,8 @@
        if (!$this->ID)
            return false;

        $plugin = $this->rc->plugins->exec_hook('preferences_update', array(
            'userid' => $this->ID, 'prefs' => $a_user_prefs, 'old' => (array)$this->get_prefs()));

        if (!empty($plugin['abort'])) {
            return;
        }

        $a_user_prefs = $plugin['prefs'];
        $old_prefs    = $plugin['old'];
        $config       = $this->rc->config;
        $config    = $this->rc->config;
        $old_prefs = (array)$this->get_prefs();

        // merge (partial) prefs array with existing settings
        $save_prefs = $a_user_prefs + $old_prefs;

 program/localization/en_US/labels.inc

@@ -224,15 +224,6 @@
$labels['resumeediting'] = 'Resume editing';
$labels['revertto']      = 'Revert to';

$labels['responses'] = 'Responses';
$labels['insertresponse'] = 'Insert a response';
$labels['manageresponses'] = 'Manage responses';
$labels['savenewresponse'] = 'Save new response';
$labels['editresponses'] = 'Edit responses';
$labels['editresponse'] = 'Edit response';
$labels['responsename'] = 'Name';
$labels['responsetext'] = 'Response Text';

$labels['attach'] = 'Attach';
$labels['attachments'] = 'Attachments';
$labels['upload'] = 'Upload';

 program/localization/en_US/messages.inc

@@ -44,8 +44,6 @@
$messages['savingmessage'] = 'Saving message...';
$messages['messagesaved'] = 'Message saved to Drafts.';
$messages['successfullysaved'] = 'Successfully saved.';
$messages['savingresponse'] = 'Saving response text...';
$messages['deleteresponseconfirm'] = 'Do you really want to delete this response text?';
$messages['addedsuccessfully'] = 'Contact added successfully to address book.';
$messages['contactexists'] = 'A contact with the same e-mail address already exists.';
$messages['contactnameexists'] = 'A contact with the same name already exists.';

 program/steps/mail/compose.inc

@@ -127,8 +127,7 @@
$OUTPUT->add_label('nosubject', 'nosenderwarning', 'norecipientwarning', 'nosubjectwarning', 'cancel',
    'nobodywarning', 'notsentwarning', 'notuploadedwarning', 'savingmessage', 'sendingmessage', 
    'messagesaved', 'converting', 'editorwarning', 'searching', 'uploading', 'uploadingmany',
    'fileuploaderror', 'sendmessage', 'savenewresponse', 'responsename', 'responsetext', 'save',
    'savingresponse');
    'fileuploaderror', 'sendmessage');

$OUTPUT->set_env('compose_id', $COMPOSE['id']);
$OUTPUT->set_pagetitle(rcube_label('compose'));
@@ -1668,38 +1667,6 @@
}


/**
 *
 */
function rcmail_compose_responses_list($attrib)
{
    global $RCMAIL, $OUTPUT;

    $attrib += array('id' => 'rcmresponseslist', 'tagname' => 'ul', 'cols' => 1);

    $jsenv = array();
    $list = array();
    foreach ($RCMAIL->get_compose_responses(true) as $response) {
        $key = $response['key'];
        $item = html::a(array(
            'href '=> '#'.urlencode($response['name']),
            'class' => rtrim('insertresponse ' . $attrib['itemclass']),
            'unselectable' => 'on',
            'rel' => $key,
        ), Q($response['name']));

        $jsenv[$key] = $response;
        $list[] = html::tag('li', null, html::span(null, $item));
    }

    // set client env
    $OUTPUT->set_env('textresponses', $jsenv);
    $OUTPUT->add_gui_object('responseslist', $attrib['id']);

    return html::tag('ul', $attrib, join("\n", $list));
}


// register UI objects
$OUTPUT->add_handlers(array(
  'composeheaders' => 'rcmail_compose_headers',
@@ -1716,7 +1683,6 @@
  'storetarget' => 'rcmail_store_target_selection',
  'addressbooks' => 'rcmail_addressbook_list',
  'addresslist' => 'rcmail_contacts_list',
  'responseslist' => 'rcmail_compose_responses_list',
));

$OUTPUT->send('compose');

 program/steps/settings/edit_response.inc

File was deleted

 program/steps/settings/func.inc

@@ -992,7 +992,4 @@
    'purge'         => 'folders.inc',
    'folder-size'   => 'folders.inc',
    'add-identity'  => 'edit_identity.inc',
    'add-response'  => 'edit_response.inc',
    'save-response' => 'edit_response.inc',
    'delete-response' => 'responses.inc',
));

 program/steps/settings/responses.inc

File was deleted

 skins/classic/common.css

@@ -502,8 +502,7 @@
  margin: 3px -4px;
}

.popupmenu li a,
.popupmenu li label
.popupmenu li a
{
  display: block;
  color: #a0a0a0;
@@ -511,14 +510,6 @@
  text-decoration: none;
  min-height: 14px;
  background: transparent;
}

.popupmenu li label.comment
{
  color: #999;
  font-style: italic;
  padding-top: 4px;
  padding-bottom: 3px;
}

.popupmenu li a.active,
@@ -703,24 +694,6 @@
  border: none;
  outline: none;
}

.propform div.prop
{
  margin-bottom: 0.5em;
}

.propform div.prop.block label
{
  display: block;
  margin-bottom: 2px;
}

.propform div.prop.block input,
.propform div.prop.block textarea
{
  width: 97%;
}


/***** roundcube webmail pre-defined classes *****/


 skins/classic/images/mail_toolbar.png

 skins/classic/includes/settingstabs.html

@@ -2,7 +2,6 @@
<span id="settingstabdefault" class="tablink"><roundcube:button command="preferences" type="link" label="preferences" title="editpreferences" /></span>
<span id="settingstabfolders" class="tablink"><roundcube:button command="folders" type="link" label="folders" title="managefolders" class="tablink" /></span>
<span id="settingstabidentities" class="tablink"><roundcube:button command="identities" type="link" label="identities" title="manageidentities" class="tablink" /></span>
<span id="settingstabresponses" class="tablink"><roundcube:button command="responses" type="link" label="responses" title="editresponses" class="tablink" /></span>
<span id="settingstababout" class="tablink"><roundcube:button command="about" type="link" label="about" title="about" class="tablink" /></span>
<roundcube:container name="tabs" id="tabsbar" />
<script type="text/javascript"> if (window.rcmail) rcmail.add_onload(rcube_init_settings_tabs); </script>

 skins/classic/mail.css

@@ -155,10 +155,6 @@
  background-position: -416px -32px;
}

#messagetoolbar a.responses {
  background-position: -512px 0;
}

#messagetoolbar select.mboxlist
{
  position: relative;

 skins/classic/settings.css

@@ -81,19 +81,10 @@
}

#identity-details table td.title,
#response-details table td.title,
#folder-details table td.title
{
  font-weight: bold;
  text-align: right;
}

#response-details table td.title
{
  text-align: left;
  vertical-align: top;
  width: 140px;
  padding-top: 5px;
}

#bottomboxes
@@ -154,12 +145,6 @@
  white-space: nowrap;
  text-align: right;
  float: right;
}

#formfooter .footerindent
{
  padding: 10px 0;
  margin-left: 155px;
}

#quota

 skins/classic/templates/compose.html

@@ -40,7 +40,6 @@
        <span id="spellmenulink" onclick="rcmail_ui.show_popup('spellmenu');return false"></span>
    </span>
<roundcube:endif />
    <a href="#responses" class="button responses" label="responses" title="<roundcube:label name='insertresponse' />" id="responsesmenulink" unselectable="on" onmousedown="return false" onclick="rcmail_ui.show_popup('responsesmenu');return false">&nbsp;</a>
    <roundcube:container name="toolbar" id="compose-toolbar" />
    <roundcube:button name="messageoptions" id="composemenulink" type="link" class="button messagemenu" title="messageoptions" onclick="rcmail_ui.show_popup('composemenu', true);return false" content=" " />
</div>
@@ -190,16 +189,6 @@
        <td><roundcube:object name="storetarget" maxlength="30" /></td>
    </tr><roundcube:endif />
    </table>
</div>

<div id="responsesmenu" class="popupmenu">
    <ul id="textresponsesmenu">
        <li><label class="comment"><roundcube:label name="insertresponse" /></label></li>
        <roundcube:object name="responseslist" id="responseslist" tagname="ul" itemclass="active" />
        <li><label class="comment"><roundcube:label name="manageresponses" /></label></li>
        <li><roundcube:button command="save-response" type="link" label="savenewresponse" classAct="active" unselectable="on" /></li>
        <li><roundcube:button command="responses" type="link" label="editresponses" classAct="active" /></li>
    </ul>
</div>

<div id="spellmenu" class="popupmenu selectable"></div>

 skins/classic/templates/responseedit.html

File was deleted

 skins/classic/templates/responses.html

File was deleted

 skins/larry/images/buttons.png

 skins/larry/images/listicons.png

 skins/larry/includes/settingstabs.html

@@ -4,7 +4,6 @@
    <span id="settingstabpreferences" class="listitem preferences"><roundcube:button command="preferences" type="link" label="preferences" title="editpreferences" /></span>
    <span id="settingstabfolders" class="listitem folders"><roundcube:button command="folders" type="link" label="folders" title="managefolders" /></span>
    <span id="settingstabidentities" class="listitem identities"><roundcube:button command="identities" type="link" label="identities" title="manageidentities" /></span>
    <span id="settingstabresponses" class="listitem responses"><roundcube:button command="responses" type="link" label="responses" title="editresponses" /></span>
    <roundcube:container name="tabs" id="settings-tabs" />
</div>
</div>

 skins/larry/mail.css

@@ -559,10 +559,6 @@
    background-position: -24px -1116px;
}

.messagelist thead tr td.priority span.priority {
    background-position: -24px -1845px;
}

#messagelist tr td.priority span.prio5 {
    background-position: 0 -1905px;
}

 skins/larry/settings.css

@@ -110,14 +110,6 @@
    background-position: 6px -1819px;
}

#settings-sections span.responses a {
    background-position: 6px -1972px;
}

#settings-sections span.responses.selected a {
    background-position: 6px -1996px;
}

#sections-table #rcmrowgeneral td.section {
    background-position: 6px -573px;
}

 skins/larry/styles.css

@@ -1388,20 +1388,6 @@
    font-size: 12px;
}

.propform div.prop {
    margin-bottom: 0.5em;
}

.propform div.prop.block label {
    display: block;
    margin-bottom: 0.3em;
}

.propform div.prop.block input,
.propform div.prop.block textarea {
    width: 95%;
}

fieldset.floating {
    float: left;
    margin-right: 10px;
@@ -1776,9 +1762,6 @@
    background-position: 0 -1745px;
}

.toolbar a.button.responses {
    background-position: center -1932px;
}

a.menuselector {
    display: inline-block;
@@ -1880,7 +1863,6 @@
}

ul.toolbarmenu,
ul.toolbarmenu ul,
#rcmKSearchpane ul {
    margin: 0;
    padding: 0;
@@ -1899,13 +1881,13 @@
}

.googie_list tr:first-child td,
ul.toolbarmenu > li:first-child,
ul.toolbarmenu li:first-child,
select.decorated option:first-child {
    border-top: 0;
}

.googie_list tr:last-child td,
ul.toolbarmenu > li:last-child,
ul.toolbarmenu li:last-child,
select.decorated option:last-child {
    border-bottom: 0;
}
@@ -1957,11 +1939,6 @@
    color: #fff;
    padding: 4px 8px;
    text-shadow: 0px 1px 1px #333;
}

ul.toolbarmenu li.separator label {
    color: #bbb;
    font-style: italic;
}

ul.toolbarmenu li a.icon {
@@ -2040,15 +2017,6 @@

ul.toolbarmenu li span.conversation {
    background-position: 0 -1532px;
}

#snippetslist {
    max-width: 200px;
}

#snippetslist li a {
    overflow: hidden;
    text-overflow: ellipsis;
}

#rcmKSearchpane {

 skins/larry/templates/compose.html

@@ -30,7 +30,6 @@
    <roundcube:endif />
    <roundcube:button name="addattachment" type="link" class="button attach" classAct="button attach" classSel="button attach pressed" label="attach" title="addattachment" onclick="UI.show_uploadform();return false" />
    <roundcube:button command="insert-sig" type="link" class="button insertsig disabled" classAct="button insertsig" classSel="button insertsig pressed" label="signature" title="insertsignature" />
    <a href="#responses" class="button responses" label="responses" title="<roundcube:label name='insertresponse' />" id="responsesmenulink" unselectable="on" onmousedown="return false" onclick="UI.show_popup('responsesmenu');return false"><roundcube:label name="responses" /></a>
    <roundcube:container name="toolbar" id="compose-toolbar" />
</div>
</div>
@@ -194,16 +193,6 @@
</div>

<div id="spellmenu" class="popupmenu"></div>

<div id="responsesmenu" class="popupmenu">
    <ul class="toolbarmenu" id="textresponsesmenu">
        <li class="separator" id=""><label><roundcube:label name="insertresponse" /></label></li>
        <roundcube:object name="responseslist" id="responseslist" tagname="ul" itemclass="active" />
        <li class="separator"><label><roundcube:label name="manageresponses" /></label></li>
        <li><roundcube:button command="save-response" type="link" label="savenewresponse" classAct="active" unselectable="on" /></li>
        <li><roundcube:button command="responses" type="link" label="editresponses" classAct="active" /></li>
    </ul>
</div>

<roundcube:include file="/includes/footer.html" />


 skins/larry/templates/responseedit.html

File was deleted

 skins/larry/templates/responses.html

File was deleted