From 2e1fe642e8bf2e237f6bcfb605d4d26da96fe2e9 Mon Sep 17 00:00:00 2001 From: yasushiito Date: Mon, 18 Aug 2014 14:05:13 +0900 Subject: [PATCH] fix: js models --- Gemfile | 1 + app/assets/javascripts/ap.js | 4 +- .../{admin.js.coffee => admins.js.coffee} | 0 .../{artist.js.coffee => artists.js.coffee} | 0 .../javascripts/controllers/author.js.coffee | 19 ------ .../javascripts/controllers/authors.js.coffee | 7 ++ .../javascripts/controllers/balloon.js.coffee | 2 - .../javascripts/controllers/balloons.js.coffee | 6 ++ app/assets/javascripts/controllers/comic.js.coffee | 15 ----- .../controllers/comic_stories.js.coffee | 14 +--- .../javascripts/controllers/comics.js.coffee | 6 ++ .../javascripts/controllers/demander.js.coffee | 9 --- .../javascripts/controllers/demanders.js.coffee | 6 ++ .../javascripts/controllers/folders.js.coffee | 3 + .../javascripts/controllers/ground_color.js.coffee | 2 - .../controllers/ground_colors.js.coffee | 6 ++ .../controllers/ground_picture.js.coffee | 15 ----- .../controllers/ground_pictures.js.coffee | 6 ++ .../javascripts/controllers/license.js.coffee | 15 ----- .../controllers/license_group.js.coffee | 15 ----- .../controllers/license_groups.js.coffee | 6 ++ .../javascripts/controllers/licenses.js.coffee | 6 ++ .../controllers/original_picture.js.coffee | 15 ----- .../controllers/original_picture_license.js.coffee | 15 ----- .../original_picture_license_group.js.coffee | 15 ----- .../original_picture_license_groups.js.coffee | 7 ++ .../original_picture_licenses.js.coffee | 6 ++ .../controllers/original_pictures.js.coffee | 6 ++ app/assets/javascripts/controllers/panel.js.coffee | 15 ----- .../controllers/panel_picture.js.coffee | 18 ------ .../controllers/panel_pictures.js.coffee | 6 ++ .../javascripts/controllers/panels.js.coffee | 6 ++ .../javascripts/controllers/picture.js.coffee | 14 ---- .../javascripts/controllers/pictures.js.coffee | 6 ++ .../controllers/resource_picture.js.coffee | 15 ----- .../controllers/resource_pictures.js.coffee | 6 ++ .../javascripts/controllers/scroll_panel.js.coffee | 15 ----- .../controllers/scroll_panels.js.coffee | 6 ++ .../{scroll.js.coffee => scrolls.js.coffee} | 5 +- app/assets/javascripts/controllers/sheet.js.coffee | 15 ----- .../javascripts/controllers/sheet_panel.js.coffee | 15 ----- .../javascripts/controllers/sheet_panels.js.coffee | 6 ++ .../javascripts/controllers/sheets.js.coffee | 6 ++ .../javascripts/controllers/speech.js.coffee | 18 ------ .../controllers/speech_balloon.js.coffee | 18 ------ .../controllers/speech_balloon_template.js.coffee | 2 - .../controllers/speech_balloon_templates.js.coffee | 6 ++ .../controllers/speech_balloons.js.coffee | 6 ++ .../javascripts/controllers/speeches.js.coffee | 6 ++ .../javascripts/controllers/stories.js.coffee | 6 ++ app/assets/javascripts/controllers/story.js.coffee | 15 ----- .../javascripts/controllers/story_sheet.js.coffee | 15 ----- .../javascripts/controllers/story_sheets.js.coffee | 6 ++ .../controllers/system_picture.js.coffee | 1 - .../controllers/system_pictures.js.coffee | 6 ++ app/assets/javascripts/controllers/user.js.coffee | 16 ----- app/assets/javascripts/controllers/users.js.coffee | 6 ++ .../controllers/writing_format.js.coffee | 2 - .../controllers/writing_formats.js.coffee | 6 ++ .../caption/default/link/url_column.js.coffee | 2 +- .../symbol/default/face/picture.js.coffee | 6 +- .../symbol/default/link/url_column.js.coffee | 2 +- app/assets/javascripts/manifest/manifest.js.coffee | 2 +- app/assets/javascripts/models/admin.js.coffee | 6 +- app/assets/javascripts/models/author.js.coffee | 6 +- app/assets/javascripts/models/balloon.js.coffee | 36 +++++++++++ app/assets/javascripts/models/comic.js.coffee | 24 +++++-- .../javascripts/models/comic_story.js.coffee | 30 +++++++++ .../javascripts/models/ground_color.js.coffee | 71 +++++++++++++++++++- .../javascripts/models/ground_picture.js.coffee | 50 +++++++++++++-- app/assets/javascripts/models/license.js.coffee | 19 ++++-- .../javascripts/models/license_group.js.coffee | 11 ++-- .../javascripts/models/original_picture.js.coffee | 55 ++++++++++++++-- .../models/original_picture_license.js.coffee | 11 ++-- .../original_picture_license_group.js.coffee | 11 ++-- app/assets/javascripts/models/panel.js.coffee | 11 +++- .../javascripts/models/panel_picture.js.coffee | 64 ++++++++++++++++-- app/assets/javascripts/models/picture.js.coffee | 75 ++++++++++++++++++++-- .../javascripts/models/resource_picture.js.coffee | 45 +++++++++++-- .../javascripts/models/scroll_panel.js.coffee | 5 +- app/assets/javascripts/models/sheet.js.coffee | 22 +++++-- .../javascripts/models/sheet_panel.js.coffee | 17 +++-- app/assets/javascripts/models/speech.js.coffee | 42 +++++++++--- .../javascripts/models/speech_balloon.js.coffee | 22 +++++-- .../models/speech_balloon_template.js.coffee | 40 +++++++++++- app/assets/javascripts/models/story.js.coffee | 22 +++++-- .../javascripts/models/story_sheet.js.coffee | 14 ++-- .../javascripts/models/system_picture.js.coffee | 37 +++++++++++ app/assets/javascripts/models/user.js.coffee | 3 + .../javascripts/models/writing_format.js.coffee | 17 +++++ .../javascripts/pettanr/pettan_imager.js.coffee | 21 ++++++ app/assets/javascripts/routes.js.coffee | 11 ++-- app/views/top/ap.html.erb | 3 + 93 files changed, 885 insertions(+), 444 deletions(-) rename app/assets/javascripts/controllers/{admin.js.coffee => admins.js.coffee} (100%) rename app/assets/javascripts/controllers/{artist.js.coffee => artists.js.coffee} (100%) delete mode 100644 app/assets/javascripts/controllers/author.js.coffee create mode 100644 app/assets/javascripts/controllers/authors.js.coffee delete mode 100644 app/assets/javascripts/controllers/balloon.js.coffee create mode 100644 app/assets/javascripts/controllers/balloons.js.coffee delete mode 100644 app/assets/javascripts/controllers/comic.js.coffee create mode 100644 app/assets/javascripts/controllers/comics.js.coffee delete mode 100644 app/assets/javascripts/controllers/demander.js.coffee create mode 100644 app/assets/javascripts/controllers/demanders.js.coffee delete mode 100644 app/assets/javascripts/controllers/ground_color.js.coffee create mode 100644 app/assets/javascripts/controllers/ground_colors.js.coffee delete mode 100644 app/assets/javascripts/controllers/ground_picture.js.coffee create mode 100644 app/assets/javascripts/controllers/ground_pictures.js.coffee delete mode 100644 app/assets/javascripts/controllers/license.js.coffee delete mode 100644 app/assets/javascripts/controllers/license_group.js.coffee create mode 100644 app/assets/javascripts/controllers/license_groups.js.coffee create mode 100644 app/assets/javascripts/controllers/licenses.js.coffee delete mode 100644 app/assets/javascripts/controllers/original_picture.js.coffee delete mode 100644 app/assets/javascripts/controllers/original_picture_license.js.coffee delete mode 100644 app/assets/javascripts/controllers/original_picture_license_group.js.coffee create mode 100644 app/assets/javascripts/controllers/original_picture_license_groups.js.coffee create mode 100644 app/assets/javascripts/controllers/original_picture_licenses.js.coffee create mode 100644 app/assets/javascripts/controllers/original_pictures.js.coffee delete mode 100644 app/assets/javascripts/controllers/panel.js.coffee delete mode 100644 app/assets/javascripts/controllers/panel_picture.js.coffee create mode 100644 app/assets/javascripts/controllers/panel_pictures.js.coffee create mode 100644 app/assets/javascripts/controllers/panels.js.coffee delete mode 100644 app/assets/javascripts/controllers/picture.js.coffee create mode 100644 app/assets/javascripts/controllers/pictures.js.coffee delete mode 100644 app/assets/javascripts/controllers/resource_picture.js.coffee create mode 100644 app/assets/javascripts/controllers/resource_pictures.js.coffee delete mode 100644 app/assets/javascripts/controllers/scroll_panel.js.coffee create mode 100644 app/assets/javascripts/controllers/scroll_panels.js.coffee rename app/assets/javascripts/controllers/{scroll.js.coffee => scrolls.js.coffee} (87%) delete mode 100644 app/assets/javascripts/controllers/sheet.js.coffee delete mode 100644 app/assets/javascripts/controllers/sheet_panel.js.coffee create mode 100644 app/assets/javascripts/controllers/sheet_panels.js.coffee create mode 100644 app/assets/javascripts/controllers/sheets.js.coffee delete mode 100644 app/assets/javascripts/controllers/speech.js.coffee delete mode 100644 app/assets/javascripts/controllers/speech_balloon.js.coffee delete mode 100644 app/assets/javascripts/controllers/speech_balloon_template.js.coffee create mode 100644 app/assets/javascripts/controllers/speech_balloon_templates.js.coffee create mode 100644 app/assets/javascripts/controllers/speech_balloons.js.coffee create mode 100644 app/assets/javascripts/controllers/speeches.js.coffee create mode 100644 app/assets/javascripts/controllers/stories.js.coffee delete mode 100644 app/assets/javascripts/controllers/story.js.coffee delete mode 100644 app/assets/javascripts/controllers/story_sheet.js.coffee create mode 100644 app/assets/javascripts/controllers/story_sheets.js.coffee delete mode 100644 app/assets/javascripts/controllers/system_picture.js.coffee create mode 100644 app/assets/javascripts/controllers/system_pictures.js.coffee delete mode 100644 app/assets/javascripts/controllers/user.js.coffee create mode 100644 app/assets/javascripts/controllers/users.js.coffee delete mode 100644 app/assets/javascripts/controllers/writing_format.js.coffee create mode 100644 app/assets/javascripts/controllers/writing_formats.js.coffee create mode 100644 app/assets/javascripts/models/comic_story.js.coffee create mode 100644 app/assets/javascripts/pettanr/pettan_imager.js.coffee diff --git a/Gemfile b/Gemfile index 77dce6c1..8f227314 100644 --- 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 51620236..c516859b 100644 --- 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 index ee7c3f98..00000000 --- a/app/assets/javascripts/controllers/author.js.coffee +++ /dev/null @@ -1,19 +0,0 @@ -class Pettanr.AuthorsController extends Pettanr.AppController - url: '/authors/' - - @singular: () -> - 'Author' - - @plural: () -> - 'Authors' - - defaults: { - id: null, - name: 'no name' - } - - initialize: () -> - if @id - @url = @url + @id - - diff --git a/app/assets/javascripts/controllers/authors.js.coffee b/app/assets/javascripts/controllers/authors.js.coffee new file mode 100644 index 00000000..9f49b53d --- /dev/null +++ b/app/assets/javascripts/controllers/authors.js.coffee @@ -0,0 +1,7 @@ +class Pettanr.AuthorsController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.Author.Collection({}) + new Pettanr.FilerRender('author', list_result, 'default', window.operators) + + diff --git a/app/assets/javascripts/controllers/balloon.js.coffee b/app/assets/javascripts/controllers/balloon.js.coffee deleted file mode 100644 index 4e4d8e3c..00000000 --- a/app/assets/javascripts/controllers/balloon.js.coffee +++ /dev/null @@ -1,2 +0,0 @@ -class Pettanr.BalloonsController extends Pettanr.AppController - diff --git a/app/assets/javascripts/controllers/balloons.js.coffee b/app/assets/javascripts/controllers/balloons.js.coffee new file mode 100644 index 00000000..62dfcda6 --- /dev/null +++ b/app/assets/javascripts/controllers/balloons.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.BalloonsController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.Balloon.Collection({}) + new Pettanr.FilerRender('balloon', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/comic.js.coffee b/app/assets/javascripts/controllers/comic.js.coffee deleted file mode 100644 index 556d3dcf..00000000 --- a/app/assets/javascripts/controllers/comic.js.coffee +++ /dev/null @@ -1,15 +0,0 @@ -class Pettanr.ComicsController extends Pettanr.AppController - @single: () -> - 'Comic' - - @plural: () -> - 'Comics' - - defaults: { - id: 11 - } - - initialize: () -> - confirm("Welcome to Panel") - - diff --git a/app/assets/javascripts/controllers/comic_stories.js.coffee b/app/assets/javascripts/controllers/comic_stories.js.coffee index e6760692..3dbf8b74 100644 --- 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 - @single: () -> - 'ComicStory' - @plural: () -> - 'ComicStories' + index: () -> + list_result = new Pettanr.ComicStory.Collection({}) + new Pettanr.FilerRender('comic_story', list_result, 'default', window.operators) - defaults: { - id: null - } - - initialize: () -> - - diff --git a/app/assets/javascripts/controllers/comics.js.coffee b/app/assets/javascripts/controllers/comics.js.coffee new file mode 100644 index 00000000..c6c868b1 --- /dev/null +++ b/app/assets/javascripts/controllers/comics.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.ComicsController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.Comic.Collection({}) + new Pettanr.FilerRender('comic', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/demander.js.coffee b/app/assets/javascripts/controllers/demander.js.coffee deleted file mode 100644 index cffa4bbb..00000000 --- a/app/assets/javascripts/controllers/demander.js.coffee +++ /dev/null @@ -1,9 +0,0 @@ -class Pettanr.DemandersController extends Pettanr.AppController - - defaults: { - id: null - } - - initialize: () -> - - diff --git a/app/assets/javascripts/controllers/demanders.js.coffee b/app/assets/javascripts/controllers/demanders.js.coffee new file mode 100644 index 00000000..bede2bcf --- /dev/null +++ b/app/assets/javascripts/controllers/demanders.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.DemandersController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.Demander.Collection({}) + new Pettanr.FilerRender('demander', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/folders.js.coffee b/app/assets/javascripts/controllers/folders.js.coffee index 5b3f0dcf..272e9461 100644 --- 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 + index: () -> + list_result = new Pettanr.Folder.Collection({}) + new Pettanr.FilerRender('folder', list_result, 'default', window.operators) root: () -> diff --git a/app/assets/javascripts/controllers/ground_color.js.coffee b/app/assets/javascripts/controllers/ground_color.js.coffee deleted file mode 100644 index 08d81606..00000000 --- a/app/assets/javascripts/controllers/ground_color.js.coffee +++ /dev/null @@ -1,2 +0,0 @@ -class Pettanr.GroundColorsController extends Pettanr.AppController - diff --git a/app/assets/javascripts/controllers/ground_colors.js.coffee b/app/assets/javascripts/controllers/ground_colors.js.coffee new file mode 100644 index 00000000..8191952a --- /dev/null +++ b/app/assets/javascripts/controllers/ground_colors.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.GroundColorsController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.GroundColor.Collection({}) + new Pettanr.FilerRender('ground_color', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/ground_picture.js.coffee b/app/assets/javascripts/controllers/ground_picture.js.coffee deleted file mode 100644 index 63463260..00000000 --- a/app/assets/javascripts/controllers/ground_picture.js.coffee +++ /dev/null @@ -1,15 +0,0 @@ -class Pettanr.GroundPicturesController extends Pettanr.AppController - @single: () -> - 'GroundPicture' - - @plural: () -> - 'GroundPictures' - - @colum_structures: -> - {} - - defaults: { - x: 11 - } - - diff --git a/app/assets/javascripts/controllers/ground_pictures.js.coffee b/app/assets/javascripts/controllers/ground_pictures.js.coffee new file mode 100644 index 00000000..08afdc7c --- /dev/null +++ b/app/assets/javascripts/controllers/ground_pictures.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.GroundPicturesController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.GroundPicture.Collection({}) + new Pettanr.FilerRender('ground_picture', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/license.js.coffee b/app/assets/javascripts/controllers/license.js.coffee deleted file mode 100644 index 159a1f7e..00000000 --- a/app/assets/javascripts/controllers/license.js.coffee +++ /dev/null @@ -1,15 +0,0 @@ -class Pettanr.LicensesController extends Pettanr.AppController - @single: () -> - 'License' - - @plural: () -> - 'Licenses' - - defaults: { - id: 11 - } - - initialize: () -> - confirm("Welcome to Panel") - - diff --git a/app/assets/javascripts/controllers/license_group.js.coffee b/app/assets/javascripts/controllers/license_group.js.coffee deleted file mode 100644 index 0eda01e8..00000000 --- a/app/assets/javascripts/controllers/license_group.js.coffee +++ /dev/null @@ -1,15 +0,0 @@ -class Pettanr.LicenseGroupsController extends Pettanr.AppController - @single: () -> - 'LicenseGroup' - - @plural: () -> - 'LicenseGroups' - - defaults: { - id: 11 - } - - initialize: () -> - confirm("Welcome to Panel") - - diff --git a/app/assets/javascripts/controllers/license_groups.js.coffee b/app/assets/javascripts/controllers/license_groups.js.coffee new file mode 100644 index 00000000..a1ab464d --- /dev/null +++ b/app/assets/javascripts/controllers/license_groups.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.LicenseGroupsController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.LicenseGroup.Collection({}) + new Pettanr.FilerRender('license_group', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/licenses.js.coffee b/app/assets/javascripts/controllers/licenses.js.coffee new file mode 100644 index 00000000..2f3c828d --- /dev/null +++ b/app/assets/javascripts/controllers/licenses.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.LicensesController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.License.Collection({}) + new Pettanr.FilerRender('license', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/original_picture.js.coffee b/app/assets/javascripts/controllers/original_picture.js.coffee deleted file mode 100644 index 702dbf5d..00000000 --- a/app/assets/javascripts/controllers/original_picture.js.coffee +++ /dev/null @@ -1,15 +0,0 @@ -class Pettanr.OriginalPicturesController extends Pettanr.AppController - @single: () -> - 'OriginalPicture' - - @plural: () -> - 'OriginalPictures' - - defaults: { - id: 11 - } - - initialize: () -> - confirm("Welcome to Panel") - - 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 index 9aef0fbc..00000000 --- a/app/assets/javascripts/controllers/original_picture_license.js.coffee +++ /dev/null @@ -1,15 +0,0 @@ -class Pettanr.OriginalPictureLicensesController extends Pettanr.AppController - @single: () -> - 'OriginalPictureLicense' - - @plural: () -> - 'OriginalPictureLicenses' - - defaults: { - id: 11 - } - - initialize: () -> - confirm("Welcome to Panel") - - 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 index b84ca392..00000000 --- a/app/assets/javascripts/controllers/original_picture_license_group.js.coffee +++ /dev/null @@ -1,15 +0,0 @@ -class Pettanr.OriginalPictureLicenseGroupsController extends Pettanr.AppController - @single: () -> - 'OriginalPictureLicenseGroup' - - @plural: () -> - 'OriginalPictureLicenseGroups' - - defaults: { - id: 11 - } - - initialize: () -> - confirm("Welcome to Panel") - - 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 index 00000000..0faa770c --- /dev/null +++ b/app/assets/javascripts/controllers/original_picture_license_groups.js.coffee @@ -0,0 +1,7 @@ +class Pettanr.OriginalPictureLicenseGroupsController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.OriginalPictureLicenseGroup.Collection({}) + new Pettanr.FilerRender('original_picture_license_group', list_result, 'default', window.operators) + + 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 index 00000000..274815e4 --- /dev/null +++ b/app/assets/javascripts/controllers/original_picture_licenses.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.OriginalPictureLicensesController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.OriginalPictureLicense.Collection({}) + new Pettanr.FilerRender('original_picture_license', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/original_pictures.js.coffee b/app/assets/javascripts/controllers/original_pictures.js.coffee new file mode 100644 index 00000000..5a9c3f02 --- /dev/null +++ b/app/assets/javascripts/controllers/original_pictures.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.OriginalPicturesController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.OriginalPicture.Collection({}) + new Pettanr.FilerRender('original_picture', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/panel.js.coffee b/app/assets/javascripts/controllers/panel.js.coffee deleted file mode 100644 index e46beefa..00000000 --- a/app/assets/javascripts/controllers/panel.js.coffee +++ /dev/null @@ -1,15 +0,0 @@ -class Pettanr.PanelsController extends Pettanr.AppController - @single: () -> - 'Panel' - - @plural: () -> - 'Panels' - - defaults: { - id: 11 - } - - initialize: () -> - confirm("Welcome to Panel") - - diff --git a/app/assets/javascripts/controllers/panel_picture.js.coffee b/app/assets/javascripts/controllers/panel_picture.js.coffee deleted file mode 100644 index d2a78ef1..00000000 --- a/app/assets/javascripts/controllers/panel_picture.js.coffee +++ /dev/null @@ -1,18 +0,0 @@ -class Pettanr.PanelPicturesController extends Pettanr.AppController - @single: () -> - 'PanelPicture' - - @plural: () -> - 'PanelPictures' - - @colum_structures: -> - {} - - defaults: { - x: 11 - } - - initialize: () -> - confirm("Welcome to this world") - - diff --git a/app/assets/javascripts/controllers/panel_pictures.js.coffee b/app/assets/javascripts/controllers/panel_pictures.js.coffee new file mode 100644 index 00000000..bc12fb23 --- /dev/null +++ b/app/assets/javascripts/controllers/panel_pictures.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.PanelPicturesController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.PanelPicture.Collection({}) + new Pettanr.FilerRender('panel_picture', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/panels.js.coffee b/app/assets/javascripts/controllers/panels.js.coffee new file mode 100644 index 00000000..9615ad4e --- /dev/null +++ b/app/assets/javascripts/controllers/panels.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.PanelsController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.Panel.Collection({}) + new Pettanr.FilerRender('panel', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/picture.js.coffee b/app/assets/javascripts/controllers/picture.js.coffee deleted file mode 100644 index 9eb8d107..00000000 --- a/app/assets/javascripts/controllers/picture.js.coffee +++ /dev/null @@ -1,14 +0,0 @@ -class Pettanr.PicturesController extends Pettanr.AppController - @single: () -> - 'Picture' - - @plural: () -> - 'Pictures' - - defaults: { - id: 11 - } - - initialize: () -> - confirm("Welcome to Panel") - diff --git a/app/assets/javascripts/controllers/pictures.js.coffee b/app/assets/javascripts/controllers/pictures.js.coffee new file mode 100644 index 00000000..0a84cd69 --- /dev/null +++ b/app/assets/javascripts/controllers/pictures.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.PicturesController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.Picture.Collection({}) + new Pettanr.FilerRender('picture', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/resource_picture.js.coffee b/app/assets/javascripts/controllers/resource_picture.js.coffee deleted file mode 100644 index 9cbb92f9..00000000 --- a/app/assets/javascripts/controllers/resource_picture.js.coffee +++ /dev/null @@ -1,15 +0,0 @@ -class Pettanr.ResourcePicturesController extends Pettanr.AppController - @single: () -> - 'ResourcePicture' - - @plural: () -> - 'ResourcePictures' - - defaults: { - id: 11 - } - - initialize: () -> - confirm("Welcome to Panel") - - diff --git a/app/assets/javascripts/controllers/resource_pictures.js.coffee b/app/assets/javascripts/controllers/resource_pictures.js.coffee new file mode 100644 index 00000000..e31c084f --- /dev/null +++ b/app/assets/javascripts/controllers/resource_pictures.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.ResourcePicturesController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.ResourcePicture.Collection({}) + new Pettanr.FilerRender('resource_picture', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/scroll_panel.js.coffee b/app/assets/javascripts/controllers/scroll_panel.js.coffee deleted file mode 100644 index a84162ce..00000000 --- a/app/assets/javascripts/controllers/scroll_panel.js.coffee +++ /dev/null @@ -1,15 +0,0 @@ -class Pettanr.ScrollPanelsController extends Pettanr.AppController - @single: () -> - 'ScrollPanel' - - @plural: () -> - 'ScrollPanels' - - defaults: { - id: 11 - } - - initialize: () -> - confirm("Welcome to Panel") - - diff --git a/app/assets/javascripts/controllers/scroll_panels.js.coffee b/app/assets/javascripts/controllers/scroll_panels.js.coffee new file mode 100644 index 00000000..e311586f --- /dev/null +++ b/app/assets/javascripts/controllers/scroll_panels.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.ScrollPanelsController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.ScrollPanel.Collection({}) + new Pettanr.FilerRender('scroll_panel', list_result, 'default', window.operators) + 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 fe31eb89..5313e54c 100644 --- 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: () -> list_result = new Pettanr.Scroll.Collection({}) new Pettanr.FilerRender('scroll', list_result, 'default', window.operators) - - root: () -> show_html_format: (format) -> @@ -13,10 +11,11 @@ class Pettanr.ScrollsController extends Pettanr.AppController item = new Pettanr.Scroll({id: id}) _this = this item.fetch({}).done () -> + alert(item) count: () -> - folders_new: () -> + new: () -> edit: () -> diff --git a/app/assets/javascripts/controllers/sheet.js.coffee b/app/assets/javascripts/controllers/sheet.js.coffee deleted file mode 100644 index ecc9c844..00000000 --- a/app/assets/javascripts/controllers/sheet.js.coffee +++ /dev/null @@ -1,15 +0,0 @@ -class Pettanr.SheetsController extends Pettanr.AppController - @single: () -> - 'Sheet' - - @plural: () -> - 'Sheets' - - defaults: { - id: 11 - } - - initialize: () -> - confirm("Welcome to Panel") - - diff --git a/app/assets/javascripts/controllers/sheet_panel.js.coffee b/app/assets/javascripts/controllers/sheet_panel.js.coffee deleted file mode 100644 index b86e0356..00000000 --- a/app/assets/javascripts/controllers/sheet_panel.js.coffee +++ /dev/null @@ -1,15 +0,0 @@ -class Pettanr.SheetPanelsController extends Pettanr.AppController - @single: () -> - 'SheetPanel' - - @plural: () -> - 'SheetPanels' - - defaults: { - id: 11 - } - - initialize: () -> - confirm("Welcome to Panel") - - diff --git a/app/assets/javascripts/controllers/sheet_panels.js.coffee b/app/assets/javascripts/controllers/sheet_panels.js.coffee new file mode 100644 index 00000000..04e4358e --- /dev/null +++ b/app/assets/javascripts/controllers/sheet_panels.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.SheetPanelsController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.SheetPanel.Collection({}) + new Pettanr.FilerRender('sheet_panel', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/sheets.js.coffee b/app/assets/javascripts/controllers/sheets.js.coffee new file mode 100644 index 00000000..1b5c159b --- /dev/null +++ b/app/assets/javascripts/controllers/sheets.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.SheetsController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.Sheet.Collection({}) + new Pettanr.FilerRender('sheet', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/speech.js.coffee b/app/assets/javascripts/controllers/speech.js.coffee deleted file mode 100644 index 037576af..00000000 --- a/app/assets/javascripts/controllers/speech.js.coffee +++ /dev/null @@ -1,18 +0,0 @@ -class Pettanr.SpeechesController extends Pettanr.AppController - @single: () -> - 'Speech' - - @plural: () -> - 'Speeches' - - @colum_structures: -> - {} - - defaults: { - x: 11 - } - - initialize: () -> - confirm("Welcome to this world") - - diff --git a/app/assets/javascripts/controllers/speech_balloon.js.coffee b/app/assets/javascripts/controllers/speech_balloon.js.coffee deleted file mode 100644 index 7dd2ae03..00000000 --- a/app/assets/javascripts/controllers/speech_balloon.js.coffee +++ /dev/null @@ -1,18 +0,0 @@ -class Pettanr.SpeechBalloonsController extends Pettanr.AppController - @single: () -> - 'SpeechBalloon' - - @plural: () -> - 'SpeechBalloons' - - @colum_structures: -> - {} - - defaults: { - x: 11 - } - - initialize: () -> - confirm("Welcome to this world") - - 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 index ec1d2981..00000000 --- a/app/assets/javascripts/controllers/speech_balloon_template.js.coffee +++ /dev/null @@ -1,2 +0,0 @@ -class Pettanr.SpeechBalloonTemplatesController extends Pettanr.AppController - 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 index 00000000..98b33e9d --- /dev/null +++ b/app/assets/javascripts/controllers/speech_balloon_templates.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.SpeechBalloonTemplatesController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.SpeechBalloonTemplate.Collection({}) + new Pettanr.FilerRender('speech_balloon_template', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/speech_balloons.js.coffee b/app/assets/javascripts/controllers/speech_balloons.js.coffee new file mode 100644 index 00000000..5f465274 --- /dev/null +++ b/app/assets/javascripts/controllers/speech_balloons.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.SpeechBalloonsController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.SpeechBalloon.Collection({}) + new Pettanr.FilerRender('speech_balloon', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/speeches.js.coffee b/app/assets/javascripts/controllers/speeches.js.coffee new file mode 100644 index 00000000..e29adbfa --- /dev/null +++ b/app/assets/javascripts/controllers/speeches.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.SpeechesController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.Speech.Collection({}) + new Pettanr.FilerRender('speech', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/stories.js.coffee b/app/assets/javascripts/controllers/stories.js.coffee new file mode 100644 index 00000000..7e97d4b4 --- /dev/null +++ b/app/assets/javascripts/controllers/stories.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.StoriesController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.Story.Collection({}) + new Pettanr.FilerRender('story', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/story.js.coffee b/app/assets/javascripts/controllers/story.js.coffee deleted file mode 100644 index d86f2d47..00000000 --- a/app/assets/javascripts/controllers/story.js.coffee +++ /dev/null @@ -1,15 +0,0 @@ -class Pettanr.StoriesController extends Pettanr.AppController - @single: () -> - 'Story' - - @plural: () -> - 'Stories' - - defaults: { - id: 11 - } - - initialize: () -> - confirm("Welcome to Panel") - - diff --git a/app/assets/javascripts/controllers/story_sheet.js.coffee b/app/assets/javascripts/controllers/story_sheet.js.coffee deleted file mode 100644 index 00d1e535..00000000 --- a/app/assets/javascripts/controllers/story_sheet.js.coffee +++ /dev/null @@ -1,15 +0,0 @@ -class Pettanr.StorySheetsController extends Pettanr.AppController - @single: () -> - 'StorySheet' - - @plural: () -> - 'StorySheets' - - defaults: { - id: 11 - } - - initialize: () -> - confirm("Welcome to Panel") - - diff --git a/app/assets/javascripts/controllers/story_sheets.js.coffee b/app/assets/javascripts/controllers/story_sheets.js.coffee new file mode 100644 index 00000000..3bb3f036 --- /dev/null +++ b/app/assets/javascripts/controllers/story_sheets.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.StorySheetsController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.StorySheet.Collection({}) + new Pettanr.FilerRender('story_sheet', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/system_picture.js.coffee b/app/assets/javascripts/controllers/system_picture.js.coffee deleted file mode 100644 index 552cd271..00000000 --- a/app/assets/javascripts/controllers/system_picture.js.coffee +++ /dev/null @@ -1 +0,0 @@ -class Pettanr.SystemPicturesController extends Pettanr.AppController diff --git a/app/assets/javascripts/controllers/system_pictures.js.coffee b/app/assets/javascripts/controllers/system_pictures.js.coffee new file mode 100644 index 00000000..13bbf9ee --- /dev/null +++ b/app/assets/javascripts/controllers/system_pictures.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.SystemPicturesController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.SystemPicture.Collection({}) + new Pettanr.FilerRender('system_picture', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/user.js.coffee b/app/assets/javascripts/controllers/user.js.coffee deleted file mode 100644 index fa8287c2..00000000 --- a/app/assets/javascripts/controllers/user.js.coffee +++ /dev/null @@ -1,16 +0,0 @@ -class Pettanr.UsersController extends Pettanr.AppController - - url: '/users/' - - defaults: { - id: null - } - - author: () -> - - artist: () -> - - initialize: () -> - if @id - @url = @url + @id - diff --git a/app/assets/javascripts/controllers/users.js.coffee b/app/assets/javascripts/controllers/users.js.coffee new file mode 100644 index 00000000..184ca09e --- /dev/null +++ b/app/assets/javascripts/controllers/users.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.UsersController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.User.Collection({}) + new Pettanr.FilerRender('user', list_result, 'default', window.operators) + diff --git a/app/assets/javascripts/controllers/writing_format.js.coffee b/app/assets/javascripts/controllers/writing_format.js.coffee deleted file mode 100644 index 408641ae..00000000 --- a/app/assets/javascripts/controllers/writing_format.js.coffee +++ /dev/null @@ -1,2 +0,0 @@ -class Pettanr.WritingFormatsController extends Pettanr.AppController - diff --git a/app/assets/javascripts/controllers/writing_formats.js.coffee b/app/assets/javascripts/controllers/writing_formats.js.coffee new file mode 100644 index 00000000..41091b52 --- /dev/null +++ b/app/assets/javascripts/controllers/writing_formats.js.coffee @@ -0,0 +1,6 @@ +class Pettanr.WritingFormatsController extends Pettanr.AppController + + index: () -> + list_result = new Pettanr.WritingFormat.Collection({}) + new Pettanr.FilerRender('writing_format', list_result, 'default', window.operators) + 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 af3fcc85..da57715f 100644 --- 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)" url: () -> - @item.get(@my_manifest.column_name()) + @item.get(@my_manifest.column_name) 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 8675b6ff..ed955d43 100644 --- 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 method_name: () -> - @my_manifest.method_name() + @my_manifest.method_name url: () -> - if @item.methods(true).is_include(@method_name()) - @item[@method_name()]() + if @item[@method_name()] + @item[@method_name()]().src else '/images/error.png' 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 ffe31a07..c6e74100 100644 --- 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)" url: () -> - @item.get(@my_manifest.column_name()) + @item.get(@my_manifest.column_name) diff --git a/app/assets/javascripts/manifest/manifest.js.coffee b/app/assets/javascripts/manifest/manifest.js.coffee index 9e7c2285..63581386 100644 --- a/app/assets/javascripts/manifest/manifest.js.coffee +++ b/app/assets/javascripts/manifest/manifest.js.coffee @@ -12,7 +12,7 @@ class Manifest true @item_name_to_model: (item_name) -> - Pettanr[Pettanr.capitalize(item_name)] + Pettanr[Pettanr.camelize(item_name)] @singularize: (name) -> name.replace(/es$/, '').replace(/s$/, '') diff --git a/app/assets/javascripts/models/admin.js.coffee b/app/assets/javascripts/models/admin.js.coffee index d511fafa..3ed7399d 100644 --- 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 } initialize: () -> + if @id + @url = @url + @id - +class Pettanr.Admin.Collection extends Backbone.Collection + model: Pettanr.Admin + url: '/admins' diff --git a/app/assets/javascripts/models/author.js.coffee b/app/assets/javascripts/models/author.js.coffee index 8a6d2c36..7c3e37fb 100644 --- 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: () -> if @id @url = @url + @id - - + +class Pettanr.Author.Collection extends Backbone.Collection + model: Pettanr.Author + url: '/authors' diff --git a/app/assets/javascripts/models/balloon.js.coffee b/app/assets/javascripts/models/balloon.js.coffee index 918997c1..8d6c55bf 100644 --- 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 + @singular: () -> + 'Balloon' + + @plural: () -> + 'Balloons' + + defaults: { + id: null, + x: 0, + y: 0, + width: 100, + height: 100, + r: 0 + } + + url: () -> + '/system_pictures/' + @system_picture().filename() + + symbol_option: () -> + @speech_balloon().speech_balloon_template().symbol_option() + + style: () -> + { + width: Pettanr.to_s(@get('width')) + 'px', + height: Pettanr.to_s(@get('height')) + 'px', + top: Pettanr.to_s(@get('y')) + 'px', + left: Pettanr.to_s(@get('x')) + 'px' + } + + initialize: () -> + if @id + @url = @url + @id + +class Pettanr.Balloon.Collection extends Backbone.Collection + model: Pettanr.Balloon + url: '/balloons' diff --git a/app/assets/javascripts/models/comic.js.coffee b/app/assets/javascripts/models/comic.js.coffee index 4dc49b71..c760c135 100644 --- 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 - @single: () -> + @singular: () -> 'Comic' @plural: () -> 'Comics' defaults: { - id: 11 + id: null, + visible: 0, + author_id: null } + is_visible: (operators) -> + switch super(operators) + when null + return true + when false + return false + else + @get('visible') > 0 + + symbol_filename: () -> + initialize: () -> - confirm("Welcome to Panel") + if @id + @url = @url + @id - +class Pettanr.Comic.Collection extends Backbone.Collection + model: Pettanr.Comic + url: '/comics' diff --git a/app/assets/javascripts/models/comic_story.js.coffee b/app/assets/javascripts/models/comic_story.js.coffee new file mode 100644 index 00000000..c2c6d6d3 --- /dev/null +++ b/app/assets/javascripts/models/comic_story.js.coffee @@ -0,0 +1,30 @@ +class Pettanr.ComicStory extends Peta.Leaf + @singular: () -> + 'ComicStory' + + @plural: () -> + 'ComicStories' + + defaults: { + id: null, + comic_id: null, + story_id: null, + t: null + } + + disp_t: () -> + @get('t') + 1 + + disp_t_by_text: () -> + I18n.t('comic_stories.show.t', {t: @disp_t()}) + + title: () -> + @disp_t_by_text() + ':' + @story().get('title') + + initialize: () -> + if @id + @url = @url + @id + +class Pettanr.ComicStory.Collection extends Backbone.Collection + model: Pettanr.ComicStory + url: '/comic_stories' diff --git a/app/assets/javascripts/models/ground_color.js.coffee b/app/assets/javascripts/models/ground_color.js.coffee index 74aae4e4..303398a8 100644 --- 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 - + @singular: () -> + 'GroundColor' + + @plural: () -> + 'GroundColors' + + defaults: { + id: null, + code: 0, + } + + @has_picture: () -> + false + + div_offset: () -> + if @get('xy') + @get('xy') + else + 0 + + div_size: () -> + if @get('wh') + @get('wh') + else + 100 - @div_offset() + + div_x: () -> + if @get('orientation') == 0 + 0 + else + @div_offset() + + div_y: () -> + if @get('orientation') == 0 + @div_offset() + else + 0 + + div_width: () -> + if @get('orientation') == 0 + 100 + else + @div_size() + + div_height: () -> + if @get('orientation') == 0 + @div_size() + else + 100 + + style: (spot = null, opacity = 20) -> + r = { + position: 'absolute', + 'z-index': @get('z'), + top: Pettanr.to_s(@div_y()) + '%', + left: Pettanr.to_s(@div_x()) + '%', + width: Pettanr.to_s(@div_width()) + '%', + height: Pettanr.to_s(@div_height()) + '%', + 'background-color': '#' + ('000000' + Pettanr.to_s(@get('code'))).slice(-6) + } + @merge_opacity(r, opacity) if spot and spot != this + r + + initialize: () -> + if @id + @url = @url + @id + +class Pettanr.GroundColor.Collection extends Backbone.Collection + model: Pettanr.GroundColor + url: '/ground_colors' diff --git a/app/assets/javascripts/models/ground_picture.js.coffee b/app/assets/javascripts/models/ground_picture.js.coffee index 3e984b72..1a18c151 100644 --- 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 - @single: () -> + @singular: () -> 'GroundPicture' @plural: () -> 'GroundPictures' - @colum_structures: -> - {} - defaults: { - x: 11 + id: null, + x: 0, + y: 0, + repeat: 0 } - + @repeat_texts: () -> + ['repeat', 'repeat-x', 'repeat-y', 'no-repeat'] + + picture: () -> + @get('picture') + + has_picture: () -> + true + + style: (spot = null, opacity = 20) -> + r = { + position: 'absolute', + top: '0px', + left: '0px', + 'z-index': @get('z'), + 'background-image': 'url(' + @picture().r_url() + ')', + 'background-repeat': @repeat_text(), + 'background-position': Pettanr.to_s(@get('x')) + 'px ' + Pettanr.to_s(@get('y')) + 'px' + } + @merge_opacity(r, opacity) if spot and spot != this + r + + tmb_opt_img_tag: () -> + wh = Pettanr.Imager.thumbnail_size(@picture().get('width'), @picture().get('height')) + {src: @picture().r_url(), width: wh[0], height: wh[1], alt: @get('caption')} + + symbol_option: () -> + @tmb_opt_img_tag() + + repeat_text: () -> + Pettanr.GroundPicture.repeat_texts()[@get('repeat')] + + initialize: () -> + if @id + @url = @url + @id + +class Pettanr.GroundPicture.Collection extends Backbone.Collection + model: Pettanr.GroundPicture + url: '/ground_pictures' diff --git a/app/assets/javascripts/models/license.js.coffee b/app/assets/javascripts/models/license.js.coffee index 214c4acb..2e18e585 100644 --- 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 - @single: () -> + @singular: () -> 'License' @plural: () -> 'Licenses' defaults: { - id: 11 + id: null } + license_group: () -> + r = new Pettanr.LicenseGroup({id: @get('license_group_id')}) + r.fetch({}).done () -> + r + + caption_with_group: () -> + @license_group().get('caption') + '/' + @get('caption') + initialize: () -> - confirm("Welcome to Panel") + if @id + @url = @url + @id - +class Pettanr.License.Collection extends Backbone.Collection + model: Pettanr.License + url: '/licenses' diff --git a/app/assets/javascripts/models/license_group.js.coffee b/app/assets/javascripts/models/license_group.js.coffee index b097b385..f0d70f9c 100644 --- 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 - @single: () -> + @singular: () -> 'LicenseGroup' @plural: () -> 'LicenseGroups' defaults: { - id: 11 + id: null } initialize: () -> - confirm("Welcome to Panel") + if @id + @url = @url + @id - +class Pettanr.LicenseGroup.Collection extends Backbone.Collection + model: Pettanr.LicenseGroup + url: '/license_groups' diff --git a/app/assets/javascripts/models/original_picture.js.coffee b/app/assets/javascripts/models/original_picture.js.coffee index b1f95aab..5ca58d55 100644 --- 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 - @single: () -> + @singular: () -> 'OriginalPicture' @plural: () -> 'OriginalPictures' defaults: { - id: 11 + id: null, + artist_id: nil } + is_visible: (operators) -> + @is_own(operators) + + filename: () -> + @get('id') + '.' + @get('ext') + + mime_type: () -> + 'image/' + @get('ext') + + r_url: () -> + '/original_pictures/' + @filename() + + opt_img_tag: () -> + {src: @r_url(), width: @get('width'), height: @get('height')} + + tmb_opt_img_tag: () -> + wh = Pettanr.Imager.thumbnail_size(@get('width'), @get('height')) + {src: @r_url(), width: wh[0], height: wh[1]} + + symbol_option: () -> + @tmb_opt_img_tag() + + revision: () -> + head = @history()[0] + if head + head.revision() + else + 'unpublished' + + is_unpublished: () -> + @get('published_at') == null and @get('stopped_at') == null + + is_stopped: () -> + @get('stopped_at') != null + + is_unlicensed: () -> + dt = @get('published_at') || @get('stopped_at') + return false if not dt + @get('uploaded_at') > dt + + is_published: () -> + @get('published_at') != null + initialize: () -> - confirm("Welcome to Panel") + if @id + @url = @url + @id - +class Pettanr.OriginalPicture.Collection extends Backbone.Collection + model: Pettanr.OriginalPicture + url: '/original_pictures' diff --git a/app/assets/javascripts/models/original_picture_license.js.coffee b/app/assets/javascripts/models/original_picture_license.js.coffee index 8fc98a40..64726b3d 100644 --- 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 - @single: () -> + @singular: () -> 'OriginalPictureLicense' @plural: () -> 'OriginalPictureLicenses' defaults: { - id: 11 + id: null } initialize: () -> - confirm("Welcome to Panel") + if @id + @url = @url + @id - +class Pettanr.OriginalPictureLicense.Collection extends Backbone.Collection + model: Pettanr.OriginalPictureLicense + url: '/original_picture_licenses' 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 cdd907a1..44cdba31 100644 --- 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 - @single: () -> + @singular: () -> 'OriginalPictureLicenseGroup' @plural: () -> 'OriginalPictureLicenseGroups' defaults: { - id: 11 + id: null } initialize: () -> - confirm("Welcome to Panel") + if @id + @url = @url + @id - +class Pettanr.OriginalPictureLicenseGroup.Collection extends Backbone.Collection + model: Pettanr.OriginalPictureLicenseGroup + url: '/original_picture_license_groups' diff --git a/app/assets/javascripts/models/panel.js.coffee b/app/assets/javascripts/models/panel.js.coffee index 8b5dfc6e..fcba03ba 100644 --- 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' defaults: { - id: 11 + id: null, + border: 2, + publish: 0 } initialize: () -> - confirm("Welcome to Panel") + if @id + @url = @url + @id - +class Pettanr.Panel.Collection extends Backbone.Collection + model: Pettanr.Panel + url: '/panels' diff --git a/app/assets/javascripts/models/panel_picture.js.coffee b/app/assets/javascripts/models/panel_picture.js.coffee index 86d96421..794797c8 100644 --- 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 - @single: () -> + @singular: () -> 'PanelPicture' @plural: () -> 'PanelPictures' - @colum_structures: -> - {} - defaults: { - x: 11 + id: null } + @has_picture: () -> + true + + flip: () -> + v = if @get('height') > 0 + '' + else + 'v' + h = if @get('width') > 0 + '' + else + 'h' + res = v + h + res = res # format of /1.png?subdir=v + # res += '/' unless res.empty? # format of /v/1.png + res + + filename: () -> + @picture().filename() + '?subdir=' + @flip() + + r_url: () -> + '/pictures/' + @filename() + + opt_div_style: () -> + "top:#{@get('y')}px; left:#{@get('x')}px; z-index:#{@get('z')}; position: absolute;" + + opt_img_tag: (spot = null, opacity = 20) -> + o = if spot and spot != this + "opacity: #{opacity.to_f/100}; filter:alpha(opacity=#{opacity});" + else + '' + @tag_attributes('img', { + class: "panel-picture", + vPicture: @get('id'), + src: @r_url(), + width: Math.abs(@get('width')), + height: Math.abs(@get('height')), + picture_id: @get('picture_id'), + ext: @picture.ext, + alt: @get('caption'), + style: "#{o}" + }) + + tmb_opt_img_tag: () -> + wh = Pettanr.Imager.thumbnail_size(@get('width'), @get('height')) + {src: @r_url(), width: Math.abs(wh[0]), height: Math.abs(wh[1]), alt: @get('caption')} + + symbol_option: () -> + @picture().symbol_option() + initialize: () -> - confirm("Welcome to this world") + if @id + @url = @url + @id - +class Pettanr.PanelPicture.Collection extends Backbone.Collection + model: Pettanr.PanelPicture + url: '/panel_pictures' diff --git a/app/assets/javascripts/models/picture.js.coffee b/app/assets/javascripts/models/picture.js.coffee index 27503a86..ed592ff3 100644 --- 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 - @single: () -> + @singular: () -> 'Picture' @plural: () -> 'Pictures' defaults: { - id: 11 + id: null } + is_visible: (operators) -> + return true + + filename: () -> + @get('id') + '.' + @get('ext') + + gifname: () -> + @get('id') + '.gif' + + mime_type: () -> + 'image/' + @get('ext') + + r_url: () -> + '/pictures/' + @filename() + + opt_img_tag: () -> + {src: @r_url(), width: @get('width'), height: @get('height')} + + tmb_opt_img_tag: () -> + wh = Pettanr.Imager.thumbnail_size(@get('width'), @get('height')) + {src: @r_url(), width: wh[0], height: wh[1]} + + tail_opt_img_tag: (img) -> + {src: img, width: @get('width'), height: @get('height')} + + tail_tmb_opt_img_tag: (img) -> + wh = Pettanr.Imager.thumbnail_size(@get('width'), @get('height')) + {src: img, width: wh[0], height: wh[1]} + + alt_name: () -> + lgn = Pettanr.to_s(@license().license_group().get('caption')) + ln = Pettanr.to_s(@license().get('caption')) + lgn + '[' + ln + ']' + + symbol_option: () -> + @tmb_opt_img_tag() + + is_enable: () -> + if @head().resource_picture() + true + else + false + + @head: (opid) -> + #Picture.find( conditions => ['original_picture_id = ?', opid], :order => 'pictures.revision desc') + + head: () -> + Picture.head(@get('original_picture_id')) + + is_head: () -> + #this == @head() + + subdirs: () -> + if @license_extend().reverse < 0 + [''] + else + ['', 'v', 'h', 'vh'] + + is_showable: (operators = null) -> + return false if not @original_picture() + return true if @is_own(operators) + #@is_enable() and @is_head() + initialize: () -> - confirm("Welcome to Panel") - + if @id + @url = @url + @id + +class Pettanr.Picture.Collection extends Backbone.Collection + model: Pettanr.Picture + url: '/pictures' diff --git a/app/assets/javascripts/models/resource_picture.js.coffee b/app/assets/javascripts/models/resource_picture.js.coffee index 0a531b3a..2d5b454e 100644 --- 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 - @single: () -> + @singular: () -> 'ResourcePicture' @plural: () -> 'ResourcePictures' defaults: { - id: 11 + id: null } + is_visible: (operators) -> + @is_user_visible(operators) + + filename: () -> + @get('id') + '.' + @get('ext') + + gifname: () -> + @get('id') + '.gif' + + mime_type: () -> + 'image/' + @get('ext') + + r_url: (subdir = null) -> + opt = if Pettanr.to_s(@subdir).empty + '' + else + '?subdir=' + Pettanr.to_s(subdir) + '/resource_pictures/' + @filename() + opt + + tmb_opt_img_tag: () -> + wh = Pettanr.Imager.thumbnail_size(@get('width'), @get('height')) + {src: @r_url(), width: wh[0], height: wh[1]} + + opt_img_tag: () -> + {src: @url('full'), width: @get('width'), height: @get('height')} + + alt_name: () -> + lgn = Pettanr.to_s(@license().license_group().get('caption')) + ln = Pettanr.to_s(@license().get('caption')) + lgn + '[' + ln + ']' + + symbol_option: () -> + @tmb_opt_img_tag() + initialize: () -> - confirm("Welcome to Panel") + if @id + @url = @url + @id - +class Pettanr.ResourcePicture.Collection extends Backbone.Collection + model: Pettanr.ResourcePicture + url: '/resource_pictures' diff --git a/app/assets/javascripts/models/scroll_panel.js.coffee b/app/assets/javascripts/models/scroll_panel.js.coffee index 96debaf8..62241263 100644 --- 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 url: '' - @single: () -> + @singular: () -> 'ScrollPanel' @plural: () -> @@ -9,6 +9,9 @@ class Pettanr.ScrollPanel extends Peta.Leaf defaults: { id: null, + scroll_id: null, + panel_id: null, + t: null } initialize: () -> diff --git a/app/assets/javascripts/models/sheet.js.coffee b/app/assets/javascripts/models/sheet.js.coffee index 28cc9442..1a5ef074 100644 --- 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 - @single: () -> + @singular: () -> 'Sheet' @plural: () -> 'Sheets' defaults: { - id: 11 + id: null, + visible: 0, + author_id: null } + is_visible: (operators) -> + switch super(operators) + when null + return true + when false + return false + else + @get('visible') > 0 + initialize: () -> - confirm("Welcome to Panel") + if @id + @url = @url + @id - +class Pettanr.Sheet.Collection extends Backbone.Collection + model: Pettanr.Sheet + url: '/sheets' diff --git a/app/assets/javascripts/models/sheet_panel.js.coffee b/app/assets/javascripts/models/sheet_panel.js.coffee index 4e75dd3d..4a8b709e 100644 --- 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 - @single: () -> + @singular: () -> 'SheetPanel' @plural: () -> 'SheetPanels' defaults: { - id: 11 + id: null, + x: 15, + y: 15, + sheet_id: null, + panel_id: null, + z: 1, + t: null } initialize: () -> - confirm("Welcome to Panel") + if @id + @url = @url + @id - +class Pettanr.SheetPanel.Collection extends Backbone.Collection + model: Pettanr.SheetPanel + url: '/sheet_panels' diff --git a/app/assets/javascripts/models/speech.js.coffee b/app/assets/javascripts/models/speech.js.coffee index 4e26b4f5..7c158fd9 100644 --- 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 - @single: () -> +class Pettanr.Speech extends Peta.Element + @singular: () -> 'Speech' @plural: () -> 'Speeches' - @colum_structures: -> - {} - defaults: { - x: 11 + id: null, + x: 0, + y: 0, + width: 100, + height: 100 } + @text_align_texts: () -> + ['left', 'left', 'right', 'center'] + + symbol_option: () -> + @speech_balloon().speech_balloon_template().symbol_option() + + outer_style: () -> + { + top: @get('y'), left: @get('x'), + width: @get('width'), height: @get('height') + } + + inner_style: () -> + { + 'font-size': Pettanr.to_s(@get('font_size')) + 'em', + 'text-align': @text_align_text(), + color: '#' + ('000000' + Pettanr.to_s(@get('fore_color'))).slice(-6) + } + + text_align_text: () -> + Pettanr.Speech.text_align_texts()[@get('text_align')] + initialize: () -> - confirm("Welcome to this world") + if @id + @url = @url + @id - +class Pettanr.Speech.Collection extends Backbone.Collection + model: Pettanr.Speech + url: '/Speeches' diff --git a/app/assets/javascripts/models/speech_balloon.js.coffee b/app/assets/javascripts/models/speech_balloon.js.coffee index 1d0f0a55..e1dc8ce2 100644 --- 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 - @single: () -> + @singular: () -> 'SpeechBalloon' @plural: () -> 'SpeechBalloons' - @colum_structures: -> - {} - defaults: { - x: 11 + id: null, + z: null, + t: null } + @has_picture: () -> + false + + @symbol_option: () -> + @speech_balloon_template.symbol_option + initialize: () -> - confirm("Welcome to this world") + if @id + @url = @url + @id - +class Pettanr.SpeechBalloon.Collection extends Backbone.Collection + model: Pettanr.SpeechBalloon + url: '/speech_balloons' diff --git a/app/assets/javascripts/models/speech_balloon_template.js.coffee b/app/assets/javascripts/models/speech_balloon_template.js.coffee index dcf4c9f1..f86a1677 100644 --- 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 - + relations: [{ + type: Backbone.HasMany, + key: 'speech_balloons', + relatedModel: 'SpeechBalloon', + collectionType: 'SpeechBalloonCollection', + reverseRelation: { + key: 'livesIn', + includeInJSON: 'id' + } + }] + + @singular: () -> + 'SpeechBalloonTemplate' + + @plural: () -> + 'SpeechBalloonTemplates' + + defaults: { + id: null + } + + get_system_picture: () -> + new Pettanr.SystemPicture({id: @get('system_picture_id')}) + + symbol_option: () -> + _this = this + r = @get_system_picture() + r.fetch({}).done () -> + _this.system_picture = r + _this.system_picture.tmb_opt_img_tag() + + initialize: () -> + if @id + @url = @url + @id + @system_picture = null + +class Pettanr.SpeechBalloonTemplate.Collection extends Backbone.Collection + model: Pettanr.SpeechBalloonTemplate + url: '/speech_balloon_templates' diff --git a/app/assets/javascripts/models/story.js.coffee b/app/assets/javascripts/models/story.js.coffee index 6ab4cf13..a67d8ae8 100644 --- 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 - @single: () -> + @singular: () -> 'Story' @plural: () -> 'Stories' defaults: { - id: 11 + id: null, + visible: 0, + author_id: null } + is_visible: (operators) -> + switch super(operators) + when null + return true + when false + return false + else + @get('visible') > 0 + initialize: () -> - confirm("Welcome to Panel") + if @id + @url = @url + @id - +class Pettanr.Story.Collection extends Backbone.Collection + model: Pettanr.Story + url: '/stories' diff --git a/app/assets/javascripts/models/story_sheet.js.coffee b/app/assets/javascripts/models/story_sheet.js.coffee index 6e055f94..eb24b8c8 100644 --- 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 - @single: () -> + @singular: () -> 'StorySheet' @plural: () -> 'StorySheets' defaults: { - id: 11 + id: null, + story_id: null, + sheet_id: null, + t: null } initialize: () -> - confirm("Welcome to Panel") + if @id + @url = @url + @id - +class Pettanr.StorySheet.Collection extends Backbone.Collection + model: Pettanr.StorySheet + url: '/story_sheets' diff --git a/app/assets/javascripts/models/system_picture.js.coffee b/app/assets/javascripts/models/system_picture.js.coffee index 6e08cac6..debf30b0 100644 --- 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 + url: '/system_pictures/' + @singular: () -> + 'SystemPicture' + + @plural: () -> + 'SystemPictures' + + defaults: { + id: null + } + + filename: () -> + @get('id') + '.' + @get('ext') + + mime_type: () -> + 'image/' + @get('ext') + + r_url: () -> + '/system_pictures/' + @filename() + + opt_img_tag: () -> + {src: @r_url(), width: @get('width'), height: @get('height')} + + tmb_opt_img_tag: () -> + wh = Pettanr.Imager.thumbnail_size(@get('width'), @get('height')) + {src: @r_url(), width: wh[0], height: wh[1]} + + symbol_option: () -> + @tmb_opt_img_tag() + + initialize: () -> + if @id + @url = @url + @id + +class Pettanr.SystemPicture.Collection extends Backbone.Collection + model: Pettanr.SystemPicture + url: '/system_pictures' diff --git a/app/assets/javascripts/models/user.js.coffee b/app/assets/javascripts/models/user.js.coffee index 469fde4c..ab77bd05 100644 --- 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 @url = @url + @id +class Pettanr.User.Collection extends Backbone.Collection + model: Pettanr.User + url: '/users' diff --git a/app/assets/javascripts/models/writing_format.js.coffee b/app/assets/javascripts/models/writing_format.js.coffee index bd85d8ee..f5fb137c 100644 --- 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 + @singular: () -> + 'WritingFormat' + + @plural: () -> + 'WritingFormats' + + defaults: { + id: null + } + + initialize: () -> + if @id + @url = @url + @id + +class Pettanr.WritingFormat.Collection extends Backbone.Collection + model: Pettanr.WritingFormat + url: '/writing_formats' diff --git a/app/assets/javascripts/pettanr/pettan_imager.js.coffee b/app/assets/javascripts/pettanr/pettan_imager.js.coffee new file mode 100644 index 00000000..8eacb894 --- /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 40e91e60..7599fe26 100644 --- a/app/assets/javascripts/routes.js.coffee +++ b/app/assets/javascripts/routes.js.coffee @@ -6,9 +6,6 @@ class Pettanr.Router extends Backbone.Router show_html_format: (format) -> - folders_show: (id) -> - console.log(controller_name) - count: () -> new: () -> @@ -37,7 +34,7 @@ class Pettanr.Router extends Backbone.Router _this = this _.each _.flatten(names), (status) -> _status = status - f = switch status.action_manifest.type + switch status.action_manifest.type when 'list' _this[status.event_name] = () -> _status.controller[_status.action_name]() @@ -49,9 +46,9 @@ class Pettanr.Router extends Backbone.Router when 'show' _this[status.event_name] = (id) -> _status.controller[_status.action_name](id) - r = _status.controller_name + '/:id/' + _status.action_name + r = '^' + _status.controller_name + '\/([0-9]+)\/' + _status.action_name + '$' _this.route(r, _status.event_name) if _status.action_name == 'show' - r = _status.controller_name + '/:id' - _this.route(r, _status.event_name) + r = '^' + _status.controller_name + '\/([0-9]+)$' + _this.route(///#{r}///, _status.event_name) diff --git a/app/views/top/ap.html.erb b/app/views/top/ap.html.erb index 26ad54c1..46215094 100644 --- a/app/views/top/ap.html.erb +++ b/app/views/top/ap.html.erb @@ -124,6 +124,9 @@ +