fix: js models

diff --git a/Gemfile b/Gemfile
index 77dce6c..8f22731 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,7 @@ gem 'devise', '=1.5.2'
 gem 'rest-client'
 gem 'underscore-rails'
 gem 'backbone-rails'
+gem 'backbone-relational-rails'
 gem 'kaminari'
 gem 'sanitize'
 gem 'aws-s3'

diff --git a/app/assets/javascripts/ap.js b/app/assets/javascripts/ap.js
index 5162023..c516859 100644 (file)
--- a/app/assets/javascripts/ap.js
+++ b/app/assets/javascripts/ap.js
@@ -11,6 +11,7 @@
 //= require textchange
 //= require underscore
 //= require backbone
+//= require backbone-relational
 //= require i18n
 //= require ./manifest_base/manifest_base
 //= require ./manifest_base/base
@@ -224,5 +225,6 @@
 //= require_directory ./controllers
 //= require_directory ./models
 //= require_directory ./views
-//= require_directory ./pettanr
+//= require ./pettanr/pettan_imager
+//= require ./pettanr/operator
 //= require main

diff --git a/app/assets/javascripts/controllers/admin.js.coffee b/app/assets/javascripts/controllers/admins.js.coffee
similarity index 100%
rename from app/assets/javascripts/controllers/admin.js.coffee
rename to app/assets/javascripts/controllers/admins.js.coffee

diff --git a/app/assets/javascripts/controllers/artist.js.coffee b/app/assets/javascripts/controllers/artists.js.coffee
similarity index 100%
rename from app/assets/javascripts/controllers/artist.js.coffee
rename to app/assets/javascripts/controllers/artists.js.coffee

diff --git a/app/assets/javascripts/controllers/author.js.coffee b/app/assets/javascripts/controllers/author.js.coffee
deleted file mode 100644 (file)
index ee7c3f9..0000000
--- a/app/assets/javascripts/controllers/author.js.coffee
+++ /dev/null
@@ -1,19 +0,0 @@
-class Pettanr.AuthorsController extends Pettanr.AppController\r
-  url: '/authors/'\r
-  \r
-  @singular: () ->\r
-    'Author'\r
-  \r
-  @plural: () ->\r
-    'Authors'\r
-  \r
-  defaults: {\r
-    id: null,\r
-    name: 'no name'\r
-  } \r
-  \r
-  initialize: () ->\r
-    if @id\r
-      @url = @url + @id\r
-\r
-\r

diff --git a/app/assets/javascripts/controllers/authors.js.coffee b/app/assets/javascripts/controllers/authors.js.coffee
new file mode 100644 (file)
index 0000000..9f49b53
--- /dev/null
+++ b/app/assets/javascripts/controllers/authors.js.coffee
@@ -0,0 +1,7 @@
+class Pettanr.AuthorsController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.Author.Collection({})\r
+    new Pettanr.FilerRender('author', list_result, 'default', window.operators)\r
+  \r
+\r

diff --git a/app/assets/javascripts/controllers/balloon.js.coffee b/app/assets/javascripts/controllers/balloon.js.coffee
deleted file mode 100644 (file)
index 4e4d8e3..0000000
--- a/app/assets/javascripts/controllers/balloon.js.coffee
+++ /dev/null
@@ -1,2 +0,0 @@
-class Pettanr.BalloonsController extends Pettanr.AppController\r
-\r

diff --git a/app/assets/javascripts/controllers/balloons.js.coffee b/app/assets/javascripts/controllers/balloons.js.coffee
new file mode 100644 (file)
index 0000000..62dfcda
--- /dev/null
+++ b/app/assets/javascripts/controllers/balloons.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.BalloonsController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.Balloon.Collection({})\r
+    new Pettanr.FilerRender('balloon', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/comic.js.coffee b/app/assets/javascripts/controllers/comic.js.coffee
deleted file mode 100644 (file)
index 556d3dc..0000000
--- a/app/assets/javascripts/controllers/comic.js.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-class Pettanr.ComicsController extends Pettanr.AppController\r
-  @single: () ->\r
-    'Comic'\r
-  \r
-  @plural: () ->\r
-    'Comics'\r
-  \r
-  defaults: {\r
-    id: 11\r
-  } \r
-  \r
-  initialize: () ->\r
-    confirm("Welcome to Panel")\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/comic_stories.js.coffee b/app/assets/javascripts/controllers/comic_stories.js.coffee
index e676069..3dbf8b7 100644 (file)
--- a/app/assets/javascripts/controllers/comic_stories.js.coffee
+++ b/app/assets/javascripts/controllers/comic_stories.js.coffee
@@ -1,14 +1,6 @@
 class Pettanr.ComicStoriesController extends Pettanr.AppController\r
-  @single: () ->\r
-    'ComicStory'\r
   \r
-  @plural: () ->\r
-    'ComicStories'\r
+  index: () ->\r
+    list_result = new Pettanr.ComicStory.Collection({})\r
+    new Pettanr.FilerRender('comic_story', list_result, 'default', window.operators)\r
   \r
-  defaults: {\r
-    id: null\r
-  } \r
-  \r
-  initialize: () ->\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/comics.js.coffee b/app/assets/javascripts/controllers/comics.js.coffee
new file mode 100644 (file)
index 0000000..c6c868b
--- /dev/null
+++ b/app/assets/javascripts/controllers/comics.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.ComicsController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.Comic.Collection({})\r
+    new Pettanr.FilerRender('comic', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/demander.js.coffee b/app/assets/javascripts/controllers/demander.js.coffee
deleted file mode 100644 (file)
index cffa4bb..0000000
--- a/app/assets/javascripts/controllers/demander.js.coffee
+++ /dev/null
@@ -1,9 +0,0 @@
-class Pettanr.DemandersController extends Pettanr.AppController\r
-  \r
-  defaults: {\r
-    id: null\r
-  } \r
-  \r
-  initialize: () ->\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/demanders.js.coffee b/app/assets/javascripts/controllers/demanders.js.coffee
new file mode 100644 (file)
index 0000000..bede2bc
--- /dev/null
+++ b/app/assets/javascripts/controllers/demanders.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.DemandersController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.Demander.Collection({})\r
+    new Pettanr.FilerRender('demander', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/folders.js.coffee b/app/assets/javascripts/controllers/folders.js.coffee
index 5b3f0dc..272e946 100644 (file)
--- a/app/assets/javascripts/controllers/folders.js.coffee
+++ b/app/assets/javascripts/controllers/folders.js.coffee
@@ -1,5 +1,8 @@
 class Pettanr.FoldersController extends Pettanr.AppController\r
+  \r
   index: () ->\r
+    list_result = new Pettanr.Folder.Collection({})\r
+    new Pettanr.FilerRender('folder', list_result, 'default', window.operators)\r
   \r
   root: () ->\r
   \r

diff --git a/app/assets/javascripts/controllers/ground_color.js.coffee b/app/assets/javascripts/controllers/ground_color.js.coffee
deleted file mode 100644 (file)
index 08d8160..0000000
--- a/app/assets/javascripts/controllers/ground_color.js.coffee
+++ /dev/null
@@ -1,2 +0,0 @@
-class Pettanr.GroundColorsController extends Pettanr.AppController\r
-\r

diff --git a/app/assets/javascripts/controllers/ground_colors.js.coffee b/app/assets/javascripts/controllers/ground_colors.js.coffee
new file mode 100644 (file)
index 0000000..8191952
--- /dev/null
+++ b/app/assets/javascripts/controllers/ground_colors.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.GroundColorsController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.GroundColor.Collection({})\r
+    new Pettanr.FilerRender('ground_color', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/ground_picture.js.coffee b/app/assets/javascripts/controllers/ground_picture.js.coffee
deleted file mode 100644 (file)
index 6346326..0000000
--- a/app/assets/javascripts/controllers/ground_picture.js.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-class Pettanr.GroundPicturesController extends Pettanr.AppController\r
-  @single: () ->\r
-    'GroundPicture'\r
-  \r
-  @plural: () ->\r
-    'GroundPictures'\r
-  \r
-  @colum_structures: ->\r
-    {}\r
-  \r
-  defaults: {\r
-    x: 11\r
-  } \r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/ground_pictures.js.coffee b/app/assets/javascripts/controllers/ground_pictures.js.coffee
new file mode 100644 (file)
index 0000000..08afdc7
--- /dev/null
+++ b/app/assets/javascripts/controllers/ground_pictures.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.GroundPicturesController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.GroundPicture.Collection({})\r
+    new Pettanr.FilerRender('ground_picture', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/license.js.coffee b/app/assets/javascripts/controllers/license.js.coffee
deleted file mode 100644 (file)
index 159a1f7..0000000
--- a/app/assets/javascripts/controllers/license.js.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-class Pettanr.LicensesController extends Pettanr.AppController\r
-  @single: () ->\r
-    'License'\r
-  \r
-  @plural: () ->\r
-    'Licenses'\r
-  \r
-  defaults: {\r
-    id: 11\r
-  } \r
-  \r
-  initialize: () ->\r
-    confirm("Welcome to Panel")\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/license_group.js.coffee b/app/assets/javascripts/controllers/license_group.js.coffee
deleted file mode 100644 (file)
index 0eda01e..0000000
--- a/app/assets/javascripts/controllers/license_group.js.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-class Pettanr.LicenseGroupsController extends Pettanr.AppController\r
-  @single: () ->\r
-    'LicenseGroup'\r
-  \r
-  @plural: () ->\r
-    'LicenseGroups'\r
-  \r
-  defaults: {\r
-    id: 11\r
-  } \r
-  \r
-  initialize: () ->\r
-    confirm("Welcome to Panel")\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/license_groups.js.coffee b/app/assets/javascripts/controllers/license_groups.js.coffee
new file mode 100644 (file)
index 0000000..a1ab464
--- /dev/null
+++ b/app/assets/javascripts/controllers/license_groups.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.LicenseGroupsController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.LicenseGroup.Collection({})\r
+    new Pettanr.FilerRender('license_group', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/licenses.js.coffee b/app/assets/javascripts/controllers/licenses.js.coffee
new file mode 100644 (file)
index 0000000..2f3c828
--- /dev/null
+++ b/app/assets/javascripts/controllers/licenses.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.LicensesController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.License.Collection({})\r
+    new Pettanr.FilerRender('license', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/original_picture.js.coffee b/app/assets/javascripts/controllers/original_picture.js.coffee
deleted file mode 100644 (file)
index 702dbf5..0000000
--- a/app/assets/javascripts/controllers/original_picture.js.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-class Pettanr.OriginalPicturesController extends Pettanr.AppController\r
-  @single: () ->\r
-    'OriginalPicture'\r
-  \r
-  @plural: () ->\r
-    'OriginalPictures'\r
-  \r
-  defaults: {\r
-    id: 11\r
-  } \r
-  \r
-  initialize: () ->\r
-    confirm("Welcome to Panel")\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/original_picture_license.js.coffee b/app/assets/javascripts/controllers/original_picture_license.js.coffee
deleted file mode 100644 (file)
index 9aef0fb..0000000
--- a/app/assets/javascripts/controllers/original_picture_license.js.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-class Pettanr.OriginalPictureLicensesController extends Pettanr.AppController\r
-  @single: () ->\r
-    'OriginalPictureLicense'\r
-  \r
-  @plural: () ->\r
-    'OriginalPictureLicenses'\r
-  \r
-  defaults: {\r
-    id: 11\r
-  } \r
-  \r
-  initialize: () ->\r
-    confirm("Welcome to Panel")\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/original_picture_license_group.js.coffee b/app/assets/javascripts/controllers/original_picture_license_group.js.coffee
deleted file mode 100644 (file)
index b84ca39..0000000
--- a/app/assets/javascripts/controllers/original_picture_license_group.js.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-class Pettanr.OriginalPictureLicenseGroupsController extends Pettanr.AppController\r
-  @single: () ->\r
-    'OriginalPictureLicenseGroup'\r
-  \r
-  @plural: () ->\r
-    'OriginalPictureLicenseGroups'\r
-  \r
-  defaults: {\r
-    id: 11\r
-  } \r
-  \r
-  initialize: () ->\r
-    confirm("Welcome to Panel")\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/original_picture_license_groups.js.coffee b/app/assets/javascripts/controllers/original_picture_license_groups.js.coffee
new file mode 100644 (file)
index 0000000..0faa770
--- /dev/null
+++ b/app/assets/javascripts/controllers/original_picture_license_groups.js.coffee
@@ -0,0 +1,7 @@
+class Pettanr.OriginalPictureLicenseGroupsController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.OriginalPictureLicenseGroup.Collection({})\r
+    new Pettanr.FilerRender('original_picture_license_group', list_result, 'default', window.operators)\r
+  \r
+\r

diff --git a/app/assets/javascripts/controllers/original_picture_licenses.js.coffee b/app/assets/javascripts/controllers/original_picture_licenses.js.coffee
new file mode 100644 (file)
index 0000000..274815e
--- /dev/null
+++ b/app/assets/javascripts/controllers/original_picture_licenses.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.OriginalPictureLicensesController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.OriginalPictureLicense.Collection({})\r
+    new Pettanr.FilerRender('original_picture_license', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/original_pictures.js.coffee b/app/assets/javascripts/controllers/original_pictures.js.coffee
new file mode 100644 (file)
index 0000000..5a9c3f0
--- /dev/null
+++ b/app/assets/javascripts/controllers/original_pictures.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.OriginalPicturesController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.OriginalPicture.Collection({})\r
+    new Pettanr.FilerRender('original_picture', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/panel.js.coffee b/app/assets/javascripts/controllers/panel.js.coffee
deleted file mode 100644 (file)
index e46beef..0000000
--- a/app/assets/javascripts/controllers/panel.js.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-class Pettanr.PanelsController extends Pettanr.AppController\r
-  @single: () ->\r
-    'Panel'\r
-  \r
-  @plural: () ->\r
-    'Panels'\r
-  \r
-  defaults: {\r
-    id: 11\r
-  } \r
-  \r
-  initialize: () ->\r
-    confirm("Welcome to Panel")\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/panel_picture.js.coffee b/app/assets/javascripts/controllers/panel_picture.js.coffee
deleted file mode 100644 (file)
index d2a78ef..0000000
--- a/app/assets/javascripts/controllers/panel_picture.js.coffee
+++ /dev/null
@@ -1,18 +0,0 @@
-class Pettanr.PanelPicturesController extends Pettanr.AppController\r
-  @single: () ->\r
-    'PanelPicture'\r
-  \r
-  @plural: () ->\r
-    'PanelPictures'\r
-  \r
-  @colum_structures: ->\r
-    {}\r
-  \r
-  defaults: {\r
-    x: 11\r
-  } \r
-  \r
-  initialize: () ->\r
-    confirm("Welcome to this world")\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/panel_pictures.js.coffee b/app/assets/javascripts/controllers/panel_pictures.js.coffee
new file mode 100644 (file)
index 0000000..bc12fb2
--- /dev/null
+++ b/app/assets/javascripts/controllers/panel_pictures.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.PanelPicturesController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.PanelPicture.Collection({})\r
+    new Pettanr.FilerRender('panel_picture', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/panels.js.coffee b/app/assets/javascripts/controllers/panels.js.coffee
new file mode 100644 (file)
index 0000000..9615ad4
--- /dev/null
+++ b/app/assets/javascripts/controllers/panels.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.PanelsController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.Panel.Collection({})\r
+    new Pettanr.FilerRender('panel', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/picture.js.coffee b/app/assets/javascripts/controllers/picture.js.coffee
deleted file mode 100644 (file)
index 9eb8d10..0000000
--- a/app/assets/javascripts/controllers/picture.js.coffee
+++ /dev/null
@@ -1,14 +0,0 @@
-class Pettanr.PicturesController extends Pettanr.AppController\r
-  @single: () ->\r
-    'Picture'\r
-  \r
-  @plural: () ->\r
-    'Pictures'\r
-  \r
-  defaults: {\r
-    id: 11\r
-  } \r
-  \r
-  initialize: () ->\r
-    confirm("Welcome to Panel")\r
-\r

diff --git a/app/assets/javascripts/controllers/pictures.js.coffee b/app/assets/javascripts/controllers/pictures.js.coffee
new file mode 100644 (file)
index 0000000..0a84cd6
--- /dev/null
+++ b/app/assets/javascripts/controllers/pictures.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.PicturesController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.Picture.Collection({})\r
+    new Pettanr.FilerRender('picture', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/resource_picture.js.coffee b/app/assets/javascripts/controllers/resource_picture.js.coffee
deleted file mode 100644 (file)
index 9cbb92f..0000000
--- a/app/assets/javascripts/controllers/resource_picture.js.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-class Pettanr.ResourcePicturesController extends Pettanr.AppController\r
-  @single: () ->\r
-    'ResourcePicture'\r
-  \r
-  @plural: () ->\r
-    'ResourcePictures'\r
-  \r
-  defaults: {\r
-    id: 11\r
-  } \r
-  \r
-  initialize: () ->\r
-    confirm("Welcome to Panel")\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/resource_pictures.js.coffee b/app/assets/javascripts/controllers/resource_pictures.js.coffee
new file mode 100644 (file)
index 0000000..e31c084
--- /dev/null
+++ b/app/assets/javascripts/controllers/resource_pictures.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.ResourcePicturesController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.ResourcePicture.Collection({})\r
+    new Pettanr.FilerRender('resource_picture', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/scroll_panel.js.coffee b/app/assets/javascripts/controllers/scroll_panel.js.coffee
deleted file mode 100644 (file)
index a84162c..0000000
--- a/app/assets/javascripts/controllers/scroll_panel.js.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-class Pettanr.ScrollPanelsController extends Pettanr.AppController\r
-  @single: () ->\r
-    'ScrollPanel'\r
-  \r
-  @plural: () ->\r
-    'ScrollPanels'\r
-  \r
-  defaults: {\r
-    id: 11\r
-  } \r
-  \r
-  initialize: () ->\r
-    confirm("Welcome to Panel")\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/scroll_panels.js.coffee b/app/assets/javascripts/controllers/scroll_panels.js.coffee
new file mode 100644 (file)
index 0000000..e311586
--- /dev/null
+++ b/app/assets/javascripts/controllers/scroll_panels.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.ScrollPanelsController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.ScrollPanel.Collection({})\r
+    new Pettanr.FilerRender('scroll_panel', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/scroll.js.coffee b/app/assets/javascripts/controllers/scrolls.js.coffee
similarity index 87%
rename from app/assets/javascripts/controllers/scroll.js.coffee
rename to app/assets/javascripts/controllers/scrolls.js.coffee
index fe31eb8..5313e54 100644 (file)
--- a/app/assets/javascripts/controllers/scroll.js.coffee
+++ b/app/assets/javascripts/controllers/scrolls.js.coffee
@@ -3,8 +3,6 @@ class Pettanr.ScrollsController extends Pettanr.AppController
   index: () ->\r
     list_result = new Pettanr.Scroll.Collection({})\r
     new Pettanr.FilerRender('scroll', list_result, 'default', window.operators)\r
-\r
-  root: () ->\r
   \r
   show_html_format: (format) -> \r
   \r
@@ -13,10 +11,11 @@ class Pettanr.ScrollsController extends Pettanr.AppController
     item = new Pettanr.Scroll({id: id})\r
     _this = this\r
     item.fetch({}).done () ->\r
+      alert(item)\r
   \r
   count: () ->\r
   \r
-  folders_new: () ->\r
+  new: () ->\r
   \r
   edit: () ->\r
   \r

diff --git a/app/assets/javascripts/controllers/sheet.js.coffee b/app/assets/javascripts/controllers/sheet.js.coffee
deleted file mode 100644 (file)
index ecc9c84..0000000
--- a/app/assets/javascripts/controllers/sheet.js.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-class Pettanr.SheetsController extends Pettanr.AppController\r
-  @single: () ->\r
-    'Sheet'\r
-  \r
-  @plural: () ->\r
-    'Sheets'\r
-  \r
-  defaults: {\r
-    id: 11\r
-  } \r
-  \r
-  initialize: () ->\r
-    confirm("Welcome to Panel")\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/sheet_panel.js.coffee b/app/assets/javascripts/controllers/sheet_panel.js.coffee
deleted file mode 100644 (file)
index b86e035..0000000
--- a/app/assets/javascripts/controllers/sheet_panel.js.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-class Pettanr.SheetPanelsController extends Pettanr.AppController\r
-  @single: () ->\r
-    'SheetPanel'\r
-  \r
-  @plural: () ->\r
-    'SheetPanels'\r
-  \r
-  defaults: {\r
-    id: 11\r
-  } \r
-  \r
-  initialize: () ->\r
-    confirm("Welcome to Panel")\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/sheet_panels.js.coffee b/app/assets/javascripts/controllers/sheet_panels.js.coffee
new file mode 100644 (file)
index 0000000..04e4358
--- /dev/null
+++ b/app/assets/javascripts/controllers/sheet_panels.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.SheetPanelsController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.SheetPanel.Collection({})\r
+    new Pettanr.FilerRender('sheet_panel', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/sheets.js.coffee b/app/assets/javascripts/controllers/sheets.js.coffee
new file mode 100644 (file)
index 0000000..1b5c159
--- /dev/null
+++ b/app/assets/javascripts/controllers/sheets.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.SheetsController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.Sheet.Collection({})\r
+    new Pettanr.FilerRender('sheet', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/speech.js.coffee b/app/assets/javascripts/controllers/speech.js.coffee
deleted file mode 100644 (file)
index 037576a..0000000
--- a/app/assets/javascripts/controllers/speech.js.coffee
+++ /dev/null
@@ -1,18 +0,0 @@
-class Pettanr.SpeechesController extends Pettanr.AppController\r
-  @single: () ->\r
-    'Speech'\r
-  \r
-  @plural: () ->\r
-    'Speeches'\r
-  \r
-  @colum_structures: ->\r
-    {}\r
-  \r
-  defaults: {\r
-    x: 11\r
-  } \r
-  \r
-  initialize: () ->\r
-    confirm("Welcome to this world")\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/speech_balloon.js.coffee b/app/assets/javascripts/controllers/speech_balloon.js.coffee
deleted file mode 100644 (file)
index 7dd2ae0..0000000
--- a/app/assets/javascripts/controllers/speech_balloon.js.coffee
+++ /dev/null
@@ -1,18 +0,0 @@
-class Pettanr.SpeechBalloonsController extends Pettanr.AppController\r
-  @single: () ->\r
-    'SpeechBalloon'\r
-  \r
-  @plural: () ->\r
-    'SpeechBalloons'\r
-  \r
-  @colum_structures: ->\r
-    {}\r
-  \r
-  defaults: {\r
-    x: 11\r
-  } \r
-  \r
-  initialize: () ->\r
-    confirm("Welcome to this world")\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/speech_balloon_template.js.coffee b/app/assets/javascripts/controllers/speech_balloon_template.js.coffee
deleted file mode 100644 (file)
index ec1d298..0000000
--- a/app/assets/javascripts/controllers/speech_balloon_template.js.coffee
+++ /dev/null
@@ -1,2 +0,0 @@
-class Pettanr.SpeechBalloonTemplatesController extends Pettanr.AppController\r
-\r

diff --git a/app/assets/javascripts/controllers/speech_balloon_templates.js.coffee b/app/assets/javascripts/controllers/speech_balloon_templates.js.coffee
new file mode 100644 (file)
index 0000000..98b33e9
--- /dev/null
+++ b/app/assets/javascripts/controllers/speech_balloon_templates.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.SpeechBalloonTemplatesController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.SpeechBalloonTemplate.Collection({})\r
+    new Pettanr.FilerRender('speech_balloon_template', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/speech_balloons.js.coffee b/app/assets/javascripts/controllers/speech_balloons.js.coffee
new file mode 100644 (file)
index 0000000..5f46527
--- /dev/null
+++ b/app/assets/javascripts/controllers/speech_balloons.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.SpeechBalloonsController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.SpeechBalloon.Collection({})\r
+    new Pettanr.FilerRender('speech_balloon', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/speeches.js.coffee b/app/assets/javascripts/controllers/speeches.js.coffee
new file mode 100644 (file)
index 0000000..e29adbf
--- /dev/null
+++ b/app/assets/javascripts/controllers/speeches.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.SpeechesController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.Speech.Collection({})\r
+    new Pettanr.FilerRender('speech', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/stories.js.coffee b/app/assets/javascripts/controllers/stories.js.coffee
new file mode 100644 (file)
index 0000000..7e97d4b
--- /dev/null
+++ b/app/assets/javascripts/controllers/stories.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.StoriesController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.Story.Collection({})\r
+    new Pettanr.FilerRender('story', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/story.js.coffee b/app/assets/javascripts/controllers/story.js.coffee
deleted file mode 100644 (file)
index d86f2d4..0000000
--- a/app/assets/javascripts/controllers/story.js.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-class Pettanr.StoriesController extends Pettanr.AppController\r
-  @single: () ->\r
-    'Story'\r
-  \r
-  @plural: () ->\r
-    'Stories'\r
-  \r
-  defaults: {\r
-    id: 11\r
-  } \r
-  \r
-  initialize: () ->\r
-    confirm("Welcome to Panel")\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/story_sheet.js.coffee b/app/assets/javascripts/controllers/story_sheet.js.coffee
deleted file mode 100644 (file)
index 00d1e53..0000000
--- a/app/assets/javascripts/controllers/story_sheet.js.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-class Pettanr.StorySheetsController extends Pettanr.AppController\r
-  @single: () ->\r
-    'StorySheet'\r
-  \r
-  @plural: () ->\r
-    'StorySheets'\r
-  \r
-  defaults: {\r
-    id: 11\r
-  } \r
-  \r
-  initialize: () ->\r
-    confirm("Welcome to Panel")\r
-  \r
-\r

diff --git a/app/assets/javascripts/controllers/story_sheets.js.coffee b/app/assets/javascripts/controllers/story_sheets.js.coffee
new file mode 100644 (file)
index 0000000..3bb3f03
--- /dev/null
+++ b/app/assets/javascripts/controllers/story_sheets.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.StorySheetsController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.StorySheet.Collection({})\r
+    new Pettanr.FilerRender('story_sheet', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/system_picture.js.coffee b/app/assets/javascripts/controllers/system_picture.js.coffee
deleted file mode 100644 (file)
index 552cd27..0000000
--- a/app/assets/javascripts/controllers/system_picture.js.coffee
+++ /dev/null
@@ -1 +0,0 @@
-class Pettanr.SystemPicturesController extends Pettanr.AppController\r

diff --git a/app/assets/javascripts/controllers/system_pictures.js.coffee b/app/assets/javascripts/controllers/system_pictures.js.coffee
new file mode 100644 (file)
index 0000000..13bbf9e
--- /dev/null
+++ b/app/assets/javascripts/controllers/system_pictures.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.SystemPicturesController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.SystemPicture.Collection({})\r
+    new Pettanr.FilerRender('system_picture', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/user.js.coffee b/app/assets/javascripts/controllers/user.js.coffee
deleted file mode 100644 (file)
index fa8287c..0000000
--- a/app/assets/javascripts/controllers/user.js.coffee
+++ /dev/null
@@ -1,16 +0,0 @@
-class Pettanr.UsersController extends Pettanr.AppController\r
-  \r
-  url: '/users/'\r
-  \r
-  defaults: {\r
-    id: null\r
-  } \r
-  \r
-  author: () ->\r
-  \r
-  artist: () ->\r
-  \r
-  initialize: () ->\r
-    if @id\r
-      @url = @url + @id\r
-  \r

diff --git a/app/assets/javascripts/controllers/users.js.coffee b/app/assets/javascripts/controllers/users.js.coffee
new file mode 100644 (file)
index 0000000..184ca09
--- /dev/null
+++ b/app/assets/javascripts/controllers/users.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.UsersController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.User.Collection({})\r
+    new Pettanr.FilerRender('user', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/controllers/writing_format.js.coffee b/app/assets/javascripts/controllers/writing_format.js.coffee
deleted file mode 100644 (file)
index 408641a..0000000
--- a/app/assets/javascripts/controllers/writing_format.js.coffee
+++ /dev/null
@@ -1,2 +0,0 @@
-class Pettanr.WritingFormatsController extends Pettanr.AppController\r
-\r

diff --git a/app/assets/javascripts/controllers/writing_formats.js.coffee b/app/assets/javascripts/controllers/writing_formats.js.coffee
new file mode 100644 (file)
index 0000000..41091b5
--- /dev/null
+++ b/app/assets/javascripts/controllers/writing_formats.js.coffee
@@ -0,0 +1,6 @@
+class Pettanr.WritingFormatsController extends Pettanr.AppController\r
+  \r
+  index: () ->\r
+    list_result = new Pettanr.WritingFormat.Collection({})\r
+    new Pettanr.FilerRender('writing_format', list_result, 'default', window.operators)\r
+  \r

diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/url_column.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/url_column.js.coffee
index af3fcc8..da57715 100644 (file)
--- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/url_column.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/url_column.js.coffee
@@ -13,5 +13,5 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemCo
     "javascript:void(0)"\r
   \r
   url: () ->\r
-    @item.get(@my_manifest.column_name())\r
+    @item.get(@my_manifest.column_name)\r
 \r

diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/picture.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/picture.js.coffee
index 8675b6f..ed955d4 100644 (file)
--- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/picture.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/picture.js.coffee
@@ -9,11 +9,11 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemCol
     this\r
   \r
   method_name: () ->\r
-    @my_manifest.method_name()\r
+    @my_manifest.method_name\r
   \r
   url: () ->\r
-    if @item.methods(true).is_include(@method_name())\r
-      @item[@method_name()]()\r
+    if @item[@method_name()]\r
+      @item[@method_name()]().src\r
     else\r
       '/images/error.png'\r
   \r

diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/url_column.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/url_column.js.coffee
index ffe31a0..c6e7410 100644 (file)
--- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/url_column.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/url_column.js.coffee
@@ -13,5 +13,5 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemCol
     "javascript:void(0)"\r
   \r
   url: () ->\r
-    @item.get(@my_manifest.column_name())\r
+    @item.get(@my_manifest.column_name)\r
   \r

diff --git a/app/assets/javascripts/manifest/manifest.js.coffee b/app/assets/javascripts/manifest/manifest.js.coffee
index 9e7c228..6358138 100644 (file)
--- a/app/assets/javascripts/manifest/manifest.js.coffee
+++ b/app/assets/javascripts/manifest/manifest.js.coffee
@@ -12,7 +12,7 @@ class Manifest
     true\r
   \r
   @item_name_to_model: (item_name) ->\r
-    Pettanr[Pettanr.capitalize(item_name)]\r
+    Pettanr[Pettanr.camelize(item_name)]\r
   \r
   @singularize: (name) ->\r
     name.replace(/es$/, '').replace(/s$/, '')\r

diff --git a/app/assets/javascripts/models/admin.js.coffee b/app/assets/javascripts/models/admin.js.coffee
index d511faf..3ed7399 100644 (file)
--- a/app/assets/javascripts/models/admin.js.coffee
+++ b/app/assets/javascripts/models/admin.js.coffee
@@ -5,5 +5,9 @@ class Pettanr.Admin extends Backbone.Model
   } \r
   \r
   initialize: () ->\r
+    if @id\r
+      @url = @url + @id\r
   \r
-\r
+class Pettanr.Admin.Collection extends Backbone.Collection\r
+  model: Pettanr.Admin\r
+  url: '/admins'\r

diff --git a/app/assets/javascripts/models/author.js.coffee b/app/assets/javascripts/models/author.js.coffee
index 8a6d2c3..7c3e37f 100644 (file)
--- a/app/assets/javascripts/models/author.js.coffee
+++ b/app/assets/javascripts/models/author.js.coffee
@@ -15,5 +15,7 @@ class Pettanr.Author extends Peta.Owner
   initialize: () ->\r
     if @id\r
       @url = @url + @id\r
-\r
-\r
+  \r
+class Pettanr.Author.Collection extends Backbone.Collection\r
+  model: Pettanr.Author\r
+  url: '/authors'\r

diff --git a/app/assets/javascripts/models/balloon.js.coffee b/app/assets/javascripts/models/balloon.js.coffee
index 918997c..8d6c55b 100644 (file)
--- a/app/assets/javascripts/models/balloon.js.coffee
+++ b/app/assets/javascripts/models/balloon.js.coffee
@@ -1,2 +1,38 @@
 class Pettanr.Balloon extends Peta.Element\r
+  @singular: () ->\r
+    'Balloon'\r
+  \r
+  @plural: () ->\r
+    'Balloons'\r
+  \r
+  defaults: {\r
+    id: null,\r
+    x: 0,\r
+    y: 0,\r
+    width: 100,\r
+    height: 100,\r
+    r: 0\r
+  } \r
+  \r
+  url: () ->\r
+    '/system_pictures/' + @system_picture().filename()\r
+  \r
+  symbol_option: () ->\r
+    @speech_balloon().speech_balloon_template().symbol_option()\r
+  \r
+  style: () ->\r
+    {\r
+      width: Pettanr.to_s(@get('width')) + 'px', \r
+      height: Pettanr.to_s(@get('height')) + 'px',\r
+      top: Pettanr.to_s(@get('y')) + 'px',\r
+      left: Pettanr.to_s(@get('x')) + 'px'\r
+    }\r
+  \r
+  initialize: () ->\r
+    if @id\r
+      @url = @url + @id\r
+  \r
+class Pettanr.Balloon.Collection extends Backbone.Collection\r
+  model: Pettanr.Balloon\r
+  url: '/balloons'\r
 \r

diff --git a/app/assets/javascripts/models/comic.js.coffee b/app/assets/javascripts/models/comic.js.coffee
index 4dc49b7..c760c13 100644 (file)
--- a/app/assets/javascripts/models/comic.js.coffee
+++ b/app/assets/javascripts/models/comic.js.coffee
@@ -1,15 +1,31 @@
 class Pettanr.Comic extends Peta.Binder\r
-  @single: () ->\r
+  @singular: () ->\r
     'Comic'\r
   \r
   @plural: () ->\r
     'Comics'\r
   \r
   defaults: {\r
-    id: 11\r
+    id: null,\r
+    visible: 0,\r
+    author_id: null\r
   } \r
   \r
+  is_visible: (operators) ->\r
+    switch super(operators)\r
+      when null\r
+        return true\r
+      when false\r
+        return false\r
+      else\r
+        @get('visible') > 0\r
+  \r
+  symbol_filename: () ->\r
+  \r
   initialize: () ->\r
-    confirm("Welcome to Panel")\r
+    if @id\r
+      @url = @url + @id\r
   \r
-\r
+class Pettanr.Comic.Collection extends Backbone.Collection\r
+  model: Pettanr.Comic\r
+  url: '/comics'\r

diff --git a/app/assets/javascripts/models/comic_story.js.coffee b/app/assets/javascripts/models/comic_story.js.coffee
new file mode 100644 (file)
index 0000000..c2c6d6d
--- /dev/null
+++ b/app/assets/javascripts/models/comic_story.js.coffee
@@ -0,0 +1,30 @@
+class Pettanr.ComicStory extends Peta.Leaf\r
+  @singular: () ->\r
+    'ComicStory'\r
+  \r
+  @plural: () ->\r
+    'ComicStories'\r
+  \r
+  defaults: {\r
+    id: null,\r
+    comic_id: null,\r
+    story_id: null,\r
+    t: null\r
+  } \r
+  \r
+  disp_t: () ->\r
+    @get('t') + 1\r
+  \r
+  disp_t_by_text: () ->\r
+    I18n.t('comic_stories.show.t', {t: @disp_t()})\r
+  \r
+  title: () ->\r
+    @disp_t_by_text() + ':' + @story().get('title')\r
+  \r
+  initialize: () ->\r
+    if @id\r
+      @url = @url + @id\r
+  \r
+class Pettanr.ComicStory.Collection extends Backbone.Collection\r
+  model: Pettanr.ComicStory\r
+  url: '/comic_stories'\r

diff --git a/app/assets/javascripts/models/ground_color.js.coffee b/app/assets/javascripts/models/ground_color.js.coffee
index 74aae4e..303398a 100644 (file)
--- a/app/assets/javascripts/models/ground_color.js.coffee
+++ b/app/assets/javascripts/models/ground_color.js.coffee
@@ -1,2 +1,71 @@
 class Pettanr.GroundColor extends Peta.Element\r
-\r
+  @singular: () ->\r
+    'GroundColor'\r
+  \r
+  @plural: () ->\r
+    'GroundColors'\r
+  \r
+  defaults: {\r
+    id: null,\r
+    code: 0,\r
+  } \r
+  \r
+  @has_picture: () ->\r
+    false\r
+  \r
+  div_offset: () ->\r
+    if @get('xy')\r
+      @get('xy')\r
+    else\r
+      0\r
+  \r
+  div_size: () ->\r
+    if @get('wh')\r
+      @get('wh')\r
+    else\r
+      100 - @div_offset()\r
+  \r
+  div_x: () ->\r
+    if @get('orientation') == 0\r
+      0\r
+    else\r
+      @div_offset()\r
+  \r
+  div_y: () ->\r
+    if @get('orientation') == 0\r
+      @div_offset()\r
+    else\r
+      0\r
+  \r
+  div_width: () ->\r
+    if @get('orientation') == 0\r
+      100\r
+    else\r
+      @div_size()\r
+  \r
+  div_height: () ->\r
+    if @get('orientation') == 0\r
+      @div_size()\r
+    else\r
+      100\r
+  \r
+  style: (spot = null, opacity = 20) ->\r
+    r = {\r
+      position: 'absolute', \r
+      'z-index': @get('z'), \r
+      top: Pettanr.to_s(@div_y()) + '%', \r
+      left: Pettanr.to_s(@div_x()) + '%', \r
+      width: Pettanr.to_s(@div_width()) + '%', \r
+      height: Pettanr.to_s(@div_height()) + '%', \r
+      'background-color': '#' + ('000000' + Pettanr.to_s(@get('code'))).slice(-6)\r
+    }\r
+    @merge_opacity(r, opacity) if spot and spot != this\r
+    r\r
+  \r
+  initialize: () ->\r
+    if @id\r
+      @url = @url + @id\r
+  \r
+class Pettanr.GroundColor.Collection extends Backbone.Collection\r
+  model: Pettanr.GroundColor\r
+  url: '/ground_colors'\r

diff --git a/app/assets/javascripts/models/ground_picture.js.coffee b/app/assets/javascripts/models/ground_picture.js.coffee
index 3e984b7..1a18c15 100644 (file)
--- a/app/assets/javascripts/models/ground_picture.js.coffee
+++ b/app/assets/javascripts/models/ground_picture.js.coffee
@@ -1,15 +1,53 @@
 class Pettanr.GroundPicture extends Peta.Element\r
-  @single: () ->\r
+  @singular: () ->\r
     'GroundPicture'\r
   \r
   @plural: () ->\r
     'GroundPictures'\r
   \r
-  @colum_structures: ->\r
-    {}\r
-  \r
   defaults: {\r
-    x: 11\r
+    id: null,\r
+    x: 0,\r
+    y: 0,\r
+    repeat: 0\r
   } \r
   \r
-\r
+  @repeat_texts: () -> \r
+    ['repeat', 'repeat-x', 'repeat-y', 'no-repeat']\r
+  \r
+  picture: () ->\r
+    @get('picture')\r
+  \r
+  has_picture: () ->\r
+    true\r
+  \r
+  style: (spot = null, opacity = 20) ->\r
+    r = {\r
+      position: 'absolute', \r
+      top: '0px', \r
+      left: '0px',\r
+      'z-index': @get('z'), \r
+      'background-image': 'url(' + @picture().r_url() + ')', \r
+      'background-repeat': @repeat_text(), \r
+      'background-position': Pettanr.to_s(@get('x')) + 'px ' + Pettanr.to_s(@get('y')) + 'px'\r
+    }\r
+    @merge_opacity(r, opacity) if spot and spot != this\r
+    r\r
+  \r
+  tmb_opt_img_tag: () ->\r
+    wh = Pettanr.Imager.thumbnail_size(@picture().get('width'), @picture().get('height'))\r
+    {src: @picture().r_url(), width: wh[0], height: wh[1], alt: @get('caption')}\r
+  \r
+  symbol_option: () ->\r
+    @tmb_opt_img_tag()\r
+  \r
+  repeat_text: () ->\r
+    Pettanr.GroundPicture.repeat_texts()[@get('repeat')]\r
+  \r
+  initialize: () ->\r
+    if @id\r
+      @url = @url + @id\r
+  \r
+class Pettanr.GroundPicture.Collection extends Backbone.Collection\r
+  model: Pettanr.GroundPicture\r
+  url: '/ground_pictures'\r

diff --git a/app/assets/javascripts/models/license.js.coffee b/app/assets/javascripts/models/license.js.coffee
index 214c4ac..2e18e58 100644 (file)
--- a/app/assets/javascripts/models/license.js.coffee
+++ b/app/assets/javascripts/models/license.js.coffee
@@ -1,15 +1,26 @@
 class Pettanr.License extends Peta.SystemResource\r
-  @single: () ->\r
+  @singular: () ->\r
     'License'\r
   \r
   @plural: () ->\r
     'Licenses'\r
   \r
   defaults: {\r
-    id: 11\r
+    id: null\r
   } \r
   \r
+  license_group: () ->\r
+    r = new Pettanr.LicenseGroup({id: @get('license_group_id')})\r
+    r.fetch({}).done () ->\r
+      r\r
+  \r
+  caption_with_group: () ->\r
+    @license_group().get('caption') + '/' + @get('caption')\r
+  \r
   initialize: () ->\r
-    confirm("Welcome to Panel")\r
+    if @id\r
+      @url = @url + @id\r
   \r
-\r
+class Pettanr.License.Collection extends Backbone.Collection\r
+  model: Pettanr.License\r
+  url: '/licenses'\r

diff --git a/app/assets/javascripts/models/license_group.js.coffee b/app/assets/javascripts/models/license_group.js.coffee
index b097b38..f0d70f9 100644 (file)
--- a/app/assets/javascripts/models/license_group.js.coffee
+++ b/app/assets/javascripts/models/license_group.js.coffee
@@ -1,15 +1,18 @@
 class Pettanr.LicenseGroup extends Peta.Template\r
-  @single: () ->\r
+  @singular: () ->\r
     'LicenseGroup'\r
   \r
   @plural: () ->\r
     'LicenseGroups'\r
   \r
   defaults: {\r
-    id: 11\r
+    id: null\r
   } \r
   \r
   initialize: () ->\r
-    confirm("Welcome to Panel")\r
+    if @id\r
+      @url = @url + @id\r
   \r
-\r
+class Pettanr.LicenseGroup.Collection extends Backbone.Collection\r
+  model: Pettanr.LicenseGroup\r
+  url: '/license_groups'\r

diff --git a/app/assets/javascripts/models/original_picture.js.coffee b/app/assets/javascripts/models/original_picture.js.coffee
index b1f95aa..5ca58d5 100644 (file)
--- a/app/assets/javascripts/models/original_picture.js.coffee
+++ b/app/assets/javascripts/models/original_picture.js.coffee
@@ -1,15 +1,62 @@
 class Pettanr.OriginalPicture extends Peta.Content\r
-  @single: () ->\r
+  @singular: () ->\r
     'OriginalPicture'\r
   \r
   @plural: () ->\r
     'OriginalPictures'\r
   \r
   defaults: {\r
-    id: 11\r
+    id: null,\r
+    artist_id: nil\r
   } \r
   \r
+  is_visible: (operators) ->\r
+    @is_own(operators)\r
+  \r
+  filename: () ->\r
+    @get('id') + '.' + @get('ext')\r
+  \r
+  mime_type: () ->\r
+    'image/' + @get('ext')\r
+  \r
+  r_url: () ->\r
+    '/original_pictures/' + @filename()\r
+  \r
+  opt_img_tag: () ->\r
+    {src: @r_url(), width: @get('width'), height: @get('height')}\r
+  \r
+  tmb_opt_img_tag: () ->\r
+    wh = Pettanr.Imager.thumbnail_size(@get('width'), @get('height'))\r
+    {src: @r_url(), width: wh[0], height: wh[1]}\r
+  \r
+  symbol_option: () ->\r
+    @tmb_opt_img_tag()\r
+  \r
+  revision: () ->\r
+    head = @history()[0]\r
+    if head\r
+      head.revision()\r
+    else\r
+      'unpublished'\r
+  \r
+  is_unpublished: () ->\r
+    @get('published_at') == null and @get('stopped_at') == null\r
+  \r
+  is_stopped: () ->\r
+    @get('stopped_at') != null\r
+  \r
+  is_unlicensed: () ->\r
+    dt = @get('published_at') || @get('stopped_at')\r
+    return false if not dt\r
+    @get('uploaded_at') > dt\r
+  \r
+  is_published: () ->\r
+    @get('published_at') != null\r
+  \r
   initialize: () ->\r
-    confirm("Welcome to Panel")\r
+    if @id\r
+      @url = @url + @id\r
   \r
-\r
+class Pettanr.OriginalPicture.Collection extends Backbone.Collection\r
+  model: Pettanr.OriginalPicture\r
+  url: '/original_pictures'\r

diff --git a/app/assets/javascripts/models/original_picture_license.js.coffee b/app/assets/javascripts/models/original_picture_license.js.coffee
index 8fc98a4..64726b3 100644 (file)
--- a/app/assets/javascripts/models/original_picture_license.js.coffee
+++ b/app/assets/javascripts/models/original_picture_license.js.coffee
@@ -1,15 +1,18 @@
 class Pettanr.OriginalPictureLicense extends Peta.Item\r
-  @single: () ->\r
+  @singular: () ->\r
     'OriginalPictureLicense'\r
   \r
   @plural: () ->\r
     'OriginalPictureLicenses'\r
   \r
   defaults: {\r
-    id: 11\r
+    id: null\r
   } \r
   \r
   initialize: () ->\r
-    confirm("Welcome to Panel")\r
+    if @id\r
+      @url = @url + @id\r
   \r
-\r
+class Pettanr.OriginalPictureLicense.Collection extends Backbone.Collection\r
+  model: Pettanr.OriginalPictureLicense\r
+  url: '/original_picture_licenses'\r

diff --git a/app/assets/javascripts/models/original_picture_license_group.js.coffee b/app/assets/javascripts/models/original_picture_license_group.js.coffee
index cdd907a..44cdba3 100644 (file)
--- a/app/assets/javascripts/models/original_picture_license_group.js.coffee
+++ b/app/assets/javascripts/models/original_picture_license_group.js.coffee
@@ -1,15 +1,18 @@
 class Pettanr.OriginalPictureLicenseGroup extends Peta.Item\r
-  @single: () ->\r
+  @singular: () ->\r
     'OriginalPictureLicenseGroup'\r
   \r
   @plural: () ->\r
     'OriginalPictureLicenseGroups'\r
   \r
   defaults: {\r
-    id: 11\r
+    id: null\r
   } \r
   \r
   initialize: () ->\r
-    confirm("Welcome to Panel")\r
+    if @id\r
+      @url = @url + @id\r
   \r
-\r
+class Pettanr.OriginalPictureLicenseGroup.Collection extends Backbone.Collection\r
+  model: Pettanr.OriginalPictureLicenseGroup\r
+  url: '/original_picture_license_groups'\r

diff --git a/app/assets/javascripts/models/panel.js.coffee b/app/assets/javascripts/models/panel.js.coffee
index 8b5dfc6..fcba03b 100644 (file)
--- a/app/assets/javascripts/models/panel.js.coffee
+++ b/app/assets/javascripts/models/panel.js.coffee
@@ -6,10 +6,15 @@ class Pettanr.Panel extends Peta.Root
     'Panels'\r
   \r
   defaults: {\r
-    id: 11\r
+    id: null,\r
+    border: 2,\r
+    publish: 0\r
   } \r
   \r
   initialize: () ->\r
-    confirm("Welcome to Panel")\r
+    if @id\r
+      @url = @url + @id\r
   \r
-\r
+class Pettanr.Panel.Collection extends Backbone.Collection\r
+  model: Pettanr.Panel\r
+  url: '/panels'\r

diff --git a/app/assets/javascripts/models/panel_picture.js.coffee b/app/assets/javascripts/models/panel_picture.js.coffee
index 86d9642..794797c 100644 (file)
--- a/app/assets/javascripts/models/panel_picture.js.coffee
+++ b/app/assets/javascripts/models/panel_picture.js.coffee
@@ -1,18 +1,68 @@
 class Pettanr.PanelPicture extends Peta.Element\r
-  @single: () ->\r
+  @singular: () ->\r
     'PanelPicture'\r
   \r
   @plural: () ->\r
     'PanelPictures'\r
   \r
-  @colum_structures: ->\r
-    {}\r
-  \r
   defaults: {\r
-    x: 11\r
+    id: null\r
   } \r
   \r
+  @has_picture: () ->\r
+    true\r
+  \r
+  flip: () ->\r
+    v = if @get('height') > 0\r
+      ''\r
+    else\r
+      'v'\r
+    h = if @get('width') > 0\r
+      ''\r
+    else\r
+      'h'\r
+    res = v + h\r
+    res = res # format of /1.png?subdir=v\r
+    # res += '/' unless res.empty? # format of /v/1.png\r
+    res\r
+  \r
+  filename: () ->\r
+    @picture().filename() + '?subdir=' + @flip()\r
+  \r
+  r_url: () ->\r
+    '/pictures/' + @filename()\r
+  \r
+  opt_div_style: () ->\r
+    "top:#{@get('y')}px; left:#{@get('x')}px; z-index:#{@get('z')}; position: absolute;"\r
+  \r
+  opt_img_tag: (spot = null, opacity = 20) ->\r
+    o = if spot and spot != this\r
+      "opacity: #{opacity.to_f/100}; filter:alpha(opacity=#{opacity});"\r
+    else\r
+      ''\r
+    @tag_attributes('img', {\r
+      class: "panel-picture", \r
+      vPicture: @get('id'), \r
+      src: @r_url(), \r
+      width: Math.abs(@get('width')), \r
+      height: Math.abs(@get('height')), \r
+      picture_id: @get('picture_id'), \r
+      ext: @picture.ext, \r
+      alt: @get('caption'), \r
+      style: "#{o}"\r
+    })\r
+  \r
+  tmb_opt_img_tag: () ->\r
+    wh = Pettanr.Imager.thumbnail_size(@get('width'), @get('height'))\r
+    {src: @r_url(), width: Math.abs(wh[0]), height: Math.abs(wh[1]), alt: @get('caption')}\r
+  \r
+  symbol_option: () ->\r
+    @picture().symbol_option()\r
+  \r
   initialize: () ->\r
-    confirm("Welcome to this world")\r
+    if @id\r
+      @url = @url + @id\r
   \r
-\r
+class Pettanr.PanelPicture.Collection extends Backbone.Collection\r
+  model: Pettanr.PanelPicture\r
+  url: '/panel_pictures'\r

diff --git a/app/assets/javascripts/models/picture.js.coffee b/app/assets/javascripts/models/picture.js.coffee
index 27503a8..ed592ff 100644 (file)
--- a/app/assets/javascripts/models/picture.js.coffee
+++ b/app/assets/javascripts/models/picture.js.coffee
@@ -1,14 +1,81 @@
 class Pettanr.Picture extends Peta.Content\r
-  @single: () ->\r
+  @singular: () ->\r
     'Picture'\r
   \r
   @plural: () ->\r
     'Pictures'\r
   \r
   defaults: {\r
-    id: 11\r
+    id: null\r
   } \r
   \r
+  is_visible: (operators) ->\r
+    return true\r
+  \r
+  filename: () ->\r
+    @get('id') + '.' + @get('ext')\r
+  \r
+  gifname: () ->\r
+    @get('id') + '.gif'\r
+  \r
+  mime_type: () ->\r
+    'image/' + @get('ext')\r
+  \r
+  r_url: () ->\r
+    '/pictures/' + @filename()\r
+  \r
+  opt_img_tag: () ->\r
+    {src: @r_url(), width: @get('width'), height: @get('height')}\r
+  \r
+  tmb_opt_img_tag: () ->\r
+    wh = Pettanr.Imager.thumbnail_size(@get('width'), @get('height'))\r
+    {src: @r_url(), width: wh[0], height: wh[1]}\r
+  \r
+  tail_opt_img_tag: (img) ->\r
+    {src: img, width: @get('width'), height: @get('height')}\r
+  \r
+  tail_tmb_opt_img_tag: (img) ->\r
+    wh = Pettanr.Imager.thumbnail_size(@get('width'), @get('height'))\r
+    {src: img, width: wh[0], height: wh[1]}\r
+  \r
+  alt_name: () ->\r
+    lgn = Pettanr.to_s(@license().license_group().get('caption'))\r
+    ln = Pettanr.to_s(@license().get('caption'))\r
+    lgn + '[' + ln + ']'\r
+  \r
+  symbol_option: () ->\r
+    @tmb_opt_img_tag()\r
+  \r
+  is_enable: () ->\r
+    if @head().resource_picture()\r
+      true\r
+    else\r
+      false\r
+  \r
+  @head: (opid) ->\r
+    #Picture.find( conditions => ['original_picture_id = ?', opid], :order => 'pictures.revision desc')\r
+  \r
+  head: () ->\r
+    Picture.head(@get('original_picture_id'))\r
+  \r
+  is_head: () ->\r
+    #this == @head()\r
+  \r
+  subdirs: () ->\r
+    if @license_extend().reverse < 0\r
+      ['']\r
+    else\r
+      ['', 'v', 'h', 'vh']\r
+  \r
+  is_showable: (operators = null) ->\r
+    return false if not @original_picture()\r
+    return true if @is_own(operators)\r
+    #@is_enable() and @is_head()\r
+  \r
   initialize: () ->\r
-    confirm("Welcome to Panel")\r
-\r
+    if @id\r
+      @url = @url + @id\r
+  \r
+class Pettanr.Picture.Collection extends Backbone.Collection\r
+  model: Pettanr.Picture\r
+  url: '/pictures'\r

diff --git a/app/assets/javascripts/models/resource_picture.js.coffee b/app/assets/javascripts/models/resource_picture.js.coffee
index 0a531b3..2d5b454 100644 (file)
--- a/app/assets/javascripts/models/resource_picture.js.coffee
+++ b/app/assets/javascripts/models/resource_picture.js.coffee
@@ -1,15 +1,52 @@
 class Pettanr.ResourcePicture extends Peta.Content\r
-  @single: () ->\r
+  @singular: () ->\r
     'ResourcePicture'\r
   \r
   @plural: () ->\r
     'ResourcePictures'\r
   \r
   defaults: {\r
-    id: 11\r
+    id: null\r
   } \r
   \r
+  is_visible: (operators) ->\r
+    @is_user_visible(operators)\r
+  \r
+  filename: () ->\r
+    @get('id') + '.' + @get('ext')\r
+  \r
+  gifname: () ->\r
+    @get('id') + '.gif'\r
+  \r
+  mime_type: () ->\r
+    'image/' + @get('ext')\r
+  \r
+  r_url: (subdir = null) ->\r
+    opt = if Pettanr.to_s(@subdir).empty\r
+      ''\r
+    else\r
+      '?subdir=' + Pettanr.to_s(subdir)\r
+    '/resource_pictures/' + @filename() + opt\r
+  \r
+  tmb_opt_img_tag: () ->\r
+    wh = Pettanr.Imager.thumbnail_size(@get('width'), @get('height'))\r
+    {src: @r_url(), width: wh[0], height: wh[1]}\r
+  \r
+  opt_img_tag: () ->\r
+    {src: @url('full'), width: @get('width'), height: @get('height')}\r
+  \r
+  alt_name: () ->\r
+    lgn = Pettanr.to_s(@license().license_group().get('caption'))\r
+    ln = Pettanr.to_s(@license().get('caption'))\r
+    lgn + '[' + ln + ']'\r
+  \r
+  symbol_option: () ->\r
+    @tmb_opt_img_tag()\r
+  \r
   initialize: () ->\r
-    confirm("Welcome to Panel")\r
+    if @id\r
+      @url = @url + @id\r
   \r
-\r
+class Pettanr.ResourcePicture.Collection extends Backbone.Collection\r
+  model: Pettanr.ResourcePicture\r
+  url: '/resource_pictures'\r

diff --git a/app/assets/javascripts/models/scroll_panel.js.coffee b/app/assets/javascripts/models/scroll_panel.js.coffee
index 96debaf..6224126 100644 (file)
--- a/app/assets/javascripts/models/scroll_panel.js.coffee
+++ b/app/assets/javascripts/models/scroll_panel.js.coffee
@@ -1,7 +1,7 @@
 class Pettanr.ScrollPanel extends Peta.Leaf\r
   url: ''\r
   \r
-  @single: () ->\r
+  @singular: () ->\r
     'ScrollPanel'\r
   \r
   @plural: () ->\r
@@ -9,6 +9,9 @@ class Pettanr.ScrollPanel extends Peta.Leaf
   \r
   defaults: {\r
     id: null,\r
+    scroll_id: null,\r
+    panel_id: null,\r
+    t: null\r
   } \r
   \r
   initialize: () ->\r

diff --git a/app/assets/javascripts/models/sheet.js.coffee b/app/assets/javascripts/models/sheet.js.coffee
index 28cc944..1a5ef07 100644 (file)
--- a/app/assets/javascripts/models/sheet.js.coffee
+++ b/app/assets/javascripts/models/sheet.js.coffee
@@ -1,15 +1,29 @@
 class Pettanr.Sheet extends Peta.Root\r
-  @single: () ->\r
+  @singular: () ->\r
     'Sheet'\r
   \r
   @plural: () ->\r
     'Sheets'\r
   \r
   defaults: {\r
-    id: 11\r
+    id: null,\r
+    visible: 0,\r
+    author_id: null\r
   } \r
   \r
+  is_visible: (operators) ->\r
+    switch super(operators)\r
+      when null\r
+        return true\r
+      when false\r
+        return false\r
+      else\r
+        @get('visible') > 0\r
+  \r
   initialize: () ->\r
-    confirm("Welcome to Panel")\r
+    if @id\r
+      @url = @url + @id\r
   \r
-\r
+class Pettanr.Sheet.Collection extends Backbone.Collection\r
+  model: Pettanr.Sheet\r
+  url: '/sheets'\r

diff --git a/app/assets/javascripts/models/sheet_panel.js.coffee b/app/assets/javascripts/models/sheet_panel.js.coffee
index 4e75dd3..4a8b709 100644 (file)
--- a/app/assets/javascripts/models/sheet_panel.js.coffee
+++ b/app/assets/javascripts/models/sheet_panel.js.coffee
@@ -1,15 +1,24 @@
 class Pettanr.SheetPanel extends Peta.Leaf\r
-  @single: () ->\r
+  @singular: () ->\r
     'SheetPanel'\r
   \r
   @plural: () ->\r
     'SheetPanels'\r
   \r
   defaults: {\r
-    id: 11\r
+    id: null,\r
+    x: 15,\r
+    y: 15,\r
+    sheet_id: null,\r
+    panel_id: null,\r
+    z: 1,\r
+    t: null\r
   } \r
   \r
   initialize: () ->\r
-    confirm("Welcome to Panel")\r
+    if @id\r
+      @url = @url + @id\r
   \r
-\r
+class Pettanr.SheetPanel.Collection extends Backbone.Collection\r
+  model: Pettanr.SheetPanel\r
+  url: '/sheet_panels'\r

diff --git a/app/assets/javascripts/models/speech.js.coffee b/app/assets/javascripts/models/speech.js.coffee
index 4e26b4f..7c158fd 100644 (file)
--- a/app/assets/javascripts/models/speech.js.coffee
+++ b/app/assets/javascripts/models/speech.js.coffee
@@ -1,18 +1,44 @@
-class Pettanr.SpeechBalloon extends Peta.Element\r
-  @single: () ->\r
+class Pettanr.Speech extends Peta.Element\r
+  @singular: () ->\r
     'Speech'\r
   \r
   @plural: () ->\r
     'Speeches'\r
   \r
-  @colum_structures: ->\r
-    {}\r
-  \r
   defaults: {\r
-    x: 11\r
+    id: null,\r
+    x: 0,\r
+    y: 0,\r
+    width: 100,\r
+    height: 100\r
   } \r
   \r
+  @text_align_texts: () -> \r
+    ['left', 'left', 'right', 'center']\r
+  \r
+  symbol_option: () ->\r
+    @speech_balloon().speech_balloon_template().symbol_option()\r
+  \r
+  outer_style: () ->\r
+    {\r
+      top: @get('y'), left: @get('x'), \r
+      width: @get('width'), height: @get('height')\r
+    }\r
+  \r
+  inner_style: () ->\r
+    {\r
+      'font-size': Pettanr.to_s(@get('font_size')) + 'em',\r
+      'text-align': @text_align_text(), \r
+      color: '#' + ('000000' + Pettanr.to_s(@get('fore_color'))).slice(-6)\r
+    }\r
+  \r
+  text_align_text: () ->\r
+    Pettanr.Speech.text_align_texts()[@get('text_align')]\r
+  \r
   initialize: () ->\r
-    confirm("Welcome to this world")\r
+    if @id\r
+      @url = @url + @id\r
   \r
-\r
+class Pettanr.Speech.Collection extends Backbone.Collection\r
+  model: Pettanr.Speech\r
+  url: '/Speeches'\r

diff --git a/app/assets/javascripts/models/speech_balloon.js.coffee b/app/assets/javascripts/models/speech_balloon.js.coffee
index 1d0f0a5..e1dc8ce 100644 (file)
--- a/app/assets/javascripts/models/speech_balloon.js.coffee
+++ b/app/assets/javascripts/models/speech_balloon.js.coffee
@@ -1,18 +1,26 @@
 class Pettanr.SpeechBalloon extends Peta.Element\r
-  @single: () ->\r
+  @singular: () ->\r
     'SpeechBalloon'\r
   \r
   @plural: () ->\r
     'SpeechBalloons'\r
   \r
-  @colum_structures: ->\r
-    {}\r
-  \r
   defaults: {\r
-    x: 11\r
+    id: null,\r
+    z: null,\r
+    t: null\r
   } \r
   \r
+  @has_picture: () ->\r
+    false\r
+  \r
+  @symbol_option: () ->\r
+    @speech_balloon_template.symbol_option\r
+  \r
   initialize: () ->\r
-    confirm("Welcome to this world")\r
+    if @id\r
+      @url = @url + @id\r
   \r
-\r
+class Pettanr.SpeechBalloon.Collection extends Backbone.Collection\r
+  model: Pettanr.SpeechBalloon\r
+  url: '/speech_balloons'\r

diff --git a/app/assets/javascripts/models/speech_balloon_template.js.coffee b/app/assets/javascripts/models/speech_balloon_template.js.coffee
index dcf4c9f..f86a167 100644 (file)
--- a/app/assets/javascripts/models/speech_balloon_template.js.coffee
+++ b/app/assets/javascripts/models/speech_balloon_template.js.coffee
@@ -1,2 +1,40 @@
 class Pettanr.SpeechBalloonTemplate extends Peta.Template\r
-\r
+  relations: [{\r
+    type: Backbone.HasMany,\r
+    key: 'speech_balloons',\r
+    relatedModel: 'SpeechBalloon',\r
+    collectionType: 'SpeechBalloonCollection',\r
+    reverseRelation: {\r
+      key: 'livesIn',\r
+      includeInJSON: 'id'\r
+    }\r
+  }]\r
+  \r
+  @singular: () ->\r
+    'SpeechBalloonTemplate'\r
+  \r
+  @plural: () ->\r
+    'SpeechBalloonTemplates'\r
+  \r
+  defaults: {\r
+    id: null\r
+  } \r
+  \r
+  get_system_picture: () ->\r
+    new Pettanr.SystemPicture({id: @get('system_picture_id')})\r
+  \r
+  symbol_option: () ->\r
+    _this = this\r
+    r = @get_system_picture()\r
+    r.fetch({}).done () ->\r
+      _this.system_picture = r\r
+      _this.system_picture.tmb_opt_img_tag()\r
+  \r
+  initialize: () ->\r
+    if @id\r
+      @url = @url + @id\r
+    @system_picture = null\r
+  \r
+class Pettanr.SpeechBalloonTemplate.Collection extends Backbone.Collection\r
+  model: Pettanr.SpeechBalloonTemplate\r
+  url: '/speech_balloon_templates'\r

diff --git a/app/assets/javascripts/models/story.js.coffee b/app/assets/javascripts/models/story.js.coffee
index 6ab4cf1..a67d8ae 100644 (file)
--- a/app/assets/javascripts/models/story.js.coffee
+++ b/app/assets/javascripts/models/story.js.coffee
@@ -1,15 +1,29 @@
 class Pettanr.Story extends Peta.Binder\r
-  @single: () ->\r
+  @singular: () ->\r
     'Story'\r
   \r
   @plural: () ->\r
     'Stories'\r
   \r
   defaults: {\r
-    id: 11\r
+    id: null,\r
+    visible: 0,\r
+    author_id: null\r
   } \r
   \r
+  is_visible: (operators) ->\r
+    switch super(operators)\r
+      when null\r
+        return true\r
+      when false\r
+        return false\r
+      else\r
+        @get('visible') > 0\r
+  \r
   initialize: () ->\r
-    confirm("Welcome to Panel")\r
+    if @id\r
+      @url = @url + @id\r
   \r
-\r
+class Pettanr.Story.Collection extends Backbone.Collection\r
+  model: Pettanr.Story\r
+  url: '/stories'\r

diff --git a/app/assets/javascripts/models/story_sheet.js.coffee b/app/assets/javascripts/models/story_sheet.js.coffee
index 6e055f9..eb24b8c 100644 (file)
--- a/app/assets/javascripts/models/story_sheet.js.coffee
+++ b/app/assets/javascripts/models/story_sheet.js.coffee
@@ -1,15 +1,21 @@
 class Pettanr.StorySheet extends Peta.Leaf\r
-  @single: () ->\r
+  @singular: () ->\r
     'StorySheet'\r
   \r
   @plural: () ->\r
     'StorySheets'\r
   \r
   defaults: {\r
-    id: 11\r
+    id: null,\r
+    story_id: null,\r
+    sheet_id: null,\r
+    t: null\r
   } \r
   \r
   initialize: () ->\r
-    confirm("Welcome to Panel")\r
+    if @id\r
+      @url = @url + @id\r
   \r
-\r
+class Pettanr.StorySheet.Collection extends Backbone.Collection\r
+  model: Pettanr.StorySheet\r
+  url: '/story_sheets'\r

diff --git a/app/assets/javascripts/models/system_picture.js.coffee b/app/assets/javascripts/models/system_picture.js.coffee
index 6e08cac..debf30b 100644 (file)
--- a/app/assets/javascripts/models/system_picture.js.coffee
+++ b/app/assets/javascripts/models/system_picture.js.coffee
@@ -1 +1,38 @@
 class Pettanr.SystemPicture extends Peta.SystemResource\r
+  url: '/system_pictures/'\r
+  @singular: () ->\r
+    'SystemPicture'\r
+  \r
+  @plural: () ->\r
+    'SystemPictures'\r
+  \r
+  defaults: {\r
+    id: null\r
+  } \r
+  \r
+  filename: () ->\r
+    @get('id') + '.' + @get('ext')\r
+  \r
+  mime_type: () ->\r
+    'image/' + @get('ext')\r
+  \r
+  r_url: () ->\r
+    '/system_pictures/' + @filename()\r
+  \r
+  opt_img_tag: () ->\r
+    {src: @r_url(), width: @get('width'), height: @get('height')}\r
+  \r
+  tmb_opt_img_tag: () ->\r
+    wh = Pettanr.Imager.thumbnail_size(@get('width'), @get('height'))\r
+    {src: @r_url(), width: wh[0], height: wh[1]}\r
+  \r
+  symbol_option: () ->\r
+    @tmb_opt_img_tag()\r
+  \r
+  initialize: () ->\r
+    if @id\r
+      @url = @url + @id\r
+  \r
+class Pettanr.SystemPicture.Collection extends Backbone.Collection\r
+  model: Pettanr.SystemPicture\r
+  url: '/system_pictures'\r

diff --git a/app/assets/javascripts/models/user.js.coffee b/app/assets/javascripts/models/user.js.coffee
index 469fde4..ab77bd0 100644 (file)
--- a/app/assets/javascripts/models/user.js.coffee
+++ b/app/assets/javascripts/models/user.js.coffee
@@ -14,3 +14,6 @@ class Pettanr.User extends Backbone.Model
     if @id\r
       @url = @url + @id\r
   \r
+class Pettanr.User.Collection extends Backbone.Collection\r
+  model: Pettanr.User\r
+  url: '/users'\r

diff --git a/app/assets/javascripts/models/writing_format.js.coffee b/app/assets/javascripts/models/writing_format.js.coffee
index bd85d8e..f5fb137 100644 (file)
--- a/app/assets/javascripts/models/writing_format.js.coffee
+++ b/app/assets/javascripts/models/writing_format.js.coffee
@@ -1,2 +1,19 @@
 class Pettanr.WritingFormat extends Peta.Template\r
+  @singular: () ->\r
+    'WritingFormat'\r
+  \r
+  @plural: () ->\r
+    'WritingFormats'\r
+  \r
+  defaults: {\r
+    id: null\r
+  } \r
+  \r
+  initialize: () ->\r
+    if @id\r
+      @url = @url + @id\r
+  \r
+class Pettanr.WritingFormat.Collection extends Backbone.Collection\r
+  model: Pettanr.WritingFormat\r
+  url: '/writing_formats'\r
 \r

diff --git a/app/assets/javascripts/pettanr/pettan_imager.js.coffee b/app/assets/javascripts/pettanr/pettan_imager.js.coffee
new file mode 100644 (file)
index 0000000..8eacb89
--- /dev/null
+++ b/app/assets/javascripts/pettanr/pettan_imager.js.coffee
@@ -0,0 +1,21 @@
+class Pettanr.Imager
+  @thumbnail_size: (w, h) ->
+    lw = Manifest.manifest().magic_numbers['thumbnail_width']
+    lh = Manifest.manifest().magic_numbers['thumbnail_height']
+    Pettanr.Imager.fix_size_both lw, lh, w, h
+  
+  @fix_size_both: (limw, limh, w, h)->
+    wr = if w > limw
+      limw*100/w
+    else
+      100
+    hr = if h > limh
+      limh*100/h
+    else
+      100
+    r = if wr < hr
+      [w*wr/100, h*wr/100]
+    else
+      [w*hr/100, h*hr/100]
+    r
+  

diff --git a/app/assets/javascripts/routes.js.coffee b/app/assets/javascripts/routes.js.coffee
index 40e91e6..7599fe2 100644 (file)
--- a/app/assets/javascripts/routes.js.coffee
+++ b/app/assets/javascripts/routes.js.coffee
@@ -6,9 +6,6 @@ class Pettanr.Router extends Backbone.Router
   \r
   show_html_format: (format) -> \r
   \r
-  folders_show: (id) ->\r
-    console.log(controller_name)\r
-  \r
   count: () ->\r
   \r
   new: () ->\r
@@ -37,7 +34,7 @@ class Pettanr.Router extends Backbone.Router
     _this = this\r
     _.each _.flatten(names), (status) ->\r
       _status = status\r
-      f = switch status.action_manifest.type\r
+      switch status.action_manifest.type\r
         when 'list'\r
           _this[status.event_name] = () ->\r
             _status.controller[_status.action_name]()\r
@@ -49,9 +46,9 @@ class Pettanr.Router extends Backbone.Router
         when 'show'\r
           _this[status.event_name] = (id) ->\r
             _status.controller[_status.action_name](id)\r
-          r = _status.controller_name + '/:id/' + _status.action_name\r
+          r = '^' + _status.controller_name + '\/([0-9]+)\/' + _status.action_name + '$'\r
           _this.route(r, _status.event_name)\r
           if _status.action_name == 'show'\r
-            r = _status.controller_name + '/:id'\r
-            _this.route(r, _status.event_name)\r
+            r = '^' + _status.controller_name + '\/([0-9]+)$'\r
+            _this.route(///#{r}///, _status.event_name)\r
 \r

diff --git a/app/views/top/ap.html.erb b/app/views/top/ap.html.erb
index 26ad54c..4621509 100644 (file)
--- a/app/views/top/ap.html.erb
+++ b/app/views/top/ap.html.erb
@@ -124,6 +124,9 @@
 \r
 <script type="text/template" id="folders-summary">\r
 </script>\r
+<script type="text/template" id="scrolls-show">\r
+show\r
+</script>\r
 <script type="text/template" id="scrolls-summary">\r
 </script>\r
 <script type="text/template" id="scroll_panels-summary">\r