Github user benkeen commented on a diff in the pull request:

    https://github.com/apache/couchdb-fauxton/pull/204#discussion_r22266472
  
    --- Diff: app/addons/documents/templates/code_editor.html ---
    @@ -12,44 +12,64 @@
     the License.
     */%>
     
    -<div id="doc">
    -  <div class="errors-container"></div>
    -   
    -<div id="doc-actions" class="nav">
    -  <div class="span3">
    +<div id="doc-editor-actions-panel">
    +  <div class="doc-actions-left">
         <button class="save-doc btn btn-success save" type="button"><i 
class="icon fonticon-ok-circled"></i> Save</button>
    -    <button class="btn js-back">Back</button>
    +    <div>
    +      <a href="#" class="js-back cancel-button">Cancel</a>
    +    </div>
       </div>
     
    -  <div class="span7">
    -    <button class="btn string-edit" title="Edit line" disabled="true"><i 
class="icon icon-edit"></i></button>  
    +  <div class="alignRight">
    +    <button class="btn string-edit" title="Edit line" disabled="true"><i 
class="icon icon-edit"></i></button>
    +
         <% if (attachments) { %>
    -    <div class="btn-group">
    -      <button class="dropdown-toggle btn" data-bypass="true" 
data-toggle="dropdown">
    -        View Attachments
    +    <div class="panelSection btn-group">
    +      <button class="panelButton dropdown-toggle btn" data-bypass="true" 
data-toggle="dropdown" title="View Attachments"
    +        id="view-attachments-menu">
    +        <i class="icon fonticon-picture"></i>
    +        <span>View Attachments</span>
             <span class="caret"></span>
           </button>
    -      <ul class="dropdown-menu">
    +
    +      <ul class="dropdown-menu" role="menu" 
aria-labelledby="view-attachments-menu">
             <%_.each(attachments, function (att) { %>
             <li>
    -        <a href="<%- att.url %>" target="_blank" data-bypass="true"> 
<strong> <%- att.fileName %> </strong> -
    -          <span> <%- att.contentType %>, <%- formatSize(att.size)%> </span>
    -        </a>
    +          <a href="<%- att.url %>" target="_blank" data-bypass="true"> 
<strong> <%- att.fileName %> </strong> -
    +            <span> <%- att.contentType %>, <%- formatSize(att.size)%> 
</span>
    +          </a>
             </li>
             <% }) %>
           </ul>
         </div>
    -    <% } %> 
    -    <button class="btn upload"><i class="icon icon-circle-arrow-up"></i> 
Upload Attachment</button>
    -    <button class="btn duplicate"><i class="icon icon-repeat"></i> Clone 
document</button>
    -    <button class="btn btn-danger delete"><i class="icon 
icon-trash"></i></button>
    -  </div>
    +    <% } %>
     
    -<div id="upload-modal"> </div>
    -<div id="duplicate-modal"> </div> 
    -<div id="string-edit-modal"> </div> 
    --- End diff --
    
    Yes, but I'll add it back in. The reason was that this was phase 1 - phase 
2 was to be adding in a full table-editing-like feature where you can click on 
a row to edit the JSON data piece by piece; I thought I'd keep the two totally 
separate, but perhaps that was a bit overzealous.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

Reply via email to