Ready updates
Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/f73f35ad Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/f73f35ad Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/f73f35ad Branch: refs/heads/bootstrap-ui Commit: f73f35ad87abd81316d8b3f6104f43e45492d29e Parents: bf13e4f Author: Dave Johnson <[email protected]> Authored: Tue Dec 22 19:16:35 2015 -0500 Committer: Dave Johnson <[email protected]> Committed: Tue Dec 22 19:16:35 2015 -0500 ---------------------------------------------------------------------- README.md | 29 +++++++++++++++++++---------- docs/readme-images/edit-entry.jpg | Bin 0 -> 176852 bytes docs/readme-images/entries.jpg | Bin 0 -> 144071 bytes 3 files changed, 19 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/f73f35ad/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 73c76e4..fe5f430 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,26 @@ -Rollarcus +Rollarcus: bootstrap-ui branch === -This is Rollarcus: an __experimental fork of [Apache Roller](https://github.com/apache/roller)__. -So far, there are two experiments here, each in its own branch: +This is Rollarcus: my experimental fork of [Apache Roller](https://github.com/apache/roller). -1) [shiro_not_spring](https://github.com/snoopdave/rollarcus/tree/shiro_not_spring): is a -branch of Roller's trunk that has been modified to use Apache Shiro for security instead of Spring. -Also, all Spring depdenencies have been removed. +This branch __bootstrap-ui__ rewrites the Roller editor/admin user-interface (UI) using Bootstrap. -2) [jaxrs_not_struts](https://github.com/snoopdave/rollarcus/tree/jaxrs_not_struts): is a branch of Roller's -trunk that has been modified to add a REST API, powered by Apache CXF, Apache Shiro and includes Arquillian-powered -tests for the REST API. Someday this REST API could power a new JavaScript based web interface for Roller -and allow the project to move on from Struts. +Status +--- +The Edit-Entry and Entries pages have been converted over and you can see screen-shots of what they look like below. +That's all +--- +Want to contribute? Shoot me a PR. +Screen-shots +--- +Here's what the Edit-Entry and Entries pages look like with Bootstrap. +Edit-Entry: + + + +Entries: + + http://git-wip-us.apache.org/repos/asf/roller/blob/f73f35ad/docs/readme-images/edit-entry.jpg ---------------------------------------------------------------------- diff --git a/docs/readme-images/edit-entry.jpg b/docs/readme-images/edit-entry.jpg new file mode 100644 index 0000000..85b1e0f Binary files /dev/null and b/docs/readme-images/edit-entry.jpg differ http://git-wip-us.apache.org/repos/asf/roller/blob/f73f35ad/docs/readme-images/entries.jpg ---------------------------------------------------------------------- diff --git a/docs/readme-images/entries.jpg b/docs/readme-images/entries.jpg new file mode 100644 index 0000000..5746c99 Binary files /dev/null and b/docs/readme-images/entries.jpg differ
