change design

dogrunjp · Feb 15, 2013 · ed2f7ae · ed2f7ae
1 parent a1155d8
commit ed2f7ae
Show file tree

Hide file tree

Showing 11 changed files with 75 additions and 80 deletions.
diff --git a/src/jp/dogrun/ileaflet/controller/download/IndexController.java b/src/jp/dogrun/ileaflet/controller/download/IndexController.java
@@ -1,16 +1,13 @@
 package jp.dogrun.ileaflet.controller.download;
 
-import java.io.IOException;
-import java.io.OutputStream;
-import java.math.BigDecimal;
-import java.nio.ByteBuffer;
+import java.io.InputStream;
+import java.nio.channels.Channels;
 
 import jp.dogrun.ileaflet.dao.ContentDao;
 import jp.dogrun.ileaflet.model.Content;
 
 import org.slim3.controller.Controller;
 import org.slim3.controller.Navigation;
-import org.slim3.util.ThrowableUtil;
 
 import com.google.appengine.api.files.AppEngineFile;
 import com.google.appengine.api.files.FileReadChannel;
@@ -35,39 +32,10 @@ public Navigation run() throws Exception {
 
         FileReadChannel readChannel =
             fileService.openReadChannel(readableFile, false);
-
-        Integer capacity = (new BigDecimal(content.getCapacity())).intValue();
-        ByteBuffer buffer = ByteBuffer.allocate(capacity);
-        readChannel.read(buffer);
+        InputStream is = Channels.newInputStream(readChannel);
 
-        this.download(content.getTitle() + ".epub", buffer.array());
+        download(content.getTitle() + ".epub", is);
 
         return null;
     }
-
-    protected void download(String fileName, byte[] data)
-            throws NullPointerException {
-        if (fileName == null) {
-            throw new NullPointerException(
-                "The fileName parameter must not be null.");
-        }
-        if (data == null) {
-            throw new NullPointerException(
-                "The data parameter must not be null.");
-        }
-        try {
-            response.setContentType("application/epub+zip");
-            response.setHeader("Content-disposition", "attachment; "
-                + encodeFileName(fileName));
-            OutputStream out = response.getOutputStream();
-            try {
-                out.write(data);
-            } finally {
-                out.flush();
-                out.close();
-            }
-        } catch (IOException e) {
-            ThrowableUtil.wrapAndThrow(e);
-        }
-    }
 }
diff --git a/src/jp/dogrun/ileaflet/controller/validator/dashboard/EpubValidator.java b/src/jp/dogrun/ileaflet/controller/validator/dashboard/EpubValidator.java
@@ -21,7 +21,6 @@ public EpubValidator(String message) {
     public String validate(Map<String, Object> parameters, String name) {
 
         FileItem fileItem = (FileItem)parameters.get(name);
-        System.out.println(fileItem);
         if ( fileItem == null ) return null;
 
         EpubLogic logic = new EpubLogic();

diff --git a/src/jp/dogrun/ileaflet/dao/ActorDao.java b/src/jp/dogrun/ileaflet/dao/ActorDao.java
@@ -10,6 +10,7 @@ public class ActorDao extends DaoBase<Actor>{
 
     public Actor findById(String identity) {
         ActorMeta meta = ActorMeta.get();
+
         return Datastore.query(Actor.class).
                 filter(
                     meta.identity.equal(identity)

diff --git a/src/jp/dogrun/ileaflet/dao/ContentDao.java b/src/jp/dogrun/ileaflet/dao/ContentDao.java
@@ -21,7 +21,14 @@ public List<Content> findByIdentity(String identity) {
 
     public Content findById(String id) {
         Key key = Datastore.createKey(Content.class, Long.valueOf(id));
+
+
+
         ContentMeta meta = ContentMeta.get();
+
+
+
+
         return Datastore.query(Content.class).filter(
             meta.key.equal(key)
             ).asSingle();

diff --git a/src/jp/dogrun/ileaflet/meta/ActorMeta.java b/src/jp/dogrun/ileaflet/meta/ActorMeta.java
@@ -1,6 +1,6 @@
 package jp.dogrun.ileaflet.meta;
 
-//@javax.annotation.Generated(value = { "slim3-gen", "@VERSION@" }, date = "2013-02-08 18:56:55")
+//@javax.annotation.Generated(value = { "slim3-gen", "@VERSION@" }, date = "2013-02-15 18:14:38")
 /** */
 public final class ActorMeta extends org.slim3.datastore.ModelMeta<jp.dogrun.ileaflet.model.Actor> {
 

diff --git a/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml b/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
@@ -1,4 +1,4 @@
-<!-- Indices written at Mon, 11 Feb 2013 18:48:19 JST -->
+<!-- Indices written at Fri, 15 Feb 2013 18:17:25 JST -->
 
 <datastore-indexes>
 

diff --git a/war/WEB-INF/appengine-generated/local_db.bin b/war/WEB-INF/appengine-generated/local_db.bin
diff --git a/war/dashboard/index.jsp b/war/dashboard/index.jsp
@@ -2,44 +2,49 @@
 <c:import url="../mainFrame.jsp"> 
   <c:param name="title" value="ダッシュボード"/> 
   <c:param name="content"> 
-
-  <div class="span2">
-    <div class="well sidebar-nav">
-      <ul class="nav nav-list">
-        <li class="nav-header">Sidebar</li>
-        <li class="active"><a href="#">Link</a></li>
-        <li><a href="#">Link</a></li>
-        <li><a href="#">Link</a></li>
-        <li><a href="#">Link</a></li>
-        <li class="nav-header">Sidebar</li>
-        <li><a href="#">Link</a></li>
-        <li><a href="#">Link</a></li>
-        <li><a href="#">Link</a></li>
-        <li><a href="#">Link</a></li>
-        <li><a href="#">Link</a></li>
-        <li><a href="#">Link</a></li>
-        <li class="nav-header">Sidebar</li>
-        <li><a href="#">Link</a></li>
-        <li><a href="#">Link</a></li>
-        <li><a href="#">Link</a></li>
-      </ul>
-    </div>
-  </div>
+
+<div class="span12 tabbable tabs-left">
+
+<ul class="nav nav-tabs">
+  <li class="active">
+  <a href="#sns" data-toggle="tab">Section 1</a>
+  </li>
+  <li>
+  <a href="#manage" data-toggle="tab">Section 2</a>
+  </li>
+  <li>
+  <a href="#upload" data-toggle="tab">Section 3</a>
+  </li>
+</ul>
+
 
-  <div class="span10">
+<div class="tab-content">
+
+<div class="tab-pane active" id="sns">
+TOP
+</div>
+<div class="tab-pane" id="manage">
+<table class="table table-bordered">
+<c:forEach var="obj" items="${contentList}" varStatus="status">
+   <tr>
+　　<td>編集</td>
+    <td><a href="/view/${obj.key.id}"><c:out value="${obj.title}"/></a></td>
+    <td><a href="/download/${obj.key.id}">ダウンロード</a></td>
+   </tr>
+</c:forEach> 
+</table>
+</div>
+
+<div class="tab-pane" id="upload">
 電子書籍をアップロード：
 <form method="POST" action="./upload" enctype="multipart/form-data">
 	<input type="file" name="epubFile"> <input type="submit" value="アップロード">
 </form>
+</div>
 
-<br>
-<br>
-<br>
+</div>
 
-<c:forEach var="obj" items="${contentList}" varStatus="status">
-　　編集｜<a href="/view/?id=${obj.key.id}"><c:out value="${obj.title}"/></a>｜<a href="/download/?id=${obj.key.id}">ダウンロード</a>
-</c:forEach> 
-  </div>
+</div>
 
   </c:param> 
 </c:import> 
diff --git a/war/js/jquery-1.9.1.min.js b/war/js/jquery-1.9.1.min.js
diff --git a/war/login/index.jsp b/war/login/index.jsp
@@ -3,7 +3,7 @@
   <c:param name="title" value="ログイン"/> 
   <c:param name="content"> 
 
-        <div class="span12">
+<div class="span12">
 
 <form method="POST" action="./logon" class="form-horizontal form-inline">
 <div class="control-group">
@@ -18,13 +18,20 @@
     <input type="password" class="input-xlarge" placeholder="Password" name="password">
   </div>
 </div>
+
+<div class="control-group">
+  <div class="controls">
 <button type="submit" class="btn btn-primary">Sign in</button> 
 <input type="hidden" name="redirect" value="${redirect}">
+</div>
 </form>
 
 <a href="./?type=create">アカウントの新規作成</a>
+
 <a href="./?type=forget">パスワードを忘れたら。。。</a>
 
+
+
 </div>
 
   </c:param> 

diff --git a/war/mainFrame.jsp b/war/mainFrame.jsp
@@ -5,6 +5,7 @@
     <title>${param.title}</title>
     <link type="text/css" rel="stylesheet" href="/css/global.css" />
     <link type="text/css" rel="stylesheet" href="/css/bootstrap.min.css" />
+    <script src="/js/jquery-1.9.1.min.js"></script>
     <script src="/js/bootstrap.min.js"></script>
   </head>
 
@@ -46,22 +47,24 @@
     </div>
 
     <div class="container-fluid">
-      <div class="row-fluid">
 
 <c:if test="${not empty errors}">
 
-<div class="alert">
-  <button type="button" class="close" data-dismiss="alert">&times;</button>
-  <strong>Warning!</strong> 
-<ul>
-<c:forEach var="e" items="${f:errors()}">
-<li><span class="error">${f:h(e)}</span></li>
-</c:forEach>
-</ul>
+<div class="row-fluid">
+  <div class="alert">
+    <button type="button" class="close" data-dismiss="alert">&times;</button>
+    <strong>Warning!</strong> 
+    <ul>
+      <c:forEach var="e" items="${f:errors()}">
+      <li><span class="error">${f:h(e)}</span></li>
+      </c:forEach>
+    </ul>
+  </div>
 </div>
 
 </c:if>
 
+      <div class="row-fluid">
   		${param.content}
 
       </div>