OSDN Git Service

fix
authoryasushiito <yas@pen-chan.jp>
Thu, 12 Jun 2014 02:52:44 +0000 (11:52 +0900)
committeryasushiito <yas@pen-chan.jp>
Thu, 12 Jun 2014 02:52:44 +0000 (11:52 +0900)
18 files changed:
app/assets/javascripts/admin.js [new file with mode: 0644]
app/assets/javascripts/application.js
app/assets/javascripts/comic_stories.js.coffee [deleted file]
app/assets/javascripts/folders.js.coffee [deleted file]
app/assets/javascripts/scroll_panels.js.coffee [deleted file]
app/assets/javascripts/scrolls.js.coffee [deleted file]
app/assets/javascripts/sheet_panels.js.coffee [deleted file]
app/assets/javascripts/story_sheets.js.coffee [deleted file]
app/assets/stylesheets/comic_stories.css.scss [deleted file]
app/assets/stylesheets/folders.css.scss [deleted file]
app/assets/stylesheets/scroll_panels.css.scss [deleted file]
app/assets/stylesheets/scrolls.css.scss [deleted file]
app/assets/stylesheets/sheet_panels.css.scss [deleted file]
app/assets/stylesheets/sheets.css.scss [deleted file]
app/assets/stylesheets/story_sheets.css.scss [deleted file]
app/assets/stylesheets/writing_formats.css.scss [deleted file]
app/views/layouts/system.html.erb
public/favicon.ico [new file with mode: 0644]

diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js
new file mode 100644 (file)
index 0000000..a5c5d0c
--- /dev/null
@@ -0,0 +1,7 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require_directory ./manifest/work
index 8795c4d..78a6ead 100644 (file)
@@ -15,7 +15,6 @@
 //= require backbone
 //= require_directory ./manifest
 //= require_directory ./views
-//= require_directory ./manifest/work
 //= require pettanr_editor
 //= require pettanr_sheeter
 //= require writing_formats
diff --git a/app/assets/javascripts/comic_stories.js.coffee b/app/assets/javascripts/comic_stories.js.coffee
deleted file mode 100644 (file)
index 7615679..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/javascripts/folders.js.coffee b/app/assets/javascripts/folders.js.coffee
deleted file mode 100644 (file)
index 7615679..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/javascripts/scroll_panels.js.coffee b/app/assets/javascripts/scroll_panels.js.coffee
deleted file mode 100644 (file)
index 7615679..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/javascripts/scrolls.js.coffee b/app/assets/javascripts/scrolls.js.coffee
deleted file mode 100644 (file)
index 7615679..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/javascripts/sheet_panels.js.coffee b/app/assets/javascripts/sheet_panels.js.coffee
deleted file mode 100644 (file)
index 7615679..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/javascripts/story_sheets.js.coffee b/app/assets/javascripts/story_sheets.js.coffee
deleted file mode 100644 (file)
index 7615679..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/stylesheets/comic_stories.css.scss b/app/assets/stylesheets/comic_stories.css.scss
deleted file mode 100644 (file)
index ee7577e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the comic_stories controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/folders.css.scss b/app/assets/stylesheets/folders.css.scss
deleted file mode 100644 (file)
index 1dea791..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the folders controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/scroll_panels.css.scss b/app/assets/stylesheets/scroll_panels.css.scss
deleted file mode 100644 (file)
index 011af68..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the scroll_panels controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/scrolls.css.scss b/app/assets/stylesheets/scrolls.css.scss
deleted file mode 100644 (file)
index 050e639..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the scrolls controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/sheet_panels.css.scss b/app/assets/stylesheets/sheet_panels.css.scss
deleted file mode 100644 (file)
index 0550fe9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the sheet_panels controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/sheets.css.scss b/app/assets/stylesheets/sheets.css.scss
deleted file mode 100644 (file)
index bc4b9bf..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the sheets controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/story_sheets.css.scss b/app/assets/stylesheets/story_sheets.css.scss
deleted file mode 100644 (file)
index 557cdb4..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the story_sheets controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/writing_formats.css.scss b/app/assets/stylesheets/writing_formats.css.scss
deleted file mode 100644 (file)
index a783d4e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the writing_formats controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
index 273047f..ce898c3 100644 (file)
@@ -4,6 +4,7 @@
   <title><%= h(Manifest.manifest.magic_numbers['profile']['admins']['caption']) %></title>
   <%= stylesheet_link_tag "application" %>
   <%= javascript_include_tag "application" %>
+  <%= javascript_include_tag "admin" %>
   <%= raw panel_editor_javascript_include_tags %>
   <%= csrf_meta_tags %>
 </head>
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644 (file)
index 0000000..f4890a1
Binary files /dev/null and b/public/favicon.ico differ