Changeset bd84360 in osmose-frontend


Ignore:
Timestamp:
Mar 8, 2014 10:32:31 PM (6 years ago)
Author:
Frédéric Rodrigo <fred.rodrigo@…>
Children:
9accaad
Parents:
37c10cd
git-author:
Frédéric Rodrigo <fred.rodrigo@…> (07/03/2014 12:20:47)
git-committer:
Frédéric Rodrigo <fred.rodrigo@…> (08/03/2014 22:32:31)
Message:

Osmose Editor

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • static/map/Osmose.Editor.css

    rf683942 rbd84360  
    6969} 
    7070 
    71 #editor_save_form br + label, #editor_save_form form + label { 
     71#editor_save_form br + label, #editor_save_form label:first-child { 
    7272  display: inline-block; 
    7373  text-align: right; 
  • static/map/Osmose.Editor.js

    r37c10cd rbd84360  
    4040      $("#validate", self._$container).click(function () { 
    4141        self._validate(this); 
     42      }); 
     43      $("#corrected", self._$container).click(function () { 
     44        self._validate(this); 
     45        $("#popup-" + error + " .corrected").click(); 
    4246      }); 
    4347      $("#cancel", self._$container).click(function () { 
     
    9195              delete: self._deleteObjectStack 
    9296            }), 
     97            beforeSend: function() { 
     98              t.dialog_content = dialog.html(); 
     99              dialog.html("<center><img src='../images/throbbler.gif' alt='downloading'></center>"); 
     100              dialog.parent().find('.ui-dialog-buttonpane').hide(); 
     101            }, 
    93102          }).done(function () { 
    94103            self._modifiyObjectStack = {}; 
     
    97106            $(t).dialog('close'); 
    98107          }).fail(function (xhr, err) { 
     108            dialog.html(t.dialog_content); 
     109            dialog.parent().find('.ui-dialog-buttonpane').show(); 
    99110            alert("readyState: " + xhr.readyState + "\nstatus: " + xhr.status); 
    100111          }); 
  • views/map/editor.tpl

    r256edce rbd84360  
    1818  <div id="buttons"> 
    1919    <input type="button" id="cancel" value="{{_("Cancel")}}"/> 
    20     <input type="button" id="validate" value="{{_("Ok")}}"/> 
     20    <input type="button" id="corrected" value="{{_("Valid & Corrected")}}"/> 
     21    <input type="button" id="validate" value="{{_("Valid")}}"/> 
    2122  </div> 
    2223</form> 
  • views/map/popup.tpl

    r37c10cd rbd84360  
    1010      <br> 
    1111      <%subtitle%> 
    12       <br> 
    1312    </div> 
    1413<%#elems%> 
     
    8483  <div class="bulle_maj"> 
    8584    <b>{{_("change status")}} :</b> 
    86     <a class="closePopup" href="../api/0.2/error/<%error_id%>/done" target="hiddenIframe">{{_("corrected")}}</a> 
    87     <a class="closePopup" href="../api/0.2/error/<%error_id%>/false" target="hiddenIframe">{{_("false positive")}}</a> 
     85    <a class="closePopup corrected" href="../api/0.2/error/<%error_id%>/done" target="hiddenIframe">{{_("corrected")}}</a> 
     86    <a class="closePopup false_positive" href="../api/0.2/error/<%error_id%>/false" target="hiddenIframe">{{_("false positive")}}</a> 
    8887</div> 
    8988 
Note: See TracChangeset for help on using the changeset viewer.