Changeset 11222

Show
Ignore:
Timestamp:
08/17/08 18:02:31 (5 months ago)
Author:
/C=ES/O=Warp Networks S.L./CN=juruen@…
Message:

Merging r11220 through r11221 from trunk into intrepid branches

Location:
branches/juruen
Files:
8 modified
2 copied

Legend:

Unmodified
Added
Removed

  • branches/juruen/intrepid-alpha4/common/libebox/ChangeLog

    r11219 r11222  
    1111        + Bugfix. Create redirection URLs using client headers and guessing checking 
    1212          the protocol (HTTP or HTTPS) 
     13        + Add spinner gif to modalbox window 
    13140.11.102 
    1415        + Added `override_user_modification` configuration parameter to 

  • branches/juruen/intrepid-alpha4/common/libebox/debian/copyright

    r11219 r11222  
    6565 SOFTWARE. 
    6666 
     67Files: www/js/modalbox.js www/css/modlbox.css www/images/spinning.gif 
     68Copyright (c) 2006-2007 Andrey Okonetchnikov 
     69 
     70Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: 
     71 
     72The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 
     73 
     74THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
    6775 
    6876The Debian packaging is: 

  • branches/juruen/intrepid-alpha4/common/libebox/www/Makefile.am

    r10308 r11222  
    2121  images/reload.gif images/ajax-loader.gif images/edit-table.gif \ 
    2222  images/search.gif images/non_ff.gif   images/non_f.gif \ 
    23   images/non_r.gif  images/non_rw.gif images/feed-icon.gif 
     23  images/non_r.gif  images/non_rw.gif images/feed-icon.gif \ 
     24  images/spinner.gif 
    2425 
    2526js = js/csshover.htc js/common.js \ 

  • branches/juruen/intrepid-alpha4/common/libebox/www/css/modalbox.css

    r10308 r11222  
    5959        padding: 1.5em; 
    6060        text-indent: -10000px; 
    61         background: transparent url(spinner.gif) 50% 0 no-repeat; 
     61        background: transparent url(/data/images/spinner.gif) 50% 0 no-repeat; 
    6262} 
    6363 

  • branches/juruen/intrepid-packages/common/libebox/ChangeLog

    r11219 r11222  
    1111        + Bugfix. Create redirection URLs using client headers and guessing checking 
    1212          the protocol (HTTP or HTTPS) 
     13        + Add spinner gif to modalbox window 
    13140.11.102 
    1415        + Added `override_user_modification` configuration parameter to 

  • branches/juruen/intrepid-packages/common/libebox/debian/copyright

    r11219 r11222  
    6565 SOFTWARE. 
    6666 
     67Files: www/js/modalbox.js www/css/modlbox.css www/images/spinning.gif 
     68Copyright (c) 2006-2007 Andrey Okonetchnikov 
     69 
     70Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: 
     71 
     72The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. 
     73 
     74THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
    6775 
    6876The Debian packaging is: 

  • branches/juruen/intrepid-packages/common/libebox/www/Makefile.am

    r10308 r11222  
    2121  images/reload.gif images/ajax-loader.gif images/edit-table.gif \ 
    2222  images/search.gif images/non_ff.gif   images/non_f.gif \ 
    23   images/non_r.gif  images/non_rw.gif images/feed-icon.gif 
     23  images/non_r.gif  images/non_rw.gif images/feed-icon.gif \ 
     24  images/spinner.gif 
    2425 
    2526js = js/csshover.htc js/common.js \ 

  • branches/juruen/intrepid-packages/common/libebox/www/css/modalbox.css

    r10308 r11222  
    5959        padding: 1.5em; 
    6060        text-indent: -10000px; 
    61         background: transparent url(spinner.gif) 50% 0 no-repeat; 
     61        background: transparent url(/data/images/spinner.gif) 50% 0 no-repeat; 
    6262} 
    6363