Update readme to mention the bootstrap-ui branch. Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/f515dea0 Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/f515dea0 Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/f515dea0
Branch: refs/heads/bootstrap-ui Commit: f515dea03b144573b15b7cd8e477dbf5767ae6de Parents: 35c2b8d Author: David M. Johnson <[email protected]> Authored: Tue Dec 22 19:22:39 2015 -0500 Committer: David M. Johnson <[email protected]> Committed: Tue Dec 22 19:22:39 2015 -0500 ---------------------------------------------------------------------- README.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/f515dea0/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 73c76e4..4c377e1 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,11 @@ Rollarcus 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: -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. +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. -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. +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. + +2) [bootstrap-ui](https://github.com/snoopdave/rollarcus/tree/bootstrap-ui): the idea is to modernize the Roller editor/admin UI and make it more consistent by using Bootstrap instead. This should be much less labor intensive than designing and implementing a new REST API and building a UI baesed on that.
