Permalink
Browse files

WIP: small UI improvements

Better focusing
Add Kink Label for source
add Breadcrumb
  • Loading branch information...
ilaborie committed Mar 24, 2012
1 parent eb299f8 commit 1995598f521030c5fd77da1466cfb4b109c820c8
Showing with 208 additions and 60 deletions.
  1. +60 −26 README.md
  2. +28 −12 org.ilaborie.pineneedles/src/main/webapp/index.html
  3. +99 −20 org.ilaborie.pineneedles/src/main/webapp/js/script.js
  4. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/accordion.less
  5. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/alerts.less
  6. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/bootstrap.less
  7. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/breadcrumbs.less
  8. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/button-groups.less
  9. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/buttons.less
  10. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/carousel.less
  11. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/close.less
  12. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/code.less
  13. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/component-animations.less
  14. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/dropdowns.less
  15. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/forms.less
  16. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/grid.less
  17. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/hero-unit.less
  18. +1 −1 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/labels.less
  19. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/layouts.less
  20. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/mixins.less
  21. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/modals.less
  22. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/navbar.less
  23. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/navs.less
  24. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/pager.less
  25. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/pagination.less
  26. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/patterns.less
  27. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/popovers.less
  28. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/print.less
  29. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/progress-bars.less
  30. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/reset.less
  31. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/responsive.less
  32. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/scaffolding.less
  33. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/sprites.less
  34. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/tables.less
  35. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/thumbnails.less
  36. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/tooltip.less
  37. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/type.less
  38. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/utilities.less
  39. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/variables.less
  40. 0 org.ilaborie.pineneedles/src/main/webapp/{less → style}/bootstrap/wells.less
  41. +20 −1 org.ilaborie.pineneedles/src/main/webapp/{less → style}/style.less
View
@@ -16,44 +16,74 @@ In development, not usable at the time.
REST API
--------
+### Search
+
+#### Basic Search
+
+#### Advanced Search
+
+### Indexing
+
+#### Clear index
+
+#### Synchronize index
-### Shelves
+### Administration
+#### Shelves
On <http://localhost:8080/org.ilaborie.pineneedles/rest/shelves>
-#### Create/Update a Shelf
+##### Create/Update a Shelf
curl -XPUT -H "Content-Type: application/json" http://localhost:8080/org.ilaborie.pineneedles/rest/shelves --data-binary '{"name":"aze","description":"arf"}'
Should return the created/updated shelf
-#### Get Shelf
+##### Get Shelf
- curl -XGET http://localhost:8080/org.ilaborie.pineneedles/rest/shelves/037599ab-9557-4cff-a85d-aea9f6526550
+ curl -XGET http://localhost:8080/org.ilaborie.pineneedles/rest/shelves/<id>
-#### Delete Shelf
+##### Delete Shelf
- curl -XGET http://localhost:8080/org.ilaborie.pineneedles/rest/shelves/037599ab-9557-4cff-a85d-aea9f6526550
+ curl -XDELETE http://localhost:8080/org.ilaborie.pineneedles/rest/shelves/<id>
-#### Get all Shelves
+##### Get all Shelves
curl -XGET http://localhost:8080/org.ilaborie.pineneedles/rest/shelves
-### Sources
+#### Sources
Read on <http://localhost:8080/org.ilaborie.pineneedles/rest/sources>
+
Update folder on <http://localhost:8080/org.ilaborie.pineneedles/rest/folders>
+
Update links on <http://localhost:8080/org.ilaborie.pineneedles/rest/links>
-### Get Source
-### Get all Sources
-### Delete Source
-### Create/Update folder source
-### Create/Update link source
+##### Get Source
-Ideas
------
+ curl -XGET http://localhost:8080/org.ilaborie.pineneedles/rest/sources/<id>
+
+##### Get Sources by Shelf
+
+ curl -XGET http://localhost:8080/org.ilaborie.pineneedles/rest/sources/self/<id>
+
+##### Delete Source
+
+ curl -XDELETE http://localhost:8080/org.ilaborie.pineneedles/rest/sources/<id>
+
+##### Create/Update folder source
+
+ curl -XPUT http://localhost:8080/org.ilaborie.pineneedles/rest/folders/ -d '{ "name":"plop","description":"desc","path":"/Users/plop/Documents","recursive":true}'
+
+##### Create/Update link source
+
+ curl -XPUT http://localhost:8080/org.ilaborie.pineneedles/rest/links/ -d '{ "name":"plop","description":"desc","links":"…"}'
+
+TODO / Ideas
+------------
+* Custom background (photo? gradient)
+* Better Error dialog
### Web Check
@@ -65,28 +95,32 @@ Ideas
* use field for Chrome search
+* rest/search?q=
+* rest/search?q= + fq (on source, on shelve)
+* paging
+* opening
+
+### Index
+
+* rest/index/clear
+* rest/index/sync
+
### Administration
-* Add Breadcrumb: **Shelves > Shelf > Sources > Source**
-* Add a .label for source type: folder~warn link~info
-* Change source dialog title func(kind)
-* Focus on Source Dialog
-* Focus on Detail Shelf
-* Focus on Detail Source
-* Enter on Source dialog field
+* Support Links Source
* Handle exclude Pattern for Folder Sources
-* Handle Field info for links source textarea
-* Disable 'Update' btw if not changed
-* Handle invalid field UI ?
-* Allow Markdown as description formatting
+* Handle Field info for links source textarea, folder
+* Disable 'Update' btn if not changed
### About
* Shiny HTML5 Canvas animation (pine cone fall, + rotating)
### Possible Background
+* Search with brown color (like wooden texture) (Texture dusty wood)
+
<https://secure.flickr.com/photos/24557420@N05/3975359536/sizes/o/in/photostream/>
<https://secure.flickr.com/photos/nouspique/4633864261/sizes/o/in/photostream/>
<https://secure.flickr.com/photos/tomtolkien/4670166552/sizes/o/in/photostream/>
@@ -10,11 +10,15 @@
<title>Pine Needles</title>
<meta name="description" content="A Pine Needles Frontend">
<meta name="author" content="Igor Laborie <ilaborie@gmail.com>">
-
<meta name="viewport" content="width=device-width">
+ <!-- Search -->
+ <link rel="search" type="application/opensearchdescription+xml" title="PineNeedles" href="/org.ilaborie.pineneedles/opensearch.xml">
+
+ <!-- Fonts -->
+ <link href='http://fonts.googleapis.com/css?family=Mystery+Quest' rel='stylesheet' type='text/css'>
<!-- Less -->
- <link type="text/css" rel="stylesheet" href="less/style.css">
+ <link type="text/css" rel="stylesheet" href="style/style.css">
<script src="js/libs/modernizr-2.5.3-respond-1.1.0.min.js"></script>
<!-- Shelf Template -->
@@ -29,7 +33,8 @@ <h2>{{name}}</h2>
<!-- Source Template -->
<script id="source" type="text/html">
<div id="source-{{id}}" class="source">
- <h2>{{name}}</h2>
+ <h2>{{name}}&nbsp;<span class="label label-{{kind}}">{{kindLabel}}</span></h2>
+ <div class="location">{{detail}}</div>
<p>{{description}}</p>
<a id="btnShowSource-{{id}}" class="btn showSource" href="#">View details &raquo;</a>
<div class="pull-right"><a id="btnDelSource-{{id}}" class="btn btn-danger delSource" href="#"><i class="icon-trash icon-white"></i>&nbsp;Delete</a></div>
@@ -102,10 +107,21 @@ <h3><a href="">Document 2</a></h3>
<!-- Admin Page -->
<div id="admin-content" class="content hidden">
- <div class="page-header">
- <h1>Administration</h1>
- Manage Shelves and Sources
+ <div class="page-header well">
+ <h1>Administration <small>Manage Shelves and Sources</small></h1>
</div>
+ <ul id="breadcrumb-shelves" class="breadcrumb">
+ <li class="active">Shelves</li>
+ </ul>
+ <ul id="breadcrumb-shelf" class="breadcrumb hidden">
+ <li><a class="returnToShelves" href="#">Shelves</a> <span class="divider">></span></li>
+ <li class="active">Shelf</li>
+ </ul>
+ <ul id="breadcrumb-source" class="breadcrumb hidden">
+ <li><a class="returnToShelves" href="#">Shelves</a> <span class="divider">></span></li>
+ <li><a class="returnToShelf" href="#">Shelf</a> <span class="divider">></span></li>
+ <li class="active">Source</li>
+ </ul>
<div id="admin-notify">
<!-- Fill y Javascript -->
</div>
@@ -197,11 +213,11 @@ <h3>Create a new Source</h3>
<hr />
<div id="source-folders-create-detail" class="hidden">
<label for="source-create-folder" class="mandatory">Folder</label>
- <input type="text" title="Folder" value="" name="source-create-folder" id="source-create-folder" placeholder="Folder to index" />
+ <input type="text" title="Folder" value="" name="source-create-folder" id="source-create-folder" required="required" placeholder="Folder to index" />
<br/>
- <label for="source-recursif" class="checkbox" >
- <input type="checkbox" title="Recursif" name="source-recursif" id="source-create-recursif" /> Recursive
+ <label for="source-create-recursif" class="checkbox" >
+ <input type="checkbox" title="Recursif" name="source-create-recursif" id="source-create-recursif" /> Recursive
</label>
</div>
<div id="source-links-create-detail" class="hidden">
@@ -220,7 +236,7 @@ <h3>Create a new Source</h3>
<p><a href="#" id="btnBackShelf" class="btn">&laquo; Back to Shelf</a></p>
<div class="row">
<form id="source-form" class="well span10 offset1">
- <input type="hidden" name="source-id" value=""/>
+ <input type="hidden" name="source-id" id="source-id" value=""/>
<label for="source-name" class="mandatory">Name</label>
<input type="text" value="" title="Name" name="name" id="source-name" required="required" placeholder="Source name" class="span5"/>
<label for="source-description" >Description</label>
@@ -229,8 +245,8 @@ <h3>Create a new Source</h3>
<hr />
<div id="source-folder-detail" class="hidden">
<!-- Special Folder source -->
- <label for="source-folder" class="mandatory">Folder</label>
- <input type="text" title="Folder" value="" name="source-folder-display" id="source-folder-field" class="span5"/>
+ <label for="source-folder-field" class="mandatory">Folder</label>
+ <input type="text" title="Folder" value="" name="source-folder-field" id="source-folder-field" class="span5"/>
<label for="source-recursif" class="checkbox">
<input type="checkbox" title="Recursif" name="source-recursif" id="source-recursif"/> Recursive
Oops, something went wrong.

0 comments on commit 1995598

Please sign in to comment.