Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

diff --combined app/assets/javascripts/models/panel_picture.js.coffee
index 22465d2,609d046..7544193
--- 1/app/assets/javascripts/models/panel_picture.js.coffee
--- 2/app/assets/javascripts/models/panel_picture.js.coffee
+++ b/app/assets/javascripts/models/panel_picture.js.coffee
@@@ -35,7 -35,11 +35,11 @@@ class Pettanr.PanelPicture extends Peta
      res\r
    \r
    filename: (picture) ->\r
-     picture.filename() + '?subdir=' + @flip()\r
+     q = if _.isEmpty(@flip())\r
+       ''\r
+     else\r
+       '?subdir=' + @flip()\r
+     picture.filename() + q\r
    \r
    r_url: (picture) ->\r
      '/pictures/' + @filename(picture)\r
@@@ -44,7 -48,7 +48,7 @@@
      new Pettanr.Image.SymbolPicture({\r
        attr: {\r
          src: picture.r_url(), \r
-         alt: @get('caption')\r
+         alt: @escape('caption')\r
        },\r
        picture: picture\r
      })\r
@@@ -61,7 -65,4 +65,7 @@@
    initialize: () ->\r
      if @id\r
        @url = @url + @id\r
 +    @bind('change:width', () ->\r
 +      console.log('cng')\r
 +    )\r
    \r