You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2016/05/27 22:50:23 UTC
[01/47] roller git commit: Update README.txt
Repository: roller
Updated Branches:
refs/heads/bootstrap-ui [created] a3f685b22
Update README.txt
Couple of notes about my fork of Roller.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/ddd41936
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/ddd41936
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/ddd41936
Branch: refs/heads/bootstrap-ui
Commit: ddd41936f1c5529197d69fa146a0280970aa9117
Parents: 700fb39
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Dec 29 10:11:22 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Dec 29 10:11:22 2014 -0500
----------------------------------------------------------------------
README.txt | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/ddd41936/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index fcf2b08..ad9cc19 100644
--- a/README.txt
+++ b/README.txt
@@ -1,5 +1,19 @@
README.txt
+
+This is my personal and experimental fork of Apache Roller.
+There are two experiments here:
+
+1) 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: is a branch of Roller's trunk that has been modified to add
+a REST API, powered by Apache CXF and Apache Shiro. Someday this REST API could power
+a new JavaScript based web interface for Roller.
+
+
+----------------------------------------------------------
+
This file exists at the top-level of the Roller source tree.
Roller is made up of the following Maven projects:
[23/47] roller git commit: Update readme to mention the bootstrap-ui
branch.
Posted by sn...@apache.org.
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 <sn...@apache.org>
Authored: Tue Dec 22 19:22:39 2015 -0500
Committer: David M. Johnson <sn...@apache.org>
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.
[11/47] roller git commit: Did not mean to commit this.
Posted by sn...@apache.org.
Did not mean to commit this.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/35c2b8de
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/35c2b8de
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/35c2b8de
Branch: refs/heads/bootstrap-ui
Commit: 35c2b8de4654242aa77e875c455cae896987cd80
Parents: f6e3764
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Dec 16 09:41:41 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Dec 16 09:41:41 2015 -0500
----------------------------------------------------------------------
app/roller-webapp.iml | 118 ---------------------------------------------
1 file changed, 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/35c2b8de/app/roller-webapp.iml
----------------------------------------------------------------------
diff --git a/app/roller-webapp.iml b/app/roller-webapp.iml
deleted file mode 100644
index 3ff24c6..0000000
--- a/app/roller-webapp.iml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="web" name="Web">
- <configuration>
- <descriptors>
- <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
- </descriptors>
- <webroots>
- <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
- </webroots>
- <sourceRoots>
- <root url="file://$MODULE_DIR$/src/main/java" />
- <root url="file://$MODULE_DIR$/src/main/resources" />
- </sourceRoots>
- </configuration>
- </facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/webapp" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: org.eclipse.persistence:eclipselink:2.5.2" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.persistence:javax.persistence:2.1.0" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.persistence:commonj.sdo:2.1.1" level="project" />
- <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
- <orderEntry type="library" name="Maven: com.google.inject:guice:3.0" level="project" />
- <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
- <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.10.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.10.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.10.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.10.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.10.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
- <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
- <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlrpc:xmlrpc-common:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlrpc:xmlrpc-client:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlrpc:xmlrpc-server:3.1.3" level="project" />
- <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.ws.commons.util:ws-commons-util:1.0.2" level="project" />
- <orderEntry type="library" name="Maven: net.oauth.core:oauth-provider:20100527" level="project" />
- <orderEntry type="library" name="Maven: net.oauth.core:oauth:20100527" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: com.rometools:rome-fetcher:1.5.0" level="project" />
- <orderEntry type="library" name="Maven: com.rometools:rome:1.5.0" level="project" />
- <orderEntry type="library" name="Maven: com.rometools:rome-utils:1.5.0" level="project" />
- <orderEntry type="library" name="Maven: org.jdom:jdom:2.0.2" level="project" />
- <orderEntry type="library" name="Maven: com.rometools:rome-propono:1.5.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.1" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-log4j12:1.7.7" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-web:4.1.0.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.0.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.0.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.0.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.0.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.0.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:3.2.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:3.2.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-ldap:3.2.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.ldap:spring-ldap-core:1.3.2.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.2.8.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-openid:3.2.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.openid4java:openid4java-nodeps:0.9.6" level="project" />
- <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:3.2.5.RELEASE" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.20" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: xerces:xercesImpl:2.10.0" level="project" />
- <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpclient:4.2.3" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpcore:4.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-taglibs:3.2.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.security:spring-security-acl:3.2.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.apache.struts:struts2-spring-plugin:2.3.16.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.struts:struts2-core:2.3.16.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.struts.xwork:xwork-core:2.3.16.3" level="project" />
- <orderEntry type="library" name="Maven: asm:asm:3.3" level="project" />
- <orderEntry type="library" name="Maven: asm:asm-commons:3.3" level="project" />
- <orderEntry type="library" name="Maven: asm:asm-tree:3.3" level="project" />
- <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.19" level="project" />
- <orderEntry type="library" name="Maven: ognl:ognl:3.0.6" level="project" />
- <orderEntry type="library" name="Maven: javassist:javassist:3.11.0.GA" level="project" />
- <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
- <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.struts:struts2-tiles-plugin:2.3.16.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tiles:tiles-core:2.0.6" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tiles:tiles-api:2.0.6" level="project" />
- <orderEntry type="library" name="Maven: commons-logging:commons-logging-api:1.1" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.tiles:tiles-jsp:2.0.6" level="project" />
- <orderEntry type="library" name="Maven: xml-security:xmlsec:1.3.0" level="project" />
- <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: javax.mail:mail:1.4.7" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet.jsp:jsp-api:2.2" level="project" />
- <orderEntry type="library" name="Maven: commons-validator:commons-validator:1.4.0" level="project" />
- <orderEntry type="library" name="Maven: commons-digester:commons-digester:1.8" level="project" />
- <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
- <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
- <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.apache.derby:derbynet:10.11.1.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.apache.derby:derby:10.11.1.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant:1.9.4" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant-launcher:1.9.4" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.apache.derby:derbyclient:10.11.1.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
- </component>
-</module>
\ No newline at end of file
[06/47] roller git commit: Update README.md
Posted by sn...@apache.org.
Update README.md
more details
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/0364bc9d
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/0364bc9d
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/0364bc9d
Branch: refs/heads/bootstrap-ui
Commit: 0364bc9da215e5b7af172e0956fb98a8b604a1bc
Parents: 61cf7e3
Author: David M. Johnson <dm...@apigee.com>
Authored: Fri Jan 2 13:49:30 2015 -0500
Committer: David M. Johnson <dm...@apigee.com>
Committed: Fri Jan 2 13:49:30 2015 -0500
----------------------------------------------------------------------
README.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/0364bc9d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index e3dc7d9..39aaf02 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,9 @@ branch of Roller's trunk that has been modified to use Apache Shiro for security
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 and Apache Shiro. Someday this REST API
-could power a new JavaScript based web interface for Roller.
+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.
[02/47] roller git commit: Better notes about the fork.
Posted by sn...@apache.org.
Better notes about the fork.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/76d87c28
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/76d87c28
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/76d87c28
Branch: refs/heads/bootstrap-ui
Commit: 76d87c2835275616bcad3fffc339b9042723923a
Parents: ddd4193
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Jan 2 13:05:40 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Jan 2 13:05:40 2015 -0500
----------------------------------------------------------------------
README.md | 33 +++++++++++++
README.txt | 63 ------------------------
app/roller-webapp.iml | 118 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 151 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/76d87c28/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c113dae
--- /dev/null
+++ b/README.md
@@ -0,0 +1,33 @@
+README.txt
+===
+
+This is my personal and experimental fork of Apache Roller.
+There are two experiments here:
+
+1) 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: is a branch of Roller's trunk that has been modified to add
+a REST API, powered by Apache CXF and Apache Shiro. Someday this REST API could power
+a new JavaScript based web interface for Roller.
+
+README.txt
+===
+
+This is Rollarcus: my experimental fork of [Apache Roller](https://github.com/apache/roller).
+So far, there are two experiments here:
+
+1) [https://github.com/snoopdave/rollarcus/tree/shiro_not_spring(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) [https://github.com/snoopdave/rollarcus/tree/jaxrs_not_struts](jaxrs_not_struts): is a branch of Roller's
+trunk that has been modified to add a REST API, powered by Apache CXF and Apache Shiro. Someday this REST API
+could power a new JavaScript based web interface for Roller.
+
+
+That's all
+---
+
+Want to contribute? Shoot me a PR.
+
http://git-wip-us.apache.org/repos/asf/roller/blob/76d87c28/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
deleted file mode 100644
index ad9cc19..0000000
--- a/README.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-README.txt
-
-
-This is my personal and experimental fork of Apache Roller.
-There are two experiments here:
-
-1) 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: is a branch of Roller's trunk that has been modified to add
-a REST API, powered by Apache CXF and Apache Shiro. Someday this REST API could power
-a new JavaScript based web interface for Roller.
-
-
-----------------------------------------------------------
-
-This file exists at the top-level of the Roller source tree.
-
-Roller is made up of the following Maven projects:
-
- roller-project: Top level project
- app: Roller Weblogger webapp, JSP pages, Velocity templates
- assembly-release: Used to create official distributions of Roller
- docs: Roller documentation in ODT (OpenOffice/LibreOffice) format
- it-selenium Integrated browser tests for Roller using Selenium
-
-To pull the latest trunk sources you need a Subversion client:
- svn co https://svn.apache.org/repos/asf/roller/trunk roller_trunk
-
-Building this version of Roller requires Apache Maven 3.0.5.
- - How to build Roller: https://cwiki.apache.org/confluence/x/EM4
- - To build and run Roller on Eclipse: https://cwiki.apache.org/confluence/x/EM4
-
-----------------------------------------------------------
-How to build the source
-
-The normal Roller build creates a product generically suitable for use several
-application containers, however see the Roller Install guide for application server
-specific configuration information.
-
-After pulling the source tree and changing directory to its top level, as
-indicated above, the following command will build and run all unit tests:
-
- mvn clean install
-
-After doing that, you should find the newly built Roller webapp, suitable
-for use in app/target/roller.
-
-To build Roller, subsequently run "mvn clean install" from the assembly-release
-folder. After that, you'll find Roller distribution files in
-assembly-release/target.
-
----------------------------
-NOTES
-
-Building other versions of Roller
-
-If you wish to pull a branch other than the trunk, replace the word
-"trunk" in both lines above with the appropriate branch name. Note that
-versions of Roller before 5.0 have an Ant-based build. In general, you should
-be able to follow instructions accompanying the sources that you pull in order
-to build that version.
-
http://git-wip-us.apache.org/repos/asf/roller/blob/76d87c28/app/roller-webapp.iml
----------------------------------------------------------------------
diff --git a/app/roller-webapp.iml b/app/roller-webapp.iml
new file mode 100644
index 0000000..3ff24c6
--- /dev/null
+++ b/app/roller-webapp.iml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="web" name="Web">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
+ </descriptors>
+ <webroots>
+ <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+ </webroots>
+ <sourceRoots>
+ <root url="file://$MODULE_DIR$/src/main/java" />
+ <root url="file://$MODULE_DIR$/src/main/resources" />
+ </sourceRoots>
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/webapp" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: org.eclipse.persistence:eclipselink:2.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.persistence:javax.persistence:2.1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.persistence:commonj.sdo:2.1.1" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+ <orderEntry type="library" name="Maven: com.google.inject:guice:3.0" level="project" />
+ <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.10.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.10.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.10.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.10.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.10.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
+ <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlrpc:xmlrpc-common:3.1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlrpc:xmlrpc-client:3.1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlrpc:xmlrpc-server:3.1.3" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.ws.commons.util:ws-commons-util:1.0.2" level="project" />
+ <orderEntry type="library" name="Maven: net.oauth.core:oauth-provider:20100527" level="project" />
+ <orderEntry type="library" name="Maven: net.oauth.core:oauth:20100527" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.rometools:rome-fetcher:1.5.0" level="project" />
+ <orderEntry type="library" name="Maven: com.rometools:rome:1.5.0" level="project" />
+ <orderEntry type="library" name="Maven: com.rometools:rome-utils:1.5.0" level="project" />
+ <orderEntry type="library" name="Maven: org.jdom:jdom:2.0.2" level="project" />
+ <orderEntry type="library" name="Maven: com.rometools:rome-propono:1.5.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-log4j12:1.7.7" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-web:4.1.0.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.0.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.0.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.0.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.0.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.0.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:3.2.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:3.2.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-ldap:3.2.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.ldap:spring-ldap-core:1.3.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.2.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-openid:3.2.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.openid4java:openid4java-nodeps:0.9.6" level="project" />
+ <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:3.2.5.RELEASE" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.20" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: xerces:xercesImpl:2.10.0" level="project" />
+ <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpclient:4.2.3" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpcore:4.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-taglibs:3.2.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-acl:3.2.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.struts:struts2-spring-plugin:2.3.16.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.struts:struts2-core:2.3.16.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.struts.xwork:xwork-core:2.3.16.3" level="project" />
+ <orderEntry type="library" name="Maven: asm:asm:3.3" level="project" />
+ <orderEntry type="library" name="Maven: asm:asm-commons:3.3" level="project" />
+ <orderEntry type="library" name="Maven: asm:asm-tree:3.3" level="project" />
+ <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.19" level="project" />
+ <orderEntry type="library" name="Maven: ognl:ognl:3.0.6" level="project" />
+ <orderEntry type="library" name="Maven: javassist:javassist:3.11.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.struts:struts2-tiles-plugin:2.3.16.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tiles:tiles-core:2.0.6" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tiles:tiles-api:2.0.6" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging-api:1.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.tiles:tiles-jsp:2.0.6" level="project" />
+ <orderEntry type="library" name="Maven: xml-security:xmlsec:1.3.0" level="project" />
+ <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: javax.mail:mail:1.4.7" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet.jsp:jsp-api:2.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-validator:commons-validator:1.4.0" level="project" />
+ <orderEntry type="library" name="Maven: commons-digester:commons-digester:1.8" level="project" />
+ <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.derby:derbynet:10.11.1.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.derby:derby:10.11.1.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant:1.9.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant-launcher:1.9.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.derby:derbyclient:10.11.1.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+ </component>
+</module>
\ No newline at end of file
[34/47] roller git commit: Prevent 404 not found at getting domTT.js
and domTT.css
Posted by sn...@apache.org.
Prevent 404 not found at getting domTT.js and domTT.css
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/95c6a4c7
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/95c6a4c7
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/95c6a4c7
Branch: refs/heads/bootstrap-ui
Commit: 95c6a4c7aceab6a5942456e130bea52f942e88ed
Parents: 8042fd7
Author: Kohei Nozaki <ky...@bridge9.sakura.ne.jp>
Authored: Wed Jan 6 14:32:38 2016 +0900
Committer: Kohei Nozaki <ky...@bridge9.sakura.ne.jp>
Committed: Wed Jan 6 14:32:38 2016 +0900
----------------------------------------------------------------------
app/src/main/webapp/WEB-INF/web.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/95c6a4c7/app/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/web.xml b/app/src/main/webapp/WEB-INF/web.xml
index 8bb2795..f1ef1b7 100644
--- a/app/src/main/webapp/WEB-INF/web.xml
+++ b/app/src/main/webapp/WEB-INF/web.xml
@@ -166,6 +166,10 @@
<dispatcher>REQUEST</dispatcher>
<dispatcher>FORWARD</dispatcher>
</filter-mapping>
+ <filter-mapping>
+ <filter-name>struts2</filter-name>
+ <url-pattern>/struts/*</url-pattern>
+ </filter-mapping>
<!-- Context Listeners -->
<listener>
[16/47] roller git commit: Beginnings of a Bootstrap rewrite of the
Roller editor/admin UI,
using Struts-Bootstrap plugin. The main menu and edit weblog page are
essentially complete.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.eot
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.eot b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.eot
new file mode 100644
index 0000000..b93a495
Binary files /dev/null and b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.eot differ
[41/47] roller git commit: Weekend's worth of work towards converting
the Bookmarks page to Bootstrap, almost done.
Posted by sn...@apache.org.
Weekend's worth of work towards converting the Bookmarks page to Bootstrap, almost done.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/81168587
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/81168587
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/81168587
Branch: refs/heads/bootstrap-ui
Commit: 81168587872c2f34a0ae8a6ce79ad069ff1b15a7
Parents: 604dba3
Author: Dave Johnson <sn...@gmail.com>
Authored: Tue Jan 26 12:22:41 2016 -0500
Committer: Dave Johnson <sn...@gmail.com>
Committed: Tue Jan 26 12:22:41 2016 -0500
----------------------------------------------------------------------
.../weblogger/ui/struts2/editor/Bookmarks.java | 3 +-
.../resources/ApplicationResources.properties | 57 +-
.../webapp/WEB-INF/jsps/editor/Bookmarks.jsp | 576 ++++++++++++++++---
.../WEB-INF/jsps/editor/BookmarksSidebar.jsp | 8 +-
.../webapp/WEB-INF/jsps/editor/Categories.jsp | 2 +
app/src/main/webapp/WEB-INF/tiles.xml | 2 +-
6 files changed, 531 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/81168587/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
index 77b3daa..3b91677 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
@@ -67,8 +67,7 @@ public class Bookmarks extends UIAction {
public void myPrepare() {
try {
- BookmarkManager bmgr = WebloggerFactory.getWeblogger()
- .getBookmarkManager();
+ BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
if (!StringUtils.isEmpty(getFolderId())) {
setFolder(bmgr.getFolder(getFolderId()));
} else {
http://git-wip-us.apache.org/repos/asf/roller/blob/81168587/app/src/main/resources/ApplicationResources.properties
----------------------------------------------------------------------
diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties
index 250fe3e..cee7e75 100644
--- a/app/src/main/resources/ApplicationResources.properties
+++ b/app/src/main/resources/ApplicationResources.properties
@@ -30,6 +30,7 @@ generic.no=No
generic.name=Name
generic.description=Description
generic.save=Save
+generic.rename=Rename
generic.edit=Edit
generic.delete=Delete
generic.tagline=Tagline
@@ -37,20 +38,23 @@ generic.error.check.logs=System error - check logs for more information.
generic.changes.saved=Changes saved
generic.toggle=Toggle
generic.success=Success
+generic.looksGood=Looks good!
# ------------------------------------------------------------- BookmarkForm.jsp
bookmarkForm.add.title=Add New Bookmark
-bookmarkForm.add.subtitle=Adding new bookmark in folder [{0}]
+bookmarkForm.add.subtitle=Adding new bookmark in folder:
bookmarkForm.edit.title=Edit Bookmark
-bookmarkForm.edit.subtitle=Editing bookmark in folder [{0}]
+bookmarkForm.edit.subtitle=Editing bookmark in folder:
bookmarkForm.image=Image URL
bookmarkForm.rssUrl=Newsfeed URL
bookmarkForm.url=Bookmark URL
bookmarkForm.created=Bookmark "{0}" created
bookmarkForm.updated=Bookmark "{0}" updated
+bookmarkForm.required=Name and Bookmark URL are required.
+bookmarkForm.badUrls=These URLs are invalid:
-bookmarkForm.requiredFields=The {0} and {1} fields are required.
+bookmarkForm.requiredFields=Name and Bookmark URL are required.
# errors from validation
Bookmark.error.nameNull=Name is a required field
@@ -68,38 +72,39 @@ bookmarkForm.error.duplicateName=Bookmark with that name already exists in folde
bookmarksForm.root=root
bookmarksForm.rootTitle=Blogroll
-bookmarksForm.rootPrompt=\
-This is your blog''s main bookmarks folder. \
-The bookmarks you keep here will appear in the blogroll section of your blog \
-(assuming that you are using one of the default themes). You can create \
-additional bookmark folders, but you will have to add corresponding bookmark display \
-macros to your weblog''s templates if you wish to display their contents.
+bookmarksForm.subtitle=Manage blogrolls in weblog <span>{0}</span>
-bookmarksForm.subtitle=Manage bookmarks in weblog <span>{0}</span>
+bookmarksForm.rootPrompt=This is your blog''s default blogroll. \
+The links (also known as bookmarks) you keep here will appear in the blogroll section of your blog \
+(assuming that you are using one of the default themes). You can create additional blogrolls, \
+but you will have to add corresponding blogroll display macros to your weblog''s templates \
+if you wish to display their contents.
-bookmarksForm.addBookmark=Add Bookmark
-bookmarksForm.addFolder=New Bookmark Folder
+bookmarksForm.path=Blogroll
+bookmarksForm.blogrollName=Blogroll name
+bookmarksForm.switchTo=Switch to blogroll
+bookmarksForm.deleteFolder=Delete current blogroll
+
+bookmarksForm.addBookmark=Add blogroll link
+bookmarksForm.addFolder=New blogroll
bookmarksForm.delete=Delete selected
-bookmarksForm.delete.confirm=Delete selected bookmarks?
-bookmarksForm.deleteFolder.confirm=Delete entire folder including all its bookmarks?
+bookmarksForm.delete.confirm=Delete selected blogroll links?
+bookmarksForm.deleteFolder.confirm=Delete entire blogroll including all its links?
bookmarksForm.url=URL
bookmarksForm.feedurl=Newsfeed URL
-bookmarksForm.folder=Bookmark Folder
-bookmarksForm.deleteFolder=Delete folder
-bookmarksForm.viewFolder=Switch to Folder
-bookmarksForm.edit.tip=Click to modify this bookmark
-bookmarksForm.folder.edit.tip=Click to edit folder
-bookmarksForm.move=Move selected to:
-bookmarksForm.move.confirm=Move selected bookmarks?
-bookmarksForm.path=Folder
-bookmarksForm.selectAllLabel=Select all bookmarks
-bookmarksForm.selectOneLabel=Select bookmark named {0}
+bookmarksForm.folder=Blogroll
+bookmarksForm.edit.tip=Click to modify this link
+bookmarksForm.folder.edit.tip=Click to edit blogroll
+bookmarksForm.move=Move selected to
+bookmarksForm.move.confirm=Move selected link?
+bookmarksForm.selectAllLabel=Select all links
+bookmarksForm.selectOneLabel=Select blogroll named {0}
bookmarksForm.visitLink=Visit
bookmarksForm.visitLink.tip=Click to visit this site
bookmarksForm.error.move=Error performing move, parent to child moves not allowed
-bookmarksForm.importBookmarks=Import bookmarks via OPML
-bookmarksForm.noresults=There are currently no folders or bookmarks
+bookmarksForm.importBookmarks=Import Blogroll via OPML
+bookmarksForm.noresults=There are currently no Blogroll links
# --------------------------------------------------------- Bookmarks import.jsp
http://git-wip-us.apache.org/repos/asf/roller/blob/81168587/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
index 4e55680..f569c98 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
@@ -17,82 +17,106 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<%-- JavaScript for bookmarks table --%>
-<script>
-function onDelete() {
- if ( confirm("<s:text name='bookmarksForm.delete.confirm' />") ) {
- document.bookmarks.submit();
- }
-}
-function onDeleteFolder() {
- if ( confirm("<s:text name='bookmarksForm.deleteFolder.confirm' />") ) {
- document.bookmarks.action='<s:url action="bookmarks!deleteFolder" />';
- document.bookmarks.submit();
- }
-}
+<%--
+Blogroll link management
-function onMove() {
- if ( confirm("<s:text name='bookmarksForm.move.confirm' />") ) {
- document.bookmarks.action='<s:url action="bookmarks!move" />';
- document.bookmarks.submit();
- }
-}
-</script>
+We used to call them Bookmarks and Folders, now we call them blogroll links and blogrolls.
+--%>
+
+<%-- ================================================================================================ --%>
+
+<%-- Main blogroll/folder management interface, a checkbox-table with some buttons --%>
+
+<p class="subtitle"> <s:text name="bookmarksForm.subtitle" > <s:param value="weblog" /> </s:text> </p>
<s:if test="folder.name == 'default'">
- <p class="subtitle">
- <s:text name="bookmarksForm.subtitle" >
- <s:param value="weblog" />
- </s:text>
- </p>
- <p class="pagetip">
- <s:text name="bookmarksForm.rootPrompt" />
- </p>
+ <p class="pagetip"> <s:text name="bookmarksForm.rootPrompt" /> </p>
</s:if>
-<s:else>
- <p class="subtitle">
- <s:text name="bookmarksForm.path" />: <s:text name="%{folder.name}" />
- <s:url var="editUrl" action="folderEdit">
- <s:param name="weblog" value="%{actionWeblog.handle}" />
- <s:param name="bean.id" value="%{folder.id}" />
- <s:param name="folderId" value="%{folder.id}" />
- </s:url>
- <s:a href="%{editUrl}"> <span class="glyphicon glyphicon-play-circle"></span> </s:a>
-</s:else>
-
-<%-- Form is a table of folders followed by bookmarks, each with checkbox --%>
+
+
+<%-- table of blogroll links with selection checkboxes, wrapped in a form --%>
+
<s:form action="bookmarks!delete" theme="bootstrap" cssClass="form-horizontal">
<s:hidden name="salt" />
<s:hidden name="weblog" />
- <s:hidden name="folderId" />
-
+ <s:hidden name="folderId" />
+
+ <%-- for default blogroll, show page "tip" and read-only folder name --%>
+
+ <s:if test="folder.name == 'default'">
+
+ <div class="form-group ">
+ <label class="col-sm-3 control-label" for="bookmarks_folder_name">
+ <s:text name="bookmarksForm.blogrollName"/>
+ </label>
+ <div class="col-sm-9 controls">
+ <div class="form-control"> <s:text name="%{folder.name}"/> </div>
+ </div>
+ </div>
+
+ </s:if>
+
+ <s:if test="folder.name != 'default'">
+
+ <%-- Blogroll / Folder Name --%>
+
+ <%-- for other blogrolls, show textarea so user can rename it --%>
+ <%-- don't use Struts tags here so button can be on same line as text input --%>
+
+ <div class="form-group ">
+ <label class="col-sm-3 control-label" for="bookmarks_folder_name">
+ <s:text name="bookmarksForm.blogrollName"/>
+ </label>
+ <div class="col-sm-9 controls">
+ <input style="width:55%; float:left" type="text" name="folder.name"
+ value="<s:text name='%{folder.name}'/>" id="bookmarks_folder_name" class="form-control"
+ onchange="nameChanged()"
+ onkeyup="nameChanged()" />
+ <button type="button" id="rename_button"
+ class="btn btn-success" style="float:left; margin-left:1em;"
+ onclick="renameFolder(); return false;"
+ onsubmit="return false;" >
+ <s:text name="generic.rename"/>
+ </button>
+ <button type="button" id="rename_cancel"
+ class="btn btn-default" style="float:left; margin-left:1em;"
+ onclick="cancelRenameFolder(); return false;"
+ onsubmit="return false;" >
+ <s:text name="generic.cancel"/>
+ </button>
+ </div>
+ </div>
+
+ </s:if>
+
<s:if test="!allFolders.isEmpty">
- <%-- View button --%>
- <s:submit type="button" action="bookmarks!view" key="bookmarksForm.viewFolder" />
- <%-- Folder to View combo-box --%>
- <s:select name="viewFolderId" list="allFolders" listKey="id" listValue="name" onchange="" />
+ <%-- allow user to select the bookmark folder to view --%>
+ <s:select name="viewFolderId" list="allFolders" listKey="id" listValue="name"
+ label="%{getText('bookmarksForm.switchTo')}" onchange="changeFolder()" />
- <br /><br />
</s:if>
+
<table class="rollertable table table-striped">
<tr class="rHeaderTr">
<th width="5%">
- <input name="control" type="checkbox" onclick="toggleFunctionAll(this.checked);"
+ <input name="control" type="checkbox"
+ onclick="toggleFunctionAll(this.checked); selectionChanged()"
title="<s:text name="bookmarksForm.selectAllLabel"/>"/>
</th>
<th class="rollertable" width="25%"><s:text name="generic.name" /></th>
- <th class="rollertable" width="25%"><s:text name="bookmarksForm.url" /></th>
+ <th class="rollertable" width="70%"><s:text name="bookmarksForm.url" /></th>
<th class="rollertable" width="5%"><s:text name="generic.edit" /></th>
- <th class="rollertable" width="5%"><s:text name="bookmarksForm.visitLink" /></th>
</tr>
<s:if test="folder.bookmarks.size > 0">
- <%-- Bookmarks --%>
+ <%-- Blogroll links --%>
+
<s:iterator id="bookmark" value="folder.bookmarks" status="rowstatus">
+
<s:if test="#rowstatus.odd == true">
<tr class="rollertable_odd">
</s:if>
@@ -101,17 +125,27 @@ function onMove() {
</s:else>
<td class="rollertable center" style="vertical-align:middle">
- <input type="checkbox" name="selectedBookmarks"
- title="<s:text name="bookmarksForm.selectOneLabel"><s:param value="#bookmark.name"/></s:text>"
- value="<s:property value="#bookmark.id"/>" />
+ <input type="checkbox" name="selectedBookmarks" onchange="selectionChanged()"
+ title="<s:text name="bookmarksForm.selectOneLabel"><s:param value="#bookmark.name"/></s:text>"
+ value="<s:property value="#bookmark.id"/>" />
</td>
<td>
- <str:truncateNicely lower="25" upper="30" ><s:property value="#bookmark.name" /></str:truncateNicely>
+ <str:truncateNicely lower="40" upper="50" >
+ <s:property value="#bookmark.name" />
+ </str:truncateNicely>
</td>
<td>
- <str:truncateNicely lower="40" upper="50" ><s:property value="#bookmark.url" /></str:truncateNicely>
+ <s:if test="#bookmark.url != null" >
+ <a href='<s:property value="#bookmark.url" />' target='_blank' >
+ <str:truncateNicely lower="70" upper="90" >
+ <s:property value="#bookmark.url" />
+ </str:truncateNicely>
+ <span class="glyphicon glyphicon-play-circle"></span>
+ </a>
+ </s:if>
+
</td>
<td align="center">
@@ -123,45 +157,419 @@ function onMove() {
<s:a href="%{editUrl}"> <span class="glyphicon glyphicon-edit"></span> </s:a>
</td>
- <td align="center">
- <s:if test="#bookmark.url != null" >
- <a href="<s:property value="#bookmark.url" />">
- <span class="glyphicon glyphicon-play-circle"></span>
- </a>
- </s:if>
- </td>
-
</tr>
+
</s:iterator>
</s:if>
+
<s:else>
<tr>
- <td style="vertical-align:middle" colspan="7"><s:text name="bookmarksForm.noresults" /></td>
+ <td style="vertical-align:middle; padding-top: 1em;" colspan="7">
+ <s:text name="bookmarksForm.noresults" />
+ </td>
</tr>
</s:else>
+
</table>
-
- <div class="control clearfix">
- <s:if test="folder.bookmarks.size > 0">
- <%-- Delete-selected button --%>
- <input type="button" value="<s:text name="bookmarksForm.delete"/>" onclick="onDelete();return false;" />
- </s:if>
- <s:if test="!allFolders.isEmpty && folder.bookmarks.size > 0">
- <%-- Move-selected button --%>
- <s:submit value="%{getText('bookmarksForm.move')}" action="bookmarks!move" onclick="onMove();return false;" />
+ <%-- Add new blogroll link --%>
+ <button type="button"
+ class="btn btn-success" style="float:left; margin-right: 0.5em"
+ onclick="addBookmark();return false;">
+ <s:text name="bookmarksForm.addBookmark"/>
+ </button>
- <%-- Move-to combo-box --%>
- <s:select name="targetFolderId" list="allFolders" listKey="id" listValue="name" />
- </s:if>
+ <s:if test="folder.bookmarks.size > 0">
- <s:if test="folder.name != 'default'">
- <span style="float:right">
- <s:submit value="%{getText('bookmarksForm.deleteFolder')}"
- action="bookmarks!deleteFolder" onclick="onDeleteFolder();return false;"/>
- </span>
- </s:if>
- </div>
+ <%-- Delete-selected button --%>
+ <input id="delete_selected"
+ value="<s:text name="bookmarksForm.delete"/>"
+ type="button" class="btn btn-danger" style="float:right; margin-right: 0.5em"
+ onclick="deleteFolder();return false;"/>
+
+ </s:if>
+
+ <s:if test="!allFolders.isEmpty && folder.bookmarks.size > 0">
+
+ <%-- Move-to combo-box --%>
+ <s:select name="targetFolderId"
+ theme="simple" cssClass="form-control" cssStyle="float:right; width:30%; margin-right: 5em"
+ list="allFolders" listKey="id" listValue="name"/>
+
+ <%-- Move-selected button --%>
+ <s:submit id="move_selected"
+ value="%{getText('bookmarksForm.move')}"
+ theme="simple" cssClass="btn btn-warning" cssStyle="float:right; margin-right: 0.5em"
+ action="bookmarks!move"
+ onclick="onMoveToFolder();return false;"/>
+
+ </s:if>
+
+ <s:if test="folder.name != 'default'">
+
+ <%-- Delete the whole blogroll --%>
+
+ <s:submit value="%{getText('bookmarksForm.deleteFolder')}"
+ theme="simple" cssClass="btn btn-danger" cssStyle="float:right; clear:left; margin-top:2em"
+ action="bookmarks!deleteFolder"
+ onclick="deleteFolder();return false;"/>
+
+ </s:if>
+
+</s:form>
+
+
+<%-- -------------------------------------------------------- --%>
+
+<%-- JavaScript for Main blogroll/folder management interface --%>
+
+<script>
+
+ var originalName;
+ var renameButton;
+ var renameCancel;
+ var deleteSelectedButton;
+ var moveSelectedButton;
+ var moveToSelector;
+
+ $( document ).ready(function() {
+
+ originalName = $("#bookmarks_folder_name:first").val();
+
+ if ( !originalName ) {
+ originalName = 'default';
+ }
+
+ renameButton = $("#rename_button:first");
+ renameCancel = $("#rename_cancel:first");
+ deleteSelectedButton = $("#delete_selected:first");
+ moveSelectedButton = $("#move_selected:first");
+ moveToSelector = $("#bookmarks_targetFolderId:first");
+
+ nameChanged();
+ selectionChanged();
+ });
+
+ function nameChanged() {
+ var newName = $("#bookmarks_folder_name:first").val();
+ if ( newName != originalName ) {
+ renameButton.attr("disabled", false );
+ renameButton.addClass("btn-success");
+
+ renameCancel.attr("disabled", false );
+
+ } else {
+ renameButton.attr("disabled", true );
+ renameButton.removeClass("btn-success");
+
+ renameCancel.attr("disabled", true );
+ }
+ }
+
+ function selectionChanged() {
+ var checked = false;
+ var selected = $("[name=selectedBookmarks]");
+ for ( i in selected ) {
+ if ( selected[i].checked ) {
+ checked = true;
+ break;
+ }
+ }
+ if ( checked ) {
+ deleteSelectedButton.attr("disabled", false );
+ deleteSelectedButton.addClass("btn-danger");
+
+ moveSelectedButton.attr("disabled", false );
+ moveSelectedButton.addClass("btn-warning");
+
+ } else {
+ deleteSelectedButton.attr("disabled", true );
+ deleteSelectedButton.removeClass("btn-danger");
+ moveSelectedButton.attr("disabled", true );
+ moveSelectedButton.removeClass("btn-warning");
+
+ moveToSelector.attr("disabled", true)
+ }
+ }
+
+ function renameFolder( event ) {
+ event.preventDefault();
+ alert("renameFolder");
+ }
+
+ function cancelRenameFolder( event ) {
+ $("#bookmarks_folder_name:first").val( originalName );
+ nameChanged();
+ }
+
+ function confirmDelete() {
+ if (confirm("<s:text name='bookmarksForm.delete.confirm' />")) {
+ document.bookmarks.submit();
+ }
+ }
+
+ function deleteFolder() {
+ if (confirm("<s:text name='bookmarksForm.deleteFolder.confirm' />")) {
+ document.bookmarks.action = '<s:url action="bookmarks!deleteFolder" />';
+ document.bookmarks.submit();
+ }
+ }
+
+ function onMoveToFolder() {
+ if (confirm("<s:text name='bookmarksForm.move.confirm' />")) {
+ document.bookmarks.action = '<s:url action="bookmarks!move" />';
+ document.bookmarks.submit();
+ }
+ }
+
+ function changeFolder() {
+ // user changed the blogroll/folder, post to "view" action to get new page
+ var bookmarksForm = $("#bookmarks")[0];
+ bookmarksForm.action = "bookmarks!view.rol";
+ bookmarksForm.submit();
+ }
+
+</script>
+
+
+<%-- ================================================================================================ --%>
+
+<%-- add/edit blogroll / folder form --%>
+
+<s:form name="folderEdit" cssStyle="display:none" theme="bootstrap" cssClass="form-horizontal">
+ <s:hidden name="salt" />
+ <s:hidden name="weblog" />
+ <s:hidden name="bean.id" />
+ <s:textfield name="bean.name" size="70" maxlength="255" />
+ <s:submit value="%{getText('generic.save')}" action="%{#mainAction}!save"/>
+ <s:submit value="%{getText('generic.cancel')}" action="folderEdit!cancel" />
</s:form>
+
+
+<%-- ================================================================================================ --%>
+
+<%-- add/edit blogroll link form: a modal --%>
+
+<div id="addedit-bookmark-modal" class="modal fade addedit-bookmark-modal" tabindex="-1" role="dialog">
+
+ <div class="modal-dialog modal-lg">
+
+ <div class="modal-content">
+
+ <div class="modal-header">
+
+ <%-- Titling, processing actions different between add and edit --%>
+ <s:if test="actionName == 'bookmarkEdit'">
+ <s:set var="subtitleKey">bookmarkForm.edit.subtitle</s:set>
+ <s:set var="mainAction">bookmarkEdit</s:set>
+ </s:if>
+ <s:else>
+ <s:set var="subtitleKey">bookmarkForm.add.subtitle</s:set>
+ <s:set var="mainAction">bookmarkAdd</s:set>
+ </s:else>
+
+ <h3>
+ <s:text name="%{#subtitleKey}" > </s:text> <span id="subtitle_folder_name"></span>
+ </h3>
+
+ <div id="bookmark_required_fields" role="alert" class="alert">
+ <s:text name="bookmarkForm.requiredFields" />
+ </div>
+
+ </div> <%-- modal header --%>
+
+ <s:form action="bookmark" theme="bootstrap" cssClass="form-horizontal">
+ <s:hidden name="salt" />
+ <s:hidden name="weblog" />
+ <%--
+ Edit action uses folderId for redirection back to proper bookmarks folder on cancel
+ (as configured in struts.xml); add action also, plus to know which folder to put new
+ bookmark in.
+ --%>
+ <s:hidden name="folderId" />
+ <s:if test="actionName == 'bookmarkEdit'">
+ <%-- bean for bookmark add does not have a bean id yet --%>
+ <s:hidden name="bean.id" />
+ </s:if>
+
+ <div class="modal-body">
+
+ <s:textfield name="bean.name" maxlength="255"
+ onchange="onBookmarkFormChanged()"
+ onkeyup ="onBookmarkFormChanged()"
+ label="%{getText('generic.name')}" />
+
+ <s:textfield name="bean.url" maxlength="255"
+ onchange="onBookmarkFormChanged()"
+ onkeyup ="onBookmarkFormChanged()"
+ label="%{getText('bookmarkForm.url')}" />
+
+ <s:textfield name="bean.feedUrl" maxlength="255"
+ onchange="onBookmarkFormChanged()"
+ onkeyup ="onBookmarkFormChanged()"
+ label="%{getText('bookmarkForm.rssUrl')}" />
+
+ <s:textfield name="bean.description" maxlength="255"
+ onchange="onBookmarkFormChanged()"
+ onkeyup ="onBookmarkFormChanged()"
+ label="%{getText('generic.description')}" />
+
+ <s:textfield name="bean.image" maxlength="255"
+ onchange="onBookmarkFormChanged()"
+ onkeyup ="onBookmarkFormChanged()"
+ label="%{getText('bookmarkForm.image')}" />
+ </div>
+
+ <div class="modal-body">
+ <div class="modal-footer">
+ <p id="feedback-area-edit"></p>
+ <button type="button" id="save_bookmark" onclick="saveBookmark()" class="btn btn-primary">
+ <s:text name="generic.save"/>
+ </button>
+ <button type="button" class="btn" data-dismiss="modal">
+ <s:text name="generic.cancel"/>
+ </button>
+ </div>
+ </div>
+
+ </s:form>
+
+ </div> <%-- modal content --%>
+
+ </div> <%-- modal dialog --%>
+
+</div> <%-- modal --%>
+
+
+<%-- ---------------------------------------------------- --%>
+
+<%-- JavaScript for add/edit blogroll link modal --%>
+
+<script>
+
+ function addBookmark() {
+
+ var saveBookmarkButton = $('#save_bookmark:first');
+ saveBookmarkButton.attr("disabled", true );
+
+ var elem = $('#bookmark_required_fields:first');
+ elem.html('<s:text name="bookmarkForm.requiredFields" />');
+ elem.removeClass("alert-success");
+ elem.removeClass("alert-danger");
+ elem.addClass("alert-info");
+
+ $('#bookmark_bean_name:first').val('');
+ $('#bookmark_bean_url:first').val('');
+ $('#bookmark_bean_image:first').val('');
+ $('#bookmark_bean_feedUrl:first').val('');
+
+ $('#subtitle_folder_name:first').html(originalName);
+
+ $('#addedit-bookmark-modal').modal({show: true});
+ }
+
+ function onBookmarkFormChanged() {
+
+ var saveBookmarkButton = $('#save_bookmark:first');
+
+ var name = $('#bookmark_bean_name:first').val().trim();
+ var url = $('#bookmark_bean_url:first').val().trim();
+ var image = $('#bookmark_bean_image:first').val().trim();
+ var feedUrl = $('#bookmark_bean_feedUrl:first').val().trim();
+
+ var badUrls = [];
+
+ if ( url.length > 0 ) {
+ if ( !isValidUrl(url) ) {
+ badUrls.push("Bookmark URL")
+ }
+ }
+
+ if ( image.length > 0 ) {
+ if ( !isValidUrl(image) ) {
+ badUrls.push("Image URL")
+ }
+ }
+
+ if ( feedUrl.length > 0 ) {
+ if ( !isValidUrl(feedUrl) ) {
+ badUrls.push("Newsfeed URL")
+ }
+ }
+
+ var elem = $('#bookmark_required_fields:first');
+ var message = '';
+
+ if ( name.length > 0 && url.length > 0 && badUrls.length == 0 ) {
+ saveBookmarkButton.attr("disabled", false);
+
+ message = '<s:text name="generic.looksGood" />';
+ elem.removeClass("alert-info");
+ elem.removeClass("alert-danger");
+ elem.addClass("alert-success");
+ elem.html(message);
+
+ } else {
+ saveBookmarkButton.attr("disabled", true);
+
+ if ( name.length == 0 || url.length == 0 ) {
+ message = '<s:text name="bookmarkForm.required" />';
+ }
+ if ( badUrls.length > 0 ) {
+ message = '<s:text name="bookmarkForm.badUrls" />';
+ var sep = " ";
+ for ( i in badUrls ) {
+ message = message + sep + badUrls[i];
+ sep = ", ";
+ }
+ }
+ elem.removeClass("alert-info");
+ elem.removeClass("alert-success");
+ elem.addClass("alert-danger");
+ elem.html(message);
+ }
+ }
+
+ function isValidUrl( url ) {
+ if(/^(http|https|ftp):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/i.test(url)) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ function saveBookmark() {
+
+ var feedbackAreaEdit = $("#feedback-area-edit");
+
+ // post bookmark via AJAX
+ $.ajax({
+ method: 'post',
+ url: "bookmarkEdit!save.rol",
+ data: $("#bookmark").serialize(),
+ context: document.body
+
+ }).done(function (data) {
+
+ // kludge: scrape response status from HTML returned by Struts
+ var alertEnd = data.indexOf("ALERT_END");
+ if (data.indexOf('<s:text name="bookmarkForm.error.duplicateName" />') < alertEnd) {
+ feedbackAreaEdit.css("color", "red");
+ feedbackAreaEdit.html('<s:text name="bookmarkForm.error.duplicateName" />');
+
+ } else {
+ feedbackAreaEdit.css("color", "green");
+ feedbackAreaEdit.html('<s:text name="generic.success" />');
+ $('#category-edit-modal').modal("hide");
+ location.reload(true);
+ }
+
+ }).error(function (data) {
+ feedbackAreaEdit.html('<s:text name="generic.error.check.logs" />');
+ feedbackAreaEdit.css("color", "red");
+ });
+ }
+
+</script>
http://git-wip-us.apache.org/repos/asf/roller/blob/81168587/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp
index 7d3986d..f75ccb4 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp
@@ -22,10 +22,10 @@
<div class="menu-tl">
<div class="sidebarInner">
-
+
<h3><s:text name="mainPage.actions" /></h3>
<hr size="1" noshade="noshade" />
-
+
<p>
<%-- Add Bookmark link --%>
<img src='<s:url value="/images/link_add.png"/>' border="0"alt="icon" />
@@ -35,7 +35,7 @@
</s:url>
<s:a href="%{addBookmark}"><s:text name="bookmarksForm.addBookmark" /></s:a>
</p>
-
+
<p>
<%-- Add Folder link --%>
<img src='<s:url value="/images/folder_add.png"/>' border="0"alt="icon" />
@@ -45,7 +45,7 @@
</s:url>
<s:a href="%{addFolder}"><s:text name="bookmarksForm.addFolder" /></s:a>
</p>
-
+
<%-- Import bookmarks --%>
<p>
<img src='<s:url value="/images/link_add.png"/>' border="0"alt="icon" />
http://git-wip-us.apache.org/repos/asf/roller/blob/81168587/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
index d00b6fe..ad6fb62 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
@@ -249,6 +249,7 @@
</div>
<script>
+
function showCategoryDeleteModal( id, name, inUse ) {
$('#categoryRemove_removeId').val(id);
$('#categoryEdit_bean_name').val(name);
@@ -262,4 +263,5 @@
}
$('#delete-category-modal').modal({show: true});
}
+
</script>
http://git-wip-us.apache.org/repos/asf/roller/blob/81168587/app/src/main/webapp/WEB-INF/tiles.xml
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/tiles.xml b/app/src/main/webapp/WEB-INF/tiles.xml
index ea7877d..c9ef523 100644
--- a/app/src/main/webapp/WEB-INF/tiles.xml
+++ b/app/src/main/webapp/WEB-INF/tiles.xml
@@ -324,7 +324,7 @@
<definition name=".Bookmarks" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/Bookmarks.jsp" />
- <put-attribute name="sidebar" value="/WEB-INF/jsps/editor/BookmarksSidebar.jsp" />
+ <put-attribute name="sidebar" value="/WEB-INF/jsps/tiles/empty.jsp" />
<put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
[39/47] roller git commit: Merge pull request #2 from
lbtc-xxx/make_buttons_in_menu_work
Posted by sn...@apache.org.
Merge pull request #2 from lbtc-xxx/make_buttons_in_menu_work
Fix: Buttons in the menu page (such as New Entry, Entries and so on) \u2026
Thanks!
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/127d3370
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/127d3370
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/127d3370
Branch: refs/heads/bootstrap-ui
Commit: 127d337091f9d599178a2aec1057053dbdab1c0d
Parents: c206a69 845faf2
Author: David M. Johnson <sn...@apache.org>
Authored: Sat Jan 9 11:34:36 2016 -0500
Committer: David M. Johnson <sn...@apache.org>
Committed: Sat Jan 9 11:34:36 2016 -0500
----------------------------------------------------------------------
.../main/webapp/WEB-INF/jsps/core/MainMenu.jsp | 60 ++++++++++----------
1 file changed, 29 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
[05/47] roller git commit: title Rollarcus
Posted by sn...@apache.org.
title Rollarcus
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/61cf7e3e
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/61cf7e3e
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/61cf7e3e
Branch: refs/heads/bootstrap-ui
Commit: 61cf7e3ef942300556525d00e627d5f1d3383b80
Parents: d7eaa93
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Jan 2 13:11:43 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Jan 2 13:11:43 2015 -0500
----------------------------------------------------------------------
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/61cf7e3e/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 1dcb1e0..e3dc7d9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-README.md
+Rollarcus
===
This is __Rollarcus__: my experimental fork of [Apache Roller](https://github.com/apache/roller).
[07/47] roller git commit: Update README.md
Posted by sn...@apache.org.
Update README.md
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/8f9d1342
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/8f9d1342
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/8f9d1342
Branch: refs/heads/bootstrap-ui
Commit: 8f9d134249864f6aabb07cdc685c5f09eb5173d2
Parents: 0364bc9
Author: David M. Johnson <dm...@apigee.com>
Authored: Sat Jan 3 15:13:21 2015 -0500
Committer: David M. Johnson <dm...@apigee.com>
Committed: Sat Jan 3 15:13:21 2015 -0500
----------------------------------------------------------------------
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/8f9d1342/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 39aaf02..73c76e4 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
Rollarcus
===
-This is __Rollarcus__: my experimental fork of [Apache Roller](https://github.com/apache/roller).
-So far, there are two experiments here:
+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.
[17/47] roller git commit: Beginnings of a Bootstrap rewrite of the
Roller editor/admin UI,
using Struts-Bootstrap plugin. The main menu and edit weblog page are
essentially complete.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap.min.css
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap.min.css b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap.min.css
new file mode 100644
index 0000000..4cf729e
--- /dev/null
+++ b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap.min.css
@@ -0,0 +1,6 @@
+/*!
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;fo
nt-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:
auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px so
lid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\
270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:bef
ore{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:b
efore{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:befo
re{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{con
tent:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bu
llhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{co
ntent:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.gly
phicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}
.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\
e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hambu
rger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon
-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rou
nded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small
,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transfo
rm:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-heade
r{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-
size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff
;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-
12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%
}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.333333
33%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-s
m-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33
333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:8
3.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-l
g-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-pus
h-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;bord
er-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-
]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>the
ad>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.tabl
e>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsi
ve{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.tab
le-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=
file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:
#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{background-color:transparent;border:0}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-grou
p-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbo
x].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.fo
rm-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-co
ntrol-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.
has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline
label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:i
nline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{
padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-
image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-col
or:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:
active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdo
wn-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus
{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-
color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[
disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.bt
n-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-h
eight:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transitio
n-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>
li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{
content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group
{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn
-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left
-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggl
e=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-grou
p-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%
;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group
:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.d
isabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.n
av-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:au
to}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webk
it-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}
@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transpa
rent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.n
avbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical
-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-
bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:
transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.n
avbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navba
r-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav
.open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:fo
cus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;backgr
ound-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,
.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:non
e;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.
badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{padding-right:15px;padding-left:15px;border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.
jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{co
lor:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:1
00%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animati
on:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(25
5,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,
255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-r
ight{display:table-cell;vertical-align:top}.media-middle{vertical-a
<TRUNCATED>
[20/47] roller git commit: Beginnings of a Bootstrap rewrite of the
Roller editor/admin UI,
using Struts-Bootstrap plugin. The main menu and edit weblog page are
essentially complete.
Posted by sn...@apache.org.
Beginnings of a Bootstrap rewrite of the Roller editor/admin UI, using Struts-Bootstrap plugin.
The main menu and edit weblog page are essentially complete.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/2da6c3c2
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/2da6c3c2
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/2da6c3c2
Branch: refs/heads/bootstrap-ui
Commit: 2da6c3c2e28419f68244e0c362c15be96013d5f9
Parents: 624ad3b
Author: Dave Johnson <sn...@apache.org>
Authored: Mon Dec 21 10:40:29 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Mon Dec 21 10:40:29 2015 -0500
----------------------------------------------------------------------
app/pom.xml | 6 +
.../resources/ApplicationResources.properties | 21 +-
app/src/main/webapp/WEB-INF/jsps/core/Login.jsp | 230 +-
.../main/webapp/WEB-INF/jsps/core/MainMenu.jsp | 235 +-
.../WEB-INF/jsps/core/MainMenuSidebar.jsp | 36 +-
.../webapp/WEB-INF/jsps/editor/EntryEdit.jsp | 591 +-
.../webapp/WEB-INF/jsps/editor/EntryEditor.jsp | 76 +-
.../webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp | 1 -
.../webapp/WEB-INF/jsps/taglibs-struts2.jsp | 12 +-
.../webapp/WEB-INF/jsps/tiles/bannerStatus.jsp | 118 +-
.../webapp/WEB-INF/jsps/tiles/head-ajax.jsp | 21 +-
app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp | 21 +-
app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp | 76 +-
.../WEB-INF/jsps/tiles/tiles-mainmenupage.jsp | 80 +-
.../WEB-INF/jsps/tiles/tiles-simplepage.jsp | 61 +-
.../WEB-INF/jsps/tiles/tiles-tabbedpage.jsp | 82 +-
.../webapp/WEB-INF/jsps/tiles/userStatus.jsp | 38 +
app/src/main/webapp/WEB-INF/tiles.xml | 54 +-
.../css/bootstrap-theme.css | 587 ++
.../css/bootstrap-theme.min.css | 6 +
.../bootstrap-3.3.6-dist/css/bootstrap.css | 6760 ++++++++++++++++++
.../bootstrap-3.3.6-dist/css/bootstrap.min.css | 6 +
.../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes
.../fonts/glyphicons-halflings-regular.svg | 288 +
.../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes
.../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes
.../bootstrap-3.3.6-dist/js/bootstrap.js | 2363 ++++++
.../bootstrap-3.3.6-dist/js/bootstrap.min.js | 7 +
.../roller-ui/bootstrap-3.3.6-dist/js/npm.js | 13 +
app/src/main/webapp/roller-ui/styles/roller.css | 821 +--
31 files changed, 11081 insertions(+), 1529 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/pom.xml
----------------------------------------------------------------------
diff --git a/app/pom.xml b/app/pom.xml
index 7266ad9..9adfed9 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -262,6 +262,12 @@
</dependency>
<dependency>
+ <groupId>com.jgeppert.struts2.bootstrap</groupId>
+ <artifactId>struts2-bootstrap-plugin</artifactId>
+ <version>2.0.3</version>
+ </dependency>
+
+ <dependency>
<groupId>xml-security</groupId>
<artifactId>xmlsec</artifactId>
<version>1.3.0</version>
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/resources/ApplicationResources.properties
----------------------------------------------------------------------
diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties
index 0a2f8c5..2b753ce 100644
--- a/app/src/main/resources/ApplicationResources.properties
+++ b/app/src/main/resources/ApplicationResources.properties
@@ -640,9 +640,9 @@ issued during the upgrade process:
# ----------------------------------------------------------------------- Login
loginPage.title=Welcome to Roller
-loginPage.prompt=Please enter your username and password to login.
-loginPage.openIdPrompt=Please login via OpenID
-loginPage.openIdHybridPrompt=Or, login with your username and password
+loginPage.prompt=Please login
+loginPage.openIdPrompt=Login with OpenID
+loginPage.openIdHybridPrompt=Or with username
loginPage.userName=Username
loginPage.password=Password
loginPage.openID=OpenID username
@@ -707,8 +707,8 @@ macro.weblog.noEntriesForCategory=No entries found for specified category
mainPage.category=Category
mainPage.searchWeblogs=Search for blogs
mainPage.actions=Actions
-mainPage.loggedInAs=logged in as
-mainPage.currentWebsite=editing weblog
+mainPage.loggedInAs=Logged in as
+mainPage.currentWebsite=Editing weblog
mainPage.mainMenu=Main Menu
# ------------------------------------------------------------------ Maintenance
@@ -1493,7 +1493,7 @@ weblogEdit.publishedEntries=Recent Entries
weblogEdit.post=Post to Weblog
weblogEdit.permaLink=Permalink
weblogEdit.published=Published
-weblogEdit.pubTime=Pub Time
+weblogEdit.pubTime=Publishing Time
weblogEdit.save=Save as Draft
weblogEdit.scheduled=Scheduled
weblogEdit.scheduledEntries=Scheduled Entries
@@ -1749,19 +1749,20 @@ activate your user account by clicking the link that is sent to you via e-mail.
# ---------------------------------------------------------------- Your Weblogs
-yourWebsites.title=Main Menu
- yourWebsites.actions=Actions
+yourWebsites.title=Your Weblogs
+yourWebsites.actions=Actions
-yourWebsites.prompt.noBlog=You''ve got a user account, but no weblog. \
+yourWebsites.prompt.noBlog=You have a user account, but no weblog. \
Would you like to
yourWebsites.createOne=create one?
-yourWebsites.prompt.hasBlog=Select a weblog to edit, manage, or configure.
+yourWebsites.prompt.hasBlog=Access your weblogs here or create a new one.
yourWebsites.accept=accept
yourWebsites.decline=decline
yourWebsites.resign=Resign
+yourWebsites.youHave=You have
yourWebsites.permission=Permission
yourWebsites.confirmResignation=Are you sure you wish to resign from weblog [{0}]?
yourWebsites.weblog=Link
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp b/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp
index bf9914d..fbb87df 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp
@@ -18,150 +18,130 @@
<%-- Body of the login page, invoked from login.jsp --%>
<%@ page import="org.apache.roller.weblogger.config.WebloggerConfig" %>
-<%@ page import="org.apache.roller.weblogger.config.AuthMethod" %>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
<%!
-String securityCheckUrl = null;
-boolean cmaEnabled = "CMA".equals(WebloggerConfig.getAuthMethod());
+ String securityCheckUrl = null;
+ boolean cmaEnabled = "CMA".equals( WebloggerConfig.getAuthMethod() );
%>
<%
-if (cmaEnabled) {
- securityCheckUrl = "/j_security_check";
-} else {
- securityCheckUrl = "/roller_j_security_check";
-}
+ if (cmaEnabled) {
+ securityCheckUrl = "/j_security_check";
+ } else {
+ securityCheckUrl = "/roller_j_security_check";
+ }
%>
-<s:if test="authMethod == 'OPENID' || authMethod == 'DB_OPENID'">
-
- <p><s:text name="loginPage.openIdPrompt" /></p>
-
- <form method="post" id="loginOpenIDForm"
- action="/roller/roller_j_openid_security_check"
- onsubmit="saveOpenidIdentifier(this)">
- <!-- action="<c:url value='roller_j_openid_security_check'/>" -->
- <table width="80%">
- <tr>
- <td width="20%" align="right"><s:text name="loginPage.openID" /></td>
- <td width="80%">
- <input type="text" name="openid_identifier" id="openid_identifier" class="f_openid_identifier" size="40" maxlength="255" style="width: 35%"/>
- </td>
- </tr>
- <tr>
- <td width="20%"></td>
- <td width="80%">
- <input type="submit" name="submit" id="submit" value="<s:text name='loginPage.loginOpenID'/>" />
- </td>
- </tr>
- </table>
- </form>
-</s:if>
-
-<s:if test="authMethod != 'OPENID'">
-
- <s:if test="authMethod == 'DB_OPENID'">
- <p><s:text name="loginPage.openIdHybridPrompt" /></p>
+<div class="container">
+
+ <s:if test="authMethod == 'OPENID' || authMethod == 'DB_OPENID'">
+
+ <form method="post" id="loginOpenIDForm" class="form-signin"
+ action="/roller/roller_j_openid_security_check" onsubmit="saveOpenidIdentifier(this)">
+
+ <h2 class="form-signin-heading"><s:text name="loginPage.openIdPrompt"/></h2>
+
+ <label for="openid_identifier" class="sr-only"><s:text name="loginPage.openID"/></label>
+ <input class="form-control" type="text" name="openid_identifier" id="openid_identifier"/>
+
+ <button type="submit" name="submit" id="submit" class="btn btn-lg btn-primary btn-block"
+ value="<s:text name='loginPage.loginOpenID'/>"></button>
+
+ </form>
+
</s:if>
-
- <s:else>
- <p><s:text name="loginPage.prompt" /></p>
- </s:else>
-
- <form method="post" id="loginForm"
- action="<c:url value="<%= securityCheckUrl %>"/>"
- onsubmit="saveUsername(this)">
-
- <table width="80%">
-
- <tr>
- <td width="20%" align="right"><s:text name="loginPage.userName" /></td>
- <td width="80%">
- <input type="text" name="j_username" id="j_username" size="25" />
- </td>
- </tr>
-
- <tr>
- <td width="20%" align="right"><s:text name="loginPage.password" /></td>
- <td width="80%">
- <input type="password" name="j_password" id="j_password" size="20" />
- </td>
- </tr>
+
+ <s:if test="authMethod != 'OPENID'">
+
+
+ <form method="post" id="loginForm" class="form-signin"
+ action="<c:url value="<%= securityCheckUrl %>"/>"
+ onsubmit="saveUsername(this)">
+
+ <s:if test="authMethod == 'DB_OPENID'">
+ <h2 class="form-signin-heading"><s:text name="loginPage.openIdHybridPrompt"/></h2>
+ </s:if>
+
+ <s:else>
+ <h2 class="form-signin-heading"><s:text name="loginPage.prompt"/></h2>
+ </s:else>
+
+ <label for="j_username" class="sr-only"> <s:text name="loginPage.userName"/> </label>
+ <input type="text" class="form-control" name="j_username" id="j_username" placeholder="Username"/>
+
+ <label for="j_password" class="sr-only"> <s:text name="loginPage.password"/> </label>
+ <input type="password" class="form-control" name="j_password" id="j_password" placeholder="Password"/>
<c:if test="${rememberMeEnabled}">
- <tr>
- <td width="20%"></td>
- <td width="80%">
- <input type="checkbox" name="_spring_security_remember_me" id="_spring_security_remember_me" />
- <label for="rememberMe">
- <s:text name="loginPage.rememberMe" />
- </label>
- </td>
- </tr>
+ <label>
+ <input type="checkbox" name="_spring_security_remember_me" id="_spring_security_remember_me"/>
+ <s:text name="loginPage.rememberMe"/>
+ </label>
</c:if>
- <tr>
- <td width="20%"></td>
- <td width="80%">
- <input type="submit" name="login" id="login" value="<s:text name='loginPage.login' />" />
- <input type="reset" name="reset" id="reset" value="<s:text name='loginPage.reset' />"
- onclick="document.getElementById('j_username').focus()" />
- </td>
- </tr>
+ <button class="btn btn-lg btn-primary btn-block" type="submit" name="login" id="login">
+ <s:text name='loginPage.login'/>
+ </button>
- </table>
- </form>
-</s:if>
+ <button class="btn btn-lg btn-primary btn-block" type="reset" name="reset" id="reset"
+ onclick="document.getElementById('j_username').focus()">
+ <s:text name='loginPage.reset'/>
+ </button>
+
+ </form>
+ </s:if>
+
+</div>
<script>
-<s:if test="authMethod == 'OPENID' || authMethod == 'DB_OPENID'">
-function focusToOpenidForm() {
- return (document.getElementById && document.getElementById("j_username") === null) ||
- getCookie("favorite_authentication_method") !== "username";
-}
-
-if (document.getElementById) {
- if (document.getElementById && getCookie("openid_identifier") !== null) {
- document.getElementById("openid_identifier").value = getCookie("openid_identifier");
+ <s:if test="authMethod == 'OPENID' || authMethod == 'DB_OPENID'">
+ function focusToOpenidForm() {
+ return (document.getElementById && document.getElementById("j_username") === null) ||
+ getCookie("favorite_authentication_method") !== "username";
+ }
+
+ if (document.getElementById) {
+ if (document.getElementById && getCookie("openid_identifier") !== null) {
+ document.getElementById("openid_identifier").value = getCookie("openid_identifier");
+ }
+ if (focusToOpenidForm()) {
+ document.getElementById("openid_identifier").focus();
+ }
}
- if (focusToOpenidForm()) {
- document.getElementById("openid_identifier").focus();
+
+ function saveOpenidIdentifier(theForm) {
+ var expires = new Date();
+ expires.setTime(expires.getTime() + 24 * 30 * 60 * 60 * 1000); // sets it for approx 30 days.
+ setCookie("openid_identifier", theForm.openid_identifier.value, expires);
+ setCookie("favorite_authentication_method", "openid");
}
-}
-
-function saveOpenidIdentifier(theForm) {
- var expires = new Date();
- expires.setTime(expires.getTime() + 24 * 30 * 60 * 60 * 1000); // sets it for approx 30 days.
- setCookie("openid_identifier",theForm.openid_identifier.value,expires);
- setCookie("favorite_authentication_method", "openid");
-}
-</s:if>
-
-<s:if test="authMethod != 'OPENID'">
-function focusToUsernamePasswordForm() {
- return (document.getElementById && document.getElementById("openid_identifier") === null) ||
- getCookie("favorite_authentication_method") === "username";
-}
-
-if (document.getElementById) {
- if (getCookie("username") != null) {
- if (document.getElementById) {
- document.getElementById("j_username").value = getCookie("username");
- if (focusToUsernamePasswordForm()) {
- document.getElementById("j_password").focus();
+ </s:if>
+
+ <s:if test="authMethod != 'OPENID'">
+ function focusToUsernamePasswordForm() {
+ return (document.getElementById && document.getElementById("openid_identifier") === null) ||
+ getCookie("favorite_authentication_method") === "username";
+ }
+
+ if (document.getElementById) {
+ if (getCookie("username") != null) {
+ if (document.getElementById) {
+ document.getElementById("j_username").value = getCookie("username");
+ if (focusToUsernamePasswordForm()) {
+ document.getElementById("j_password").focus();
+ }
}
+ } else if (focusToUsernamePasswordForm()) {
+ document.getElementById("j_username").focus();
}
- } else if (focusToUsernamePasswordForm()) {
- document.getElementById("j_username").focus();
}
-}
-
-function saveUsername(theForm) {
- var expires = new Date();
- expires.setTime(expires.getTime() + 24 * 30 * 60 * 60 * 1000); // sets it for approx 30 days.
- setCookie("username",theForm.j_username.value,expires);
- setCookie("favorite_authentication_method", "username");
-}
-</s:if>
+
+ function saveUsername(theForm) {
+ var expires = new Date();
+ expires.setTime(expires.getTime() + 24 * 30 * 60 * 60 * 1000); // sets it for approx 30 days.
+ setCookie("username", theForm.j_username.value, expires);
+ setCookie("favorite_authentication_method", "username");
+ }
+ </s:if>
</script>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
index 6b10819..6a5b547 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
@@ -59,123 +59,126 @@
<s:iterator id="perms" value="existingPermissions">
- <div class="yourWeblogBox">
-
- <span class="mm_weblog_name"><img src='<c:url value="/images/folder.png"/>' /> <s:property value="#perms.weblog.name" /></span>
-
- <table class="mm_table" width="100%" cellpadding="0" cellspacing="0">
- <tr>
- <td valign="top">
-
- <table cellpadding="0" cellspacing="0">
-
- <tr>
- <td class="mm_subtable_label"><s:text name='yourWebsites.weblog'/></td>
- <td><a href='<s:property value="#perms.weblog.absoluteURL" />'>
- <s:property value="#perms.weblog.absoluteURL" />
- </a></td>
- </tr>
-
- <tr>
- <td class="mm_subtable_label"><s:text name='yourWebsites.permission'/></td>
- <td><s:if test='#perms.hasAction("admin")' >ADMIN</s:if>
- <s:if test='#perms.hasAction("post")' >AUTHOR</s:if>
- <s:if test='#perms.hasAction("edit_draft")' >LIMITED</s:if></td>
- </tr>
-
- <tr>
- <td class="mm_subtable_label"><s:text name='generic.description' /></td>
- <td><s:property value="#perms.weblog.about" escape="false" /></td>
- </tr>
-
- <tr>
- <td class="mm_subtable_label"><s:text name='yourWebsites.userCount' /></td>
- <td><s:property value="#perms.weblog.userCount" /></td>
- </tr>
-
- <tr>
- <td class="mm_subtable_label"><s:text name='yourWebsites.todaysHits' /></td>
- <td><s:property value="#perms.weblog.todaysHits" /></td>
- </tr>
-
- </table>
-
- </td>
-
- <td class="mm_table_actions" width="20%" align="left" >
-
- <s:url action="entryAdd" namespace="/roller-ui/authoring" id="newEntry">
- <s:param name="weblog" value="#perms.weblog.handle" />
- </s:url>
- <img src='<s:url value="/images/table_edit.png"/>' />
- <s:a href="%{newEntry}"><s:text name="yourWebsites.newEntry" /></s:a>
- <br />
-
- <%-- Show Entries link with count for users above LIMITED permission --%>
- <s:if test='!(#perms.hasAction("edit_draft"))'>
- <s:url action="entries" namespace="/roller-ui/authoring" id="editEntries">
- <s:param name="weblog" value="#perms.weblog.handle" />
- </s:url>
- <img src='<s:url value="/images/table_multiple.png"/>' />
- <s:a href="%{editEntries}"><s:text name="yourWebsites.editEntries" /> (<s:property value="#perms.weblog.entryCount" />)</s:a>
- <br />
- </s:if>
-
- <%-- Show Comments link with count for users above LIMITED permission --%>
- <s:if test='!(#perms.hasAction("edit_draft"))'>
- <s:url action="comments" namespace="/roller-ui/authoring" id="manageComments">
- <s:param name="weblog" value="#perms.weblog.handle" />
- </s:url>
- <img src='<s:url value="/images/page_white_edit.png"/>' />
- <s:a href="%{manageComments}"><s:text name="yourWebsites.manageComments" /> (<s:property value="#perms.weblog.commentCount" />)</s:a>
- <br />
- </s:if>
-
- <%-- Only admins get access to theme and config settings --%>
- <s:if test='#perms.hasAction("admin")'>
-
- <%-- And only show theme option if custom themes are enabled --%>
- <s:if test="getProp('themes.customtheme.allowed')">
- <s:if test="#perms.weblog.editorTheme == 'custom'">
- <s:url action="templates" namespace="/roller-ui/authoring" id="weblogTheme">
- <s:param name="weblog" value="#perms.weblog.handle" />
- </s:url>
- </s:if>
- <s:else>
- <s:url action="themeEdit" namespace="/roller-ui/authoring" id="weblogTheme">
- <s:param name="weblog" value="#perms.weblog.handle" />
- </s:url>
- </s:else>
- <img src='<s:url value="/roller-ui/images/layout.png"/>' />
- <a href='<s:property value="weblogTheme" />'>
- <s:text name="yourWebsites.theme" /></a>
- <br />
- </s:if>
-
- <s:url action="weblogConfig" namespace="/roller-ui/authoring" id="manageWeblog">
- <s:param name="weblog" value="#perms.weblog.handle" />
- </s:url>
- <img src='<s:url value="/images/cog.png"/>' />
- <a href='<s:property value="manageWeblog" />'>
- <s:text name="yourWebsites.manage" /></a>
- <br />
- </s:if>
-
- <%-- don't allow last admin to resign from blog --%>
- <s:if test='!(#perms.hasAction("admin") && #perms.weblog.adminUserCount == 1)'>
- <img src='<c:url value="/images/delete.png"/>' />
- <s:url action="memberResign" namespace="/roller-ui/authoring" id="resignWeblog">
- <s:param name="weblog" value="#perms.weblog.handle" />
- </s:url>
- <a href='<s:property value="resignWeblog" />'>
- <s:text name='yourWebsites.resign' />
- </a>
- </s:if>
-
- </td>
- </tr>
- </table>
+ <div class="well yourWeblogBox">
+
+ <h3 class="mm_weblog_name">
+ <span class="glyphicon glyphicon-folder-open" aria-hidden="true"></span>
+ <s:property value="#perms.weblog.name" />
+ </h3>
+
+ <p> <a href='<s:property value="#perms.weblog.absoluteURL" />'>
+ <s:property value="#perms.weblog.absoluteURL" /></a></p>
+
+ <p><s:property value="#perms.weblog.about" escape="false" /></p>
+ <p>You have
+ <s:if test='#perms.hasAction("admin")'>ADMIN</s:if>
+ <s:if test='#perms.hasAction("post")'>AUTHOR</s:if>
+ <s:if test='#perms.hasAction("edit_draft")'>LIMITED</s:if>
+ <s:text name='yourWebsites.permission'/></p>
+
+ <div class="btn-group" role="group" aria-label="...">
+
+ <%-- New entry button --%>
+ <button type="button" class="btn btn-default">
+ <s:url action="entryAdd" namespace="/roller-ui/authoring" id="newEntry">
+ <s:param name="weblog" value="#perms.weblog.handle"/>
+ </s:url>
+ <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
+ <s:a href="%{newEntry}"><s:text name="yourWebsites.newEntry"/></s:a>
+ </button>
+
+ <s:if test='!(#perms.hasAction("edit_draft"))'>
+
+ <%-- Show Entries button with count for users above LIMITED permission --%>
+ <button type="button" class="btn btn-default">
+ <s:url action="entries" namespace="/roller-ui/authoring" id="editEntries">
+ <s:param name="weblog" value="#perms.weblog.handle"/>
+ </s:url>
+ <span class="glyphicon glyphicon-list" aria-hidden="true"></span>
+ <s:a href="%{editEntries}"><s:text name="yourWebsites.editEntries"/></s:a>
+ <span class="badge"><s:property value="#perms.weblog.entryCount"/></span>
+ </button>
+
+ </s:if>
+
+ <s:if test='!(#perms.hasAction("edit_draft"))'>
+
+ <%-- Show Comments button with count for users above LIMITED permission --%>
+ <button type="button" class="btn btn-default">
+ <s:url action="comments" namespace="/roller-ui/authoring" id="manageComments">
+ <s:param name="weblog" value="#perms.weblog.handle"/>
+ </s:url>
+ <span class="glyphicon glyphicon-comment" aria-hidden="true"></span>
+ <s:a href="%{manageComments}"><s:text name="yourWebsites.manageComments"/></s:a>
+ <span class="badge"><s:property value="#perms.weblog.commentCount"/></span>
+ </button>
+
+ </s:if>
+
+
+ <%-- Only admins get access to theme and config settings --%>
+ <s:if test='#perms.hasAction("admin")'>
+
+ <%-- And only show theme option if custom themes are enabled --%>
+ <s:if test="getProp('themes.customtheme.allowed')">
+
+ <s:if test="#perms.weblog.editorTheme == 'custom'">
+
+ <%-- Templates button --%>
+ <button type="button" class="btn btn-default">
+ <s:url action="templates" namespace="/roller-ui/authoring" id="weblogTheme">
+ <s:param name="weblog" value="#perms.weblog.handle"/>
+ </s:url>
+ </button>
+
+ </s:if>
+ <s:else>
+
+ <%-- Theme edit button --%>
+ <button type="button" class="btn btn-default">
+ <s:url action="themeEdit" namespace="/roller-ui/authoring" id="weblogTheme">
+ <s:param name="weblog" value="#perms.weblog.handle"/>
+ </s:url>
+ <span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span>
+ <a href='<s:property value="weblogTheme" />'>
+ <s:text name="yourWebsites.theme"/></a>
+ </button>
+
+ </s:else>
+
+ </s:if>
+
+
+ <%-- Resign button --%>
+ <button type="button" class="btn btn-default">
+ <s:url action="weblogConfig" namespace="/roller-ui/authoring" id="manageWeblog">
+ <s:param name="weblog" value="#perms.weblog.handle"/>
+ </s:url>
+ <span class="glyphicon glyphicon-cog" aria-hidden="true"></span>
+ <a href='<s:property value="manageWeblog" />'>
+ <s:text name="yourWebsites.manage"/></a>
+ </button>
+
+ </s:if>
+
+ <%-- don't allow last admin to resign from blog --%>
+ <s:if test='!(#perms.hasAction("admin") && #perms.weblog.adminUserCount == 1)'>
+
+ <button type="button" class="btn btn-default">
+ <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
+ <s:url action="memberResign" namespace="/roller-ui/authoring" id="resignWeblog">
+ <s:param name="weblog" value="#perms.weblog.handle"/>
+ </s:url>
+ <a href='<s:property value="resignWeblog" />'>
+ <s:text name='yourWebsites.resign'/>
+ </a>
+ </button>
+
+ </s:if>
+
+ </div>
+
</div>
</s:iterator>
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp
index 4aa6ef9..ba13272 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp
@@ -22,29 +22,47 @@
<div class="menu-tl">
<div class="sidebarInner">
- <h3><s:text name="yourWebsites.actions" /></h3>
+ <%--
+ <h4><s:text name="yourWebsites.actions" /></h4>
<hr size="1" noshade="noshade" />
-
- <h3><a href="<s:url action="profile"/>"><s:text name="yourWebsites.editProfile" /></a></h3>
+ --%>
+
+ <%-- Edit profile --%>
+
+ <h4><span class="glyphicon glyphicon-user" aria-hidden="true"></span>
+ <a href="<s:url action="profile"/>"><s:text name="yourWebsites.editProfile" /></a></h4>
<p><s:text name="yourWebsites.editProfile.desc" /></p>
+ <%-- Edit profile --%>
+
<s:if test="getBooleanProp('webservices.enableAtomPub') && getProp('webservices.atomPubAuth') == 'oauth'">
- <h3><a href="<s:url action="oauthKeys" />"><s:text name="yourWebsites.oauthKeys" /></a></h3>
+ <h4><span class="glyphicon glyphicon-lock" aria-hidden="true"></span>
+ <a href="<s:url action="oauthKeys" />"><s:text name="yourWebsites.oauthKeys" /></a></h4>
<p><s:text name="yourWebsites.oauthKeys.desc" /></p>
</s:if>
+ <%-- Create weblog --%>
+
<s:if test="getBooleanProp('site.allowUserWeblogCreation') && (getBooleanProp('groupblogging.enabled') || (existingPermissions.isEmpty && pendingPermissions.isEmpty))">
- <h3><a href="<s:url action="createWeblog" />"><s:text name="yourWebsites.createWeblog" /></a></h3>
+ <h4><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+ <a href="<s:url action="createWeblog" />"><s:text name="yourWebsites.createWeblog" /></a></h4>
<p><s:text name="yourWebsites.createWeblog.desc" /></p>
</s:if>
- <s:if test="userIsAdmin">
- <h3><a href="<s:url action="globalConfig" namespace="/roller-ui/admin" />"><s:text name="yourWebsites.globalAdmin" /></a></h3>
+ <s:if test="userIsAdmin">
+
+ <%-- Roller settings --%>
+
+ <h4><span class="glyphicon glyphicon-wrench" aria-hidden="true"></span>
+ <a href="<s:url action="globalConfig" namespace="/roller-ui/admin" />"><s:text name="yourWebsites.globalAdmin" /></a></h4>
<p><s:text name="yourWebsites.globalAdmin.desc" /></p>
+
+ <%-- Planet settings --%>
- <s:if test="getBooleanProp('planet.aggregator.enabled')">
- <h3><a href="<s:url action="planetConfig" namespace="/roller-ui/admin" />"><s:text name="yourWebsites.planetAdmin" /></a></h3>
+ <s:if test="getBooleanProp('planet.aggregator.enabled')">
+ <h4><span class="glyphicon glyphicon-globe" aria-hidden="true"></span>
+ <a href="<s:url action="planetConfig" namespace="/roller-ui/admin" />"><s:text name="yourWebsites.planetAdmin" /></a></h4>
<p><s:text name="yourWebsites.planetAdmin.desc" /></p>
</s:if>
</s:if>
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
index 45c5224..1a54a2f 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
@@ -17,16 +17,16 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css"/>' />
+<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css"/>'/>
<script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script>
<script src='<s:url value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js"/>'></script>
<style>
-#tagAutoCompleteWrapper {
- width:40em; /* set width here or else widget will expand to fit its container */
- padding-bottom:2em;
-}
+ #tagAutoCompleteWrapper {
+ width: 40em; /* set width here or else widget will expand to fit its container */
+ padding-bottom: 2em;
+ }
</style>
<%-- Titling, processing actions different between entry add and edit --%>
@@ -40,325 +40,358 @@
</s:else>
<p class="subtitle">
- <s:text name="%{#subtitleKey}" >
- <s:param value="actionWeblog.handle" />
+ <s:text name="%{#subtitleKey}">
+ <s:param value="actionWeblog.handle"/>
</s:text>
</p>
-<s:form id="entry">
- <s:hidden name="salt" />
- <s:hidden name="weblog" />
- <s:hidden name="bean.status" />
+<s:form id="entry" theme="bootstrap" cssClass="form-horizontal">
+ <s:hidden name="salt"/>
+ <s:hidden name="weblog"/>
+ <s:hidden name="bean.status"/>
<s:if test="actionName == 'entryEdit'">
- <s:hidden name="bean.id" />
+ <s:hidden name="bean.id"/>
</s:if>
<%-- ================================================================== --%>
<%-- Title, category, dates and other metadata --%>
- <table class="entryEditTable" cellpadding="0" cellspacing="0" style="width:100%">
-
- <tr>
- <td class="entryEditFormLabel">
- <label for="title"><s:text name="weblogEdit.title" /></label>
- </td>
- <td>
- <s:textfield name="bean.title" size="70" maxlength="255" tabindex="1" style="width:60%"/>
- </td>
- </tr>
-
- <tr>
- <td class="entryEditFormLabel">
- <label for="status"><s:text name="weblogEdit.status" /></label>
- </td>
- <td>
- <s:if test="bean.published">
- <span style="color:green; font-weight:bold">
- <s:text name="weblogEdit.published" />
- (<s:text name="weblogEdit.updateTime" />
- <s:date name="entry.updateTime" />)
- </span>
- </s:if>
- <s:elseif test="bean.draft">
- <span style="color:orange; font-weight:bold">
- <s:text name="weblogEdit.draft" />
- (<s:text name="weblogEdit.updateTime" />
- <s:date name="entry.updateTime" />)
- </span>
- </s:elseif>
- <s:elseif test="bean.pending">
- <span style="color:orange; font-weight:bold">
- <s:text name="weblogEdit.pending" />
- (<s:text name="weblogEdit.updateTime" />
- <s:date name="entry.updateTime" />)
- </span>
- </s:elseif>
- <s:elseif test="bean.scheduled">
- <span style="color:orange; font-weight:bold">
- <s:text name="weblogEdit.scheduled" />
- (<s:text name="weblogEdit.updateTime" />
- <s:date name="entry.updateTime" />)
- </span>
- </s:elseif>
- <s:else>
- <span style="color:red; font-weight:bold"><s:text name="weblogEdit.unsaved" /></span>
- </s:else>
- </td>
- </tr>
+ <%-- title --%>
+ <s:textfield label="%{getText('weblogEdit.title')}" name="bean.title" maxlength="255" tabindex="1"/>
+ <%-- status --%>
+ <div class="form-group">
+ <label class="col-sm-3 control-label" for="weblogEdit.status"><s:text name="weblogEdit.status"/></label>
- <s:if test="actionName == 'entryEdit'">
- <tr>
- <td class="entryEditFormLabel">
- <label for="permalink"><s:text name="weblogEdit.permaLink" /></label>
- </td>
- <td>
- <s:if test="bean.published">
- <a id="entry_bean_permalink" href='<s:property value="entry.permalink" />'><s:property value="entry.permalink" /></a>
- <img src='<s:url value="/images/launch-link.png"/>' />
- </s:if>
- <s:else>
- <s:property value="entry.permalink" />
- </s:else>
- </td>
- </tr>
- </s:if>
+ <div class="col-sm-9 controls">
+ <s:if test="bean.published">
+ <span class="label label-success">
+ <s:text name="weblogEdit.published"/>
+ (<s:text name="weblogEdit.updateTime"/>
+ <s:date name="entry.updateTime"/>)
+ </span>
+ </s:if>
+ <s:elseif test="bean.draft">
+ <span class="label label-info">
+ <s:text name="weblogEdit.draft"/>
+ (<s:text name="weblogEdit.updateTime"/>
+ <s:date name="entry.updateTime"/>)
+ </span>
+ </s:elseif>
+ <s:elseif test="bean.pending">
+ <span class="label label-warning">
+ <s:text name="weblogEdit.pending"/>
+ (<s:text name="weblogEdit.updateTime"/>
+ <s:date name="entry.updateTime"/>)
+ </span>
+ </s:elseif>
+ <s:elseif test="bean.scheduled">
+ <span class="label label-info">
+ <s:text name="weblogEdit.scheduled"/>
+ (<s:text name="weblogEdit.updateTime"/>
+ <s:date name="entry.updateTime"/>)
+ </span>
+ </s:elseif>
+ <s:else>
+ <span class="label label-danger"><s:text name="weblogEdit.unsaved"/></span>
+ </s:else>
+ </div>
- <tr>
- <td class="entryEditFormLabel">
- <label for="categoryId"><s:text name="weblogEdit.category" /></label>
- </td>
- <td>
- <s:select name="bean.categoryId" list="categories" listKey="id" listValue="name" size="1" />
- </td>
- </tr>
-
- <tr>
- <td class="entryEditFormLabel">
- <label for="title"><s:text name="weblogEdit.tags" /></label>
- </td>
- <td>
- <s:textfield id="tagAutoComplete" cssClass="entryEditTags" name="bean.tagsAsString" size="70" maxlength="255" tabindex="3" style="width:30%"/>
- </td>
- </tr>
-
- <s:if test="actionWeblog.enableMultiLang">
- <tr>
- <td class="entryEditFormLabel">
- <label for="locale"><s:text name="weblogEdit.locale" /></label>
- </td>
- <td>
- <s:select name="bean.locale" size="1" list="localesList" listValue="displayName" />
- </td>
- </tr>
- </table>
- </s:if>
- <s:else>
- </table>
- <s:hidden name="bean.locale"/>
- </s:else>
+ </div>
+
+ <%-- permalink --%>
+ <s:if test="actionName == 'entryEdit'">
+ <div class="form-group">
+ <label for="entry_bean_permalink"><s:text name="weblogEdit.permaLink"/></label>
+ <s:if test="bean.published">
+ <a id="entry_bean_permalink" href='<s:property value="entry.permalink" />'>
+ <s:property value="entry.permalink"/>
+ </a>
+ <img src='<s:url value="/images/launch-link.png"/>'/>
+ </s:if>
+ <s:else>
+ <s:property value="entry.permalink"/>
+ </s:else>
+ </div>
+ </s:if>
+ <%-- tags --%>
+ <s:textfield label="%{getText('weblogEdit.tags')}" id="tagAutoComplete" name="bean.tagsAsString"
+ maxlength="255" tabindex="3"/>
- <%-- ================================================================== --%>
- <%-- Weblog editor --%>
+ <%-- category --%>
+ <s:select label="%{getText('weblogEdit.category')}" name="bean.categoryId"
+ list="categories" listKey="id" listValue="name"/>
- <s:include value="%{editor.jspPage}" />
+ <s:if test="actionWeblog.enableMultiLang">
+ <s:select label="%{getText('weblogEdit.locale')}" name="bean.locale" size="1"
+ list="localesList" listValue="displayName"/>
+ </s:if>
- <br />
+ <s:else>
+ <s:hidden name="bean.locale"/>
+ </s:else>
- <%-- ================================================================== --%>
- <%-- plugin chooser --%>
- <s:if test="!entryPlugins.isEmpty">
- <div id="pluginControlToggle" class="controlToggle">
- <span id="ipluginControl">+</span>
- <a class="controlToggle" onclick="javascript:toggleControl('pluginControlToggle','pluginControl')">
- <s:text name="weblogEdit.pluginsToApply" /></a>
- </div>
- <div id="pluginControl" class="miscControl" style="display:none">
- <s:checkboxlist theme="roller" name="bean.plugins" list="entryPlugins" listKey="name" listValue="name" />
- </div>
- </s:if>
+ <div class="panel-group" id="accordion">
+ <%-- Weblog editor --%>
- <%-- ================================================================== --%>
- <%-- advanced settings --%>
+ <s:include value="%{editor.jspPage}"/>
+
+ <%-- Plugins --%>
+
+ <s:if test="!entryPlugins.isEmpty">
+
+ <div class="panel panel-default" id="panel-plugins">
+ <div class="panel-heading">
+
+ <h4 class="panel-title">
+ <a aria-expanded="false"
+ data-toggle="collapse" data-target="#collapsePlugins" href="#collapsePlugins">
+ <s:text name="weblogEdit.pluginsToApply"/> </a>
+ </h4>
+
+ </div>
+ <div id="collapsePlugins" class="panel-collapse collapse in">
+ <div class="panel-body">
+
+ <s:checkboxlist name="bean.plugins" list="entryPlugins" listKey="name" listValue="name"/>
+
+ </div>
+ </div>
+ </div>
- <div id="miscControlToggle" class="controlToggle">
- <span id="imiscControl">+</span>
- <a class="controlToggle" onclick="javascript:toggleControl('miscControlToggle','miscControl')">
- <s:text name="weblogEdit.miscSettings" /></a>
- </div>
- <div id="miscControl" class="miscControl" style="display:none">
-
- <label for="link"><s:text name="weblogEdit.pubTime" /></label>
- <div>
- <s:select name="bean.hours" list="hoursList" />
- :
- <s:select name="bean.minutes" list="minutesList" />
- :
- <s:select name="bean.seconds" list="secondsList" />
-
- <script>
- $(function() {
- $( "#entry_bean_dateString" ).datepicker({
- showOn: "button",
- buttonImage: "../../images/calendar.png",
- buttonImageOnly: true,
- changeMonth: true,
- changeYear: true
- });
- });
- </script>
- <s:textfield name="bean.dateString" size="12" readonly="true"/>
- <s:property value="actionWeblog.timeZone" />
- </div>
- <br />
-
- <s:checkbox name="bean.allowComments" />
- <s:text name="weblogEdit.allowComments" />
- <s:text name="weblogEdit.commentDays" />
- <s:select name="bean.commentDays" list="commentDaysList" size="1" listKey="key" listValue="value" />
- <br />
-
- <s:checkbox name="bean.rightToLeft" />
- <s:text name="weblogEdit.rightToLeft" />
- <br />
-
- <s:if test="authenticatedUser.hasGlobalPermission('admin')">
- <s:checkbox name="bean.pinnedToMain" />
- <s:text name="weblogEdit.pinnedToMain" /><tags:help key="weblogEdit.pinnedToMain.tooltip"/>
- <br />
</s:if>
- <br />
-
- <table>
- <tr>
- <td><s:text name="weblogEdit.searchDescription" />:<tags:help key="weblogEdit.searchDescription.tooltip"/></td>
- <td><s:textfield name="bean.searchDescription" size="60" maxlength="255" style="width:100%"/> </td>
- </tr>
- <tr>
- <td><s:text name="weblogEdit.enclosureURL" />:<tags:help key="weblogEdit.enclosureURL.tooltip"/></td>
- <td><s:textfield name="bean.enclosureURL" size="40" maxlength="255" style="width:100%"/></td>
- </tr>
- <s:if test="actionName == 'entryEdit'">
- <tr>
- <td></td>
- <td><s:if test="bean.enclosureURL != null">
- <s:text name="weblogEdit.enclosureType" />: <s:property value='entry.findEntryAttribute("att_mediacast_type")' />
- <s:text name="weblogEdit.enclosureLength" />: <s:property value='entry.findEntryAttribute("att_mediacast_length")' />
- </s:if></td>
- </tr>
- </s:if>
- </table>
- </div>
+ <%-- Advanced settings --%>
+
+ <div class="panel panel-default" id="panel-settings">
+ <div class="panel-heading">
+
+ <h4 class="panel-title">
+ <a class="accordion-toggle" aria-expanded="false"
+ data-toggle="collapse" data-parent="#collapseAdvanced" href="#collapseAdvanced">
+ <s:text name="weblogEdit.miscSettings"/> </a>
+ </h4>
+
+ </div>
+ <div id="collapseAdvanced" class="panel-collapse collapse in">
+ <div class="panel-body">
+
+ <div class="form-group">
+
+ <label class="col-sm-3 control-label"><s:text name="weblogEdit.pubTime"/></label>
+
+ <div class="col-sm-9 controls">
+
+ <s:select theme="simple" name="bean.hours" list="hoursList"/> :
+ <s:select theme="simple" name="bean.minutes" list="minutesList"/> :
+ <s:select theme="simple" name="bean.seconds" list="secondsList"/>
+
+ <script>
+ $(function () {
+ $("#entry_bean_dateString").datepicker({
+ showOn: "button",
+ buttonImage: "../../images/calendar.png",
+ buttonImageOnly: true,
+ changeMonth: true,
+ changeYear: true
+ });
+ });
+ </script>
+
+ <s:textfield theme="simple" name="bean.dateString" readonly="true"/>
+
+ <s:property value="actionWeblog.timeZone"/>
+
+ </div>
+
+ </div>
+
+
+ <%--
+ <s:checkbox label="%{getText('weblogEdit.allowComments')}" name="bean.allowComments"/>
+ <s:select label="%{getText('weblogEdit.commentDays')}" name="bean.commentDays"
+ list="commentDaysList" listKey="key" listValue="value"/>
+ --%>
+
+ <%-- use raw HTML tags here, Struts-Bootstrap does not provide this --%>
+ <div class="form-group">
+
+ <label class="col-sm-3 control-label" for="entry_bean_allowComments">
+ <s:text name="weblogEdit.allowComments" />
+ </label>
+
+ <div class="col-sm-9 controls">
+
+ <div class="input-group">
+
+ <span class="input-group-addon">
+ <input type="checkbox" name="bean.allowComments"
+ value="true" checked="checked" id="entry_bean_allowComments"/>
+ <input type="hidden" id="__checkbox_entry_bean_allowComments"
+ name="__checkbox_bean.allowComments" value="true"/>
+ </span>
+
+ <select name="bean.commentDays" id="entry_bean_commentDays" class="form-control">
+ <option value="0" selected="selected">unlimited days</option>
+ <option value="3">3 days</option>
+ <option value="7">7 days</option>
+ <option value="14">14 days</option>
+ <option value="30">30 days</option>
+ <option value="60">60 days</option>
+ <option value="90">90 days</option>
+ </select>
+
+ </div> <!-- /input-group -->
+
+ </div>
+
+ </div> <!-- /form-group -->
+
+ <s:checkbox label="%{getText('weblogEdit.rightToLeft')}" name="bean.rightToLeft"/>
+
+ <%-- global admin can pin items to front page weblog --%>
+ <s:if test="authenticatedUser.hasGlobalPermission('admin')">
+ <s:checkbox label="%{getText('weblogEdit.pinnedToMain')}" name="bean.pinnedToMain"
+ tooltop="%{getText('weblogEdit.pinnedToMain.tooltip')}" />
+ </s:if>
+
+ <s:textfield label="%{getText('weblogEdit.searchDescription')}" name="bean.searchDescription"
+ maxlength="255" tooltip="%{getText('weblogEdit.searchDescription.tooltip')}" />
+
+ <s:textfield label="%{getText('weblogEdit.enclosureURL')}" name="bean.enclosureURL"
+ maxlength="255" tooltip="%{getText('weblogEdit.enclosureURL.tooltip')}" />
+
+ <s:if test="actionName == 'entryEdit'">
+ <s:if test="bean.enclosureURL != null">
+ <s:text name="weblogEdit.enclosureType"/>:
+ <s:property value='entry.findEntryAttribute("att_mediacast_type")'/>
+ <s:text name="weblogEdit.enclosureLength"/>:
+ <s:property value='entry.findEntryAttribute("att_mediacast_length")'/>
+ </s:if>
+ </s:if>
+
+ </div>
+
+ </div>
+
+ </div>
+
+ </div>
+
<%-- ================================================================== --%>
- <%-- the button box --%>
-
- <br>
- <div class="control">
- <span style="padding-left:7px">
- <s:submit value="%{getText('weblogEdit.save')}" action="%{#mainAction}!saveDraft" />
- <s:if test="actionName == 'entryEdit'">
- <input type="button" name="fullPreview"
- value="<s:text name='weblogEdit.fullPreviewMode' />"
- onclick="fullPreviewMode()" />
- </s:if>
- <s:if test="userAnAuthor">
- <s:submit value="%{getText('weblogEdit.post')}" action="%{#mainAction}!publish"/>
- </s:if>
- <s:else>
- <s:submit value="%{getText('weblogEdit.submitForReview')}" action="%{#mainAction}!publish"/>
- </s:else>
- </span>
+ <%-- The button box --%>
+ <%-- save draft --%>
+ <s:submit cssClass="btn btn-default"
+ value="%{getText('weblogEdit.save')}"
+ action="%{#mainAction}!saveDraft"/>
+
+ <s:if test="actionName == 'entryEdit'">
+
+ <%-- preview mode --%>
+ <input class="btn btn-default" type="button" name="fullPreview"
+ value="<s:text name='weblogEdit.fullPreviewMode' />"
+ onclick="fullPreviewMode()"/>
+ </s:if>
+ <s:if test="userAnAuthor">
+
+ <%-- publish --%>
+ <s:submit cssClass="btn btn-default"
+ value="%{getText('weblogEdit.post')}"
+ action="%{#mainAction}!publish"/>
+ </s:if>
+ <s:else>
+
+ <%-- submit for review --%>
+ <s:submit cssClass="btn btn-default"
+ value="%{getText('weblogEdit.submitForReview')}"
+ action="%{#mainAction}!publish" />
+ </s:else>
+
+ <%-- delete --%>
<s:if test="actionName == 'entryEdit'">
<span style="float:right">
<s:url var="removeUrl" action="entryRemove">
- <s:param name="weblog" value="actionWeblog.handle" />
- <s:param name="removeId" value="%{entry.id}" />
+ <s:param name="weblog" value="actionWeblog.handle"/>
+ <s:param name="removeId" value="%{entry.id}"/>
</s:url>
- <input type="button" value="<s:text name='weblogEdit.deleteEntry'/>" onclick="window.location='<s:property value="removeUrl" escape="false" />'" />
+ <input class="btn btn-default" type="button"
+ value="<s:text name='weblogEdit.deleteEntry'/>"
+ onclick="window.location='<s:property value="removeUrl" escape="false"/>'"/>
</span>
</s:if>
- </div>
-
+
<%-- ================================================================== --%>
<%-- Trackback control --%>
+
<s:if test="actionName == 'entryEdit' && userAnAuthor">
- <br />
- <h2><s:text name="weblogEdit.trackback" /></h2>
- <s:text name="weblogEdit.trackbackUrl" />
- <br />
+ <br/>
+ <h2><s:text name="weblogEdit.trackback"/></h2>
+ <s:text name="weblogEdit.trackbackUrl"/>
+ <br/>
<s:textfield name="trackbackUrl" size="80" maxlength="255" style="width:35%"/>
- <s:submit value="%{getText('weblogEdit.sendTrackback')}" action="entryEdit!trackback" />
+ <s:submit value="%{getText('weblogEdit.sendTrackback')}" action="entryEdit!trackback"/>
</s:if>
</s:form>
<script>
-function fullPreviewMode() {
- window.open('<s:property value="previewURL" />');
-}
-
-//Get cookie to determine state of control
-if (getCookie('control_miscControl') != null) {
- if(getCookie('control_miscControl') == 'true'){
- toggle('miscControl');
- togglePlusMinus('imiscControl');
- }
-}
-if (getCookie('control_pluginControl') != null) {
- if(getCookie('control_pluginControl') == 'true'){
- toggle('pluginControl');
- togglePlusMinus('ipluginControl');
+ function fullPreviewMode() {
+ window.open('<s:property value="previewURL" />');
}
-}
-$(function() {
-function split( val ) {
- return val.split( / \s*/ );
-}
-function extractLast( term ) {
- return split( term ).pop();
-}
-$( "#tagAutoComplete" )
- // don't navigate away from the field on tab when selecting an item
- .bind( "keydown", function( event ) {
- if ( event.keyCode === $.ui.keyCode.TAB && $( this ).autocomplete( "instance" ).menu.active ) {
- event.preventDefault();
+
+ $(function () {
+ function split(val) {
+ return val.split(/ \s*/);
}
- })
- .autocomplete({
- delay: 500,
- source: function(request, response) {
- $.getJSON("<s:property value='jsonAutocompleteUrl' />", { format: 'json', prefix: extractLast( request.term ) },
- function(data) {
- response($.map(data.tagcounts, function (dataValue) {
- return {
- value: dataValue.tag
- };
- }))
- })
- },
- focus: function() {
- // prevent value inserted on focus
- return false;
- },
- select: function( event, ui ) {
- var terms = split( this.value );
- // remove the current input
- terms.pop();
- // add the selected item
- terms.push( ui.item.value );
- // add placeholder to get the space at the end
- terms.push( "" );
- this.value = terms.join( " " );
- return false;
+
+ function extractLast(term) {
+ return split(term).pop();
}
+
+ $("#tagAutoComplete")
+ // don't navigate away from the field on tab when selecting an item
+ .bind("keydown", function (event) {
+ if (event.keyCode === $.ui.keyCode.TAB && $(this).autocomplete("instance").menu.active) {
+ event.preventDefault();
+ }
+ })
+ .autocomplete({
+ delay: 500,
+ source: function (request, response) {
+ $.getJSON("<s:property value='jsonAutocompleteUrl' />", {
+ format: 'json',
+ prefix: extractLast(request.term)
+ },
+ function (data) {
+ response($.map(data.tagcounts, function (dataValue) {
+ return {
+ value: dataValue.tag
+ };
+ }))
+ })
+ },
+ focus: function () {
+ // prevent value inserted on focus
+ return false;
+ },
+ select: function (event, ui) {
+ var terms = split(this.value);
+ // remove the current input
+ terms.pop();
+ // add the selected item
+ terms.push(ui.item.value);
+ // add placeholder to get the space at the end
+ terms.push("");
+ this.value = terms.join(" ");
+ return false;
+ }
+ });
});
-});
</script>
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
index 5050b29..d881f87 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
@@ -18,26 +18,52 @@
<%-- This page is designed to be included in EntryEdit.jsp --%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
<%-- ********************************************************************* --%>
-<%-- Text editors --%>
+<%-- HTML text areas for editing content and summary --%>
+
+<div class="panel panel-default" id="panel-content">
+ <div class="panel-heading">
-<p class="toplabel">
+ <h4 class="panel-title">
+ <a data-toggle="collapse" data-target="#collapseContentEditor" href="#collapseContentEditor">
+ <s:text name="weblogEdit.content"/> </a>
+ </h4>
+
+ </div>
+ <div id="collapseContentEditor" class="panel-collapse collapse in">
+ <div class="panel-body">
-</p>
+ <span style="font-weight:normal;float:right;">
+ <a href="#" onClick="onClickAddImage();"><s:text name="weblogEdit.insertMediaFile"/></a>
+ </span>
+
+ <s:textarea id="edit_content" name="bean.text" cols="75" rows="25" tabindex="5"/>
-<div id="accordion">
- <h3>
- <s:text name="weblogEdit.content" />
- <span style="font-weight:normal;float:right;">
- <a href="#" onClick="onClickAddImage();"><s:text name="weblogEdit.insertMediaFile" /></a>
- </span>
- </h3>
- <div>
- <s:textarea id="edit_content" name="bean.text" cols="75" rows="25" cssStyle="width: 100%" tabindex="5"/>
+ </div>
</div>
- <h3><s:text name="weblogEdit.summary"/><tags:help key="weblogEdit.summary.tooltip"/></h3>
- <div>
- <s:textarea id="edit_summary" name="bean.summary" cols="75" rows="10" cssStyle="width: 100%" tabindex="6"/>
+</div>
+
+<%-- summary --%>
+
+<div class="panel panel-default" id="panel-summary">
+ <div class="panel-heading">
+
+ <h4 class="panel-title">
+ <a href="#collapseSummaryEditor"
+ aria-controls="collapseSummaryEditor" aria-expanded="false"
+ data-toggle="collapse" data-target="#collapseSummaryEditor" >
+ <s:text name="weblogEdit.summary"/>
+ </a>
+ </h4>
+
+ </div>
+ <div id="collapseSummaryEditor" class="panel-collapse collapse in">
+ <div class="panel-body">
+
+ <s:textarea id="edit_summary" name="bean.summary" cols="75" rows="10" tabindex="6"/>
+
+ </div>
</div>
</div>
@@ -55,6 +81,7 @@
</iframe>
</div>
+
<%-- ********************************************************************* --%>
<%-- Editor event handling, on close, on add image, etc. --%>
@@ -79,9 +106,9 @@
function onSelectMediaFile(name, url, isImage) {
$("#mediafile_edit_lightbox").dialog("close");
- $("#mediaFileEditor").attr('src','about:blank');
+ $("#mediaFileEditor").attr('src', 'about:blank');
if (isImage == "true") {
- insertMediaFile('<a href="' + url + '"><img src="' + url + '?t=true" alt="' + name+ '"></img></a>');
+ insertMediaFile('<a href="' + url + '"><img src="' + url + '?t=true" alt="' + name + '"></img></a>');
} else {
insertMediaFile('<a href="' + url + '">' + name + '</a>');
}
@@ -89,13 +116,10 @@
</script>
<s:if test="editor.id == 'editor-text.jsp'">
- <%-- Plain text editor (raw HTML entry) --%>
+
+ <%-- Media insertion for plain textarea editor --%>
<script>
- $(function() {
- $( "#accordion" ).accordion({
- });
- });
function insertMediaFile(anchorTag) {
insertAtCursor(document.getElementById('edit_content'), anchorTag);
}
@@ -126,9 +150,11 @@
}
}
</script>
+
</s:if>
<s:else>
- <%-- Rich text editor (Xinha, see: http://trac.xinha.org/wiki/NewbieGuide) --%>
+
+ <%-- Include the Rich text editor (Xinha, see: http://trac.xinha.org/wiki/NewbieGuide) --%>
<s:url var="xinhaHome" value="/roller-ui/authoring/editors/xinha-0.96.1"></s:url>
<script>
@@ -137,6 +163,7 @@
_editor_lang = "en"; // And the language we need to use in the editor.
_editor_skin = "blue-look"; // If you want use a skin, add the name (of the folder) here
</script>
+
<script src="<s:property value="xinhaHome" />/XinhaCore.js"></script>
<script>
@@ -153,6 +180,8 @@
});
});
+ <%-- Media insertion for Xinha editor --%>
+
function insertMediaFile(anchorTag) {
xinha_editors.edit_content.insertHTML(anchorTag);
}
@@ -199,4 +228,5 @@
Xinha._addEvent(window,'load', xinha_init);
</script>
+
</s:else>
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
index 08d7e4a..e2e96a9 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
@@ -16,7 +16,6 @@
directory of this distribution.
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script>
<script>
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp b/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp
index fbef230..9156adc 100644
--- a/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp
@@ -16,11 +16,17 @@
directory of this distribution.
--%>
<% response.setContentType("text/html; charset=UTF-8"); %>
+
<%@ page language="java" contentType="text/html; charset=UTF-8" %>
+
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<%@ taglib uri="/struts-tags" prefix="s" %>
+
+<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.1" prefix="str" %>
-<%@ taglib tagdir="/WEB-INF/tags" prefix="tags"%>
+
+<%@ taglib uri="/struts-tags" prefix="s" %>
+<%@ taglib uri="/struts-bootstrap-tags" prefix="sboo" %>
+
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags" %>
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
index 03ea6f9..4258949 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
@@ -17,50 +17,104 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<div class="bannerStatusBox">
-
- <table class="bannerStatusBox" cellpadding="0" cellspacing="0">
- <tr>
- <td class="bannerLeft">
-
- <s:if test="authenticatedUser != null">
- <s:text name="mainPage.loggedInAs" />
- <a href="<s:url action="menu" namespace="/roller-ui" />"><s:property value="authenticatedUser.userName"/></a>
- </s:if>
-
+<nav class="navbar navbar-default navbar-static-top navbar-inverse">
+ <div class="container">
+ <div id="navbar" class="navbar-collapse collapse">
+
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed"
+ data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="#">Apache Roller</a>
+ </div>
+
+ <ul class="nav navbar-nav">
+i
+ <%-- <s:if test="authenticatedUser != null">
+ <li>
+ <a href="<s:url action="menu" namespace="/roller-ui" />">
+ <s:text name="mainPage.loggedInAs" />: <s:property value="authenticatedUser.userName"/>
+ </a>
+ </li>
+ </s:if> --%>
<s:if test="actionWeblog != null">
- - <s:text name="mainPage.currentWebsite" />
- <b><a href='<s:property value="actionWeblog.absoluteURL" />'>
- <s:property value="actionWeblog.handle" />
- </a></b>
+
+ <%-- <li>
+ <a href='<s:property value="actionWeblog.absoluteURL" />'>
+ <s:text name="mainPage.currentWebsite" />: <s:property value="actionWeblog.handle" />
+ </a>
+ </li> --%>
+
+ <s:set name="tabMenu" value="menu"/>
+ <s:if test="#tabMenu != null">
+ <s:iterator id="tab" value="#tabMenu.tabs">
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
+ aria-haspopup="true" aria-expanded="false">
+ <s:text name="%{#tab.key}"/> <span class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ <s:iterator id="tabItem" value="#tab.items" status="stat">
+ <li>
+ <a href="<s:url action="%{#tabItem.action}">
+ <s:param name="weblog" value="actionWeblog.handle"/></s:url>">
+ <s:text name="%{#tabItem.key}"/>
+ </a>
+ </li>
+ </s:iterator>
+ </ul>
+ </li>
+ </s:iterator>
+ </s:if>
</s:if>
-
- </td>
+
+ </ul>
- <td class="bannerRight">
-
- <a href="<s:url value='/'/>"><s:property value="getProp('site.shortName')"/></a>
-
- | <a href="<s:url action='menu' namespace='/roller-ui' />"><s:text name="mainPage.mainMenu" /></a>
+ <ul class="nav navbar-nav navbar-right">
+ <li><a href="<s:url value='/'/>"><s:property value="getProp('site.shortName')"/></a></li>
+
+ <li>
+ <a href="<s:url action='menu' namespace='/roller-ui' />">
+ <s:text name="mainPage.mainMenu" /></a>
+ </li>
+
<s:if test="authenticatedUser != null">
- | <a href="<s:url action='logout' namespace='/roller-ui' />"><s:text name="navigationBar.logout"/></a>
+ <li>
+ <a href="<s:url action='logout' namespace='/roller-ui' />">
+ <s:text name="navigationBar.logout"/></a>
+ </li>
</s:if>
<s:else>
- | <a href="<s:url action='login-redirect' namespace='/roller-ui' />"><s:text name="navigationBar.login"/></a>
-
+ <li>
+ <a href="<s:url action='login-redirect' namespace='/roller-ui' />">
+ <s:text name="navigationBar.login"/></a>
+ </li>
+
<s:if test="getBooleanProp('users.registration.enabled') && getProp('authentication.method') != 'ldap'">
- | <a href="<s:url action='register' namespace='/roller-ui' />"><s:text name="navigationBar.register"/></a>
+ <li>
+ <a href="<s:url action='register' namespace='/roller-ui' />">
+ <s:text name="navigationBar.register"/></a>
+ </li>
</s:if>
+
<s:elseif test="getProp('users.registration.url') != null && getProp('users.registration.url') > 0">
- | <a href="<s:property value="getProp('users.registration.url')"/>"><s:text name="navigationBar.register"/></a>
+ <li>
+ <a href="<s:property value="getProp('users.registration.url')"/>">
+ <s:text name="navigationBar.register"/></a>
+ </li>
</s:elseif>
</s:else>
- </td>
- </tr>
- </table>
-
-</div>
+ </ul>
+ </div><!--/.nav-collapse -->
+ </div>
+</nav>
+
+
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp
index f890ec9..2acbab6 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp
@@ -2,18 +2,35 @@
This default stuff goes in the HTML head element of each page
You can override it with your own file via WEB-INF/tiles-def.xml
--%>
+
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<%--
<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssreset/cssreset-min.css'/>" />
<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssfonts/cssfonts-min.css'/>" />
<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssbase/cssbase-min.css'/>" />
-
<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/layout.css"/>' />
<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' />
<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/menu.css"/>' />
-
<link rel="stylesheet" media="all" href="<s:url value="/roller-ui/theme/"/><s:property value="getProp('editor.theme')" />/colors.css" />
+--%>
+
+<%-- jquery and bootstrap --%>
+<script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script>
+<link rel="stylesheet" media="all"
+ href='<s:url value="/roller-ui/bootstrap-3.3.6-dist/css/bootstrap.min.css"/>' />
+<link rel="stylesheet" media="all"
+ href='<s:url value="/roller-ui/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css"/>' />
+<script src="<s:url value="/roller-ui/bootstrap-3.3.6-dist/js/bootstrap.min.js"/>"></script>
+
+<%-- the links generated by the Struts-Bootstrap plugin are 404s --%>
+
+<sb:head includeScripts="false" includeScriptsValidation="false"/>
+
+<%-- roller Javascropt and styles --%>
+
+<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' />
<script src="<s:url value="/theme/scripts/roller.js"/>"></script>
<%-- struts2 head disabled until we need it --%>
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
index 912cd4b..23efc18 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
@@ -2,16 +2,33 @@
This default stuff goes in the HTML head element of each page
You can override it with your own file via WEB-INF/tiles-def.xml
--%>
+
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<%--
<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssreset/cssreset-min.css'/>" />
<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssfonts/cssfonts-min.css'/>" />
<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssbase/cssbase-min.css'/>" />
-
<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/layout.css"/>' />
<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' />
<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/menu.css"/>' />
+<link rel="stylesheet" media="all" href="<s:url value="/roller-ui/theme/"/><s:property value="getProp('editor.theme')" />/colors.css" />
+--%>
+
+<%-- jquery and bootstrap --%>
-<link rel="stylesheet" media="all" href="<s:url value="/roller-ui/theme/"/><s:property value="getProp('editor.theme')"/>/colors.css" />
+<script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script>
+<link rel="stylesheet" media="all"
+ href='<s:url value="/roller-ui/bootstrap-3.3.6-dist/css/bootstrap.min.css"/>' />
+<link rel="stylesheet" media="all"
+ href='<s:url value="/roller-ui/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css"/>' />
+<script src="<s:url value="/roller-ui/bootstrap-3.3.6-dist/js/bootstrap.min.js"/>"></script>
+<%-- the links generated by the Struts-Bootstrap plugin are 404s --%>
+
+<sb:head includeScripts="false" includeScriptsValidation="false"/>
+
+<%-- roller Javascropt and styles --%>
+
+<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' />
<script src="<s:url value="/theme/scripts/roller.js"/>"></script>
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp
index 3928e07..6166efb 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp
@@ -20,41 +20,47 @@
<s:set name="tabMenu" value="menu"/>
<s:if test="#tabMenu != null">
-<table class="menuTabTable" cellspacing="0" >
-<tr>
-<s:iterator id="tab" value="#tabMenu.tabs" >
- <s:if test="#tab.selected">
- <s:set name="selectedTab" value="#tab" />
- <td class="menuTabSelected">
- </s:if>
- <s:else>
- <td class="menuTabUnselected">
- </s:else>
- <div class="menu-tr">
- <div class="menu-tl">
- <a href="<s:url action="%{#tab.action}"><s:param name="weblog" value="actionWeblog.handle"/></s:url>"><s:text name="%{#tab.key}" /></a>
- </div>
- </div>
- </td>
- <td class="menuTabSeparator"></td>
-</s:iterator>
-</tr>
-</table>
-
-<table class="menuItemTable" cellspacing="0" >
- <tr>
- <td class="padleft">
- <s:iterator id="tabItem" value="#selectedTab.items" status="stat">
- <s:if test="!#stat.first">|</s:if>
- <s:if test="#tabItem.selected">
- <a class="menuItemSelected" href="<s:url action="%{#tabItem.action}"><s:param name="weblog" value="actionWeblog.handle"/></s:url>"><s:text name="%{#tabItem.key}" /></a>
- </s:if>
- <s:else>
- <a class="menuItemUnselected" href="<s:url action="%{#tabItem.action}"><s:param name="weblog" value="actionWeblog.handle"/></s:url>"><s:text name="%{#tabItem.key}" /></a>
- </s:else>
+ <%--
+ <nav class="navbar navbar-default">
+ <div class="container-fluid">
+ <div id="navbar" class="navbar-collapse collapse">
+ <ul class="nav navbar-nav">
+
+ <s:iterator id="tab" value="#tabMenu.tabs">
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
+ aria-haspopup="true" aria-expanded="false">
+ <s:text name="%{#tab.key}"/> <span class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ <s:iterator id="tabItem" value="#tab.items" status="stat">
+ <li>
+ <a href="<s:url action="%{#tabItem.action}"><s:param name="weblog" value="actionWeblog.handle"/></s:url>">
+ <s:text name="%{#tabItem.key}"/>
+ </a>
+ </li>
+ </s:iterator>
+ </ul>
+ </li>
+ </s:iterator>
+
+ </ul>
+ </div> <!--/.nav-collapse -->
+ </div> <!--/.container-fluid -->
+ </nav>
+
+ <s:iterator id="tab" value="#tabMenu.tabs">
+
+ <h3><s:text name="%{#tab.key}"/></h3>
+
+ <div class="list-group">
+ <s:iterator id="tabItem" value="#tab.items" status="stat">
+ <a class="list-group-item" href="<s:url action="%{#tabItem.action}"><s:param name="weblog" value="actionWeblog.handle"/></s:url>">
+ <s:text name="%{#tabItem.key}"/></a>
</s:iterator>
- </td>
- </tr>
-</table>
+ </div>
+ </s:iterator>
+ --%>
+
</s:if>
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
index 3613fc3..9f5c3c5 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
@@ -18,47 +18,49 @@
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
<!doctype html>
<html>
- <head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <link rel="icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/x-icon">
- <title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle" /></title>
+<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <link rel="icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/x-icon">
+ <title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle"/></title>
- <tiles:insertAttribute name="head" />
- <style>
- <tiles:insertAttribute name="styles" />
- </style>
- </head>
- <body>
-
- <div id="banner">
- <tiles:insertAttribute name="bannerStatus" />
- </div>
-
- <div id="content">
- <div id="leftcontent_wrap">
- <div id="leftcontent">
- </div>
- </div>
-
- <div id="centercontent_wrap">
- <div id="centercontent">
- <h1><s:property value="pageTitle" /></h1>
- <tiles:insertAttribute name="messages" />
- <tiles:insertAttribute name="content" />
- </div>
- </div>
-
- <div id="rightcontent_wrap">
- <div id="rightcontent">
- <tiles:insertAttribute name="sidebar" />
- </div>
+ <tiles:insertAttribute name="head"/>
+ <style>
+ <tiles:insertAttribute name="styles" />
+ </style>
+</head>
+<body>
+
+<tiles:insertAttribute name="bannerStatus"/>
+
+<div class="row">
+
+ <div class="col-md-3 roller-column-left">
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <tiles:insertAttribute name="sidebar"/>
</div>
</div>
-
- <div id="footer">
- <tiles:insertAttribute name="footer" />
+ </div>
+
+ <div class="col-md-9 roller-column-right">
+
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <h1><s:property value="pageTitle"/></h1>
+ <tiles:insertAttribute name="messages"/>
+ <tiles:insertAttribute name="content"/>
+ </div>
</div>
-
- </body>
+
+ </div>
+</div>
+
+<footer class="footer">
+ <div class="container">
+ <tiles:insertAttribute name="footer"/>
+ </div>
+</footer>
+
+</body>
</html>
[33/47] roller git commit: Apply style to buttons in EditPage
Posted by sn...@apache.org.
Apply style to buttons in EditPage
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/122eac41
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/122eac41
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/122eac41
Branch: refs/heads/bootstrap-ui
Commit: 122eac419b3d3a7a33e70083eaeb305893a10fea
Parents: 8042fd7
Author: Kohei Nozaki <ky...@bridge9.sakura.ne.jp>
Authored: Wed Jan 6 14:05:45 2016 +0900
Committer: Kohei Nozaki <ky...@bridge9.sakura.ne.jp>
Committed: Wed Jan 6 14:06:49 2016 +0900
----------------------------------------------------------------------
app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/122eac41/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
index b5ba20b..16cd5c2 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
@@ -297,7 +297,7 @@
<%-- The button box --%>
<%-- save draft --%>
- <s:submit cssClass="btn btn-default"
+ <s:submit cssClass="btn btn-warning"
value="%{getText('weblogEdit.save')}"
action="%{#mainAction}!saveDraft"/>
@@ -311,14 +311,14 @@
<s:if test="userAnAuthor">
<%-- publish --%>
- <s:submit cssClass="btn btn-default"
+ <s:submit cssClass="btn btn-success"
value="%{getText('weblogEdit.post')}"
action="%{#mainAction}!publish"/>
</s:if>
<s:else>
<%-- submit for review --%>
- <s:submit cssClass="btn btn-default"
+ <s:submit cssClass="btn btn-info"
value="%{getText('weblogEdit.submitForReview')}"
action="%{#mainAction}!publish" />
</s:else>
@@ -330,7 +330,7 @@
<s:param name="weblog" value="actionWeblog.handle"/>
<s:param name="removeId" value="%{entry.id}"/>
</s:url>
- <input class="btn btn-default" type="button"
+ <input class="btn btn-danger" type="button"
value="<s:text name='weblogEdit.deleteEntry'/>"
onclick="window.location='<s:property value="removeUrl" escape="false"/>'"/>
</span>
[31/47] roller git commit: Fix: Buttons in the menu page (such as New
Entry, Entries and so on) doesn't work.
Posted by sn...@apache.org.
Fix: Buttons in the menu page (such as New Entry, Entries and so on) doesn't work.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/845faf2b
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/845faf2b
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/845faf2b
Branch: refs/heads/bootstrap-ui
Commit: 845faf2b0ea5ceaf782f5c02680f2623331d2d23
Parents: 8042fd7
Author: Kohei Nozaki <ky...@bridge9.sakura.ne.jp>
Authored: Wed Jan 6 12:58:00 2016 +0900
Committer: Kohei Nozaki <ky...@bridge9.sakura.ne.jp>
Committed: Wed Jan 6 12:58:00 2016 +0900
----------------------------------------------------------------------
.../main/webapp/WEB-INF/jsps/core/MainMenu.jsp | 60 ++++++++++----------
1 file changed, 29 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/845faf2b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
index 7b57b0d..da126a9 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
@@ -80,40 +80,40 @@
<div class="btn-group" role="group" aria-label="...">
<%-- New entry button --%>
- <button type="button" class="btn btn-default">
- <s:url action="entryAdd" namespace="/roller-ui/authoring" id="newEntry">
- <s:param name="weblog" value="#perms.weblog.handle"/>
- </s:url>
+ <s:url action="entryAdd" namespace="/roller-ui/authoring" id="newEntry">
+ <s:param name="weblog" value="#perms.weblog.handle"/>
+ </s:url>
+ <s:a href="%{newEntry}" cssClass="btn btn-default">
<span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
- <s:a href="%{newEntry}"><s:text name="yourWebsites.newEntry"/></s:a>
- </button>
+ <s:text name="yourWebsites.newEntry"/>
+ </s:a>
<s:if test='!(#perms.hasAction("edit_draft"))'>
<%-- Show Entries button with count for users above LIMITED permission --%>
- <button type="button" class="btn btn-default">
- <s:url action="entries" namespace="/roller-ui/authoring" id="editEntries">
- <s:param name="weblog" value="#perms.weblog.handle"/>
- </s:url>
+ <s:url action="entries" namespace="/roller-ui/authoring" id="editEntries">
+ <s:param name="weblog" value="#perms.weblog.handle"/>
+ </s:url>
+ <s:a href="%{editEntries}" cssClass="btn btn-default">
<span class="glyphicon glyphicon-list" aria-hidden="true"></span>
- <s:a href="%{editEntries}"><s:text name="yourWebsites.editEntries"/></s:a>
+ <s:text name="yourWebsites.editEntries"/>
<span class="badge"><s:property value="#perms.weblog.entryCount"/></span>
- </button>
-
+ </s:a>
+
</s:if>
<s:if test='!(#perms.hasAction("edit_draft"))'>
<%-- Show Comments button with count for users above LIMITED permission --%>
- <button type="button" class="btn btn-default">
- <s:url action="comments" namespace="/roller-ui/authoring" id="manageComments">
- <s:param name="weblog" value="#perms.weblog.handle"/>
- </s:url>
+ <s:url action="comments" namespace="/roller-ui/authoring" id="manageComments">
+ <s:param name="weblog" value="#perms.weblog.handle"/>
+ </s:url>
+ <s:a href="%{manageComments}" cssClass="btn btn-default">
<span class="glyphicon glyphicon-comment" aria-hidden="true"></span>
- <s:a href="%{manageComments}"><s:text name="yourWebsites.manageComments"/></s:a>
+ <s:text name="yourWebsites.manageComments"/>
<span class="badge"><s:property value="#perms.weblog.commentCount"/></span>
- </button>
-
+ </s:a>
+
</s:if>
@@ -132,22 +132,20 @@
<s:param name="weblog" value="#perms.weblog.handle" />
</s:url>
</s:else>
- <button type="button" class="btn btn-default">
+ <a href='<s:property value="weblogTheme" />' class="btn btn-default">
<span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
- <a href='<s:property value="weblogTheme" />'>
- <s:text name="yourWebsites.theme" /></a>
- </button>
+ <s:text name="yourWebsites.theme" />
+ </a>
</s:if>
<%-- settings button --%>
- <button type="button" class="btn btn-default">
- <s:url action="weblogConfig" namespace="/roller-ui/authoring" id="manageWeblog">
- <s:param name="weblog" value="#perms.weblog.handle"/>
- </s:url>
+ <s:url action="weblogConfig" namespace="/roller-ui/authoring" id="manageWeblog">
+ <s:param name="weblog" value="#perms.weblog.handle"/>
+ </s:url>
+ <a href='<s:property value="manageWeblog" />' class="btn btn-default">
<span class="glyphicon glyphicon-cog" aria-hidden="true"></span>
- <a href='<s:property value="manageWeblog" />'>
- <s:text name="yourWebsites.manage"/></a>
- </button>
+ <s:text name="yourWebsites.manage"/>
+ </a>
</s:if>
[18/47] roller git commit: Beginnings of a Bootstrap rewrite of the
Roller editor/admin UI,
using Struts-Bootstrap plugin. The main menu and edit weblog page are
essentially complete.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap.css
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap.css b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap.css
new file mode 100644
index 0000000..42c79d6
--- /dev/null
+++ b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap.css
@@ -0,0 +1,6760 @@
+/*!
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
+html {
+ font-family: sans-serif;
+ -webkit-text-size-adjust: 100%;
+ -ms-text-size-adjust: 100%;
+}
+body {
+ margin: 0;
+}
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+section,
+summary {
+ display: block;
+}
+audio,
+canvas,
+progress,
+video {
+ display: inline-block;
+ vertical-align: baseline;
+}
+audio:not([controls]) {
+ display: none;
+ height: 0;
+}
+[hidden],
+template {
+ display: none;
+}
+a {
+ background-color: transparent;
+}
+a:active,
+a:hover {
+ outline: 0;
+}
+abbr[title] {
+ border-bottom: 1px dotted;
+}
+b,
+strong {
+ font-weight: bold;
+}
+dfn {
+ font-style: italic;
+}
+h1 {
+ margin: .67em 0;
+ font-size: 2em;
+}
+mark {
+ color: #000;
+ background: #ff0;
+}
+small {
+ font-size: 80%;
+}
+sub,
+sup {
+ position: relative;
+ font-size: 75%;
+ line-height: 0;
+ vertical-align: baseline;
+}
+sup {
+ top: -.5em;
+}
+sub {
+ bottom: -.25em;
+}
+img {
+ border: 0;
+}
+svg:not(:root) {
+ overflow: hidden;
+}
+figure {
+ margin: 1em 40px;
+}
+hr {
+ height: 0;
+ -webkit-box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
+}
+pre {
+ overflow: auto;
+}
+code,
+kbd,
+pre,
+samp {
+ font-family: monospace, monospace;
+ font-size: 1em;
+}
+button,
+input,
+optgroup,
+select,
+textarea {
+ margin: 0;
+ font: inherit;
+ color: inherit;
+}
+button {
+ overflow: visible;
+}
+button,
+select {
+ text-transform: none;
+}
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+ -webkit-appearance: button;
+ cursor: pointer;
+}
+button[disabled],
+html input[disabled] {
+ cursor: default;
+}
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+ padding: 0;
+ border: 0;
+}
+input {
+ line-height: normal;
+}
+input[type="checkbox"],
+input[type="radio"] {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ padding: 0;
+}
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+ height: auto;
+}
+input[type="search"] {
+ -webkit-box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
+ -webkit-appearance: textfield;
+}
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+ -webkit-appearance: none;
+}
+fieldset {
+ padding: .35em .625em .75em;
+ margin: 0 2px;
+ border: 1px solid #c0c0c0;
+}
+legend {
+ padding: 0;
+ border: 0;
+}
+textarea {
+ overflow: auto;
+}
+optgroup {
+ font-weight: bold;
+}
+table {
+ border-spacing: 0;
+ border-collapse: collapse;
+}
+td,
+th {
+ padding: 0;
+}
+/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
+@media print {
+ *,
+ *:before,
+ *:after {
+ color: #000 !important;
+ text-shadow: none !important;
+ background: transparent !important;
+ -webkit-box-shadow: none !important;
+ box-shadow: none !important;
+ }
+ a,
+ a:visited {
+ text-decoration: underline;
+ }
+ a[href]:after {
+ content: " (" attr(href) ")";
+ }
+ abbr[title]:after {
+ content: " (" attr(title) ")";
+ }
+ a[href^="#"]:after,
+ a[href^="javascript:"]:after {
+ content: "";
+ }
+ pre,
+ blockquote {
+ border: 1px solid #999;
+
+ page-break-inside: avoid;
+ }
+ thead {
+ display: table-header-group;
+ }
+ tr,
+ img {
+ page-break-inside: avoid;
+ }
+ img {
+ max-width: 100% !important;
+ }
+ p,
+ h2,
+ h3 {
+ orphans: 3;
+ widows: 3;
+ }
+ h2,
+ h3 {
+ page-break-after: avoid;
+ }
+ .navbar {
+ display: none;
+ }
+ .btn > .caret,
+ .dropup > .btn > .caret {
+ border-top-color: #000 !important;
+ }
+ .label {
+ border: 1px solid #000;
+ }
+ .table {
+ border-collapse: collapse !important;
+ }
+ .table td,
+ .table th {
+ background-color: #fff !important;
+ }
+ .table-bordered th,
+ .table-bordered td {
+ border: 1px solid #ddd !important;
+ }
+}
+@font-face {
+ font-family: 'Glyphicons Halflings';
+
+ src: url('../fonts/glyphicons-halflings-regular.eot');
+ src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
+}
+.glyphicon {
+ position: relative;
+ top: 1px;
+ display: inline-block;
+ font-family: 'Glyphicons Halflings';
+ font-style: normal;
+ font-weight: normal;
+ line-height: 1;
+
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+.glyphicon-asterisk:before {
+ content: "\002a";
+}
+.glyphicon-plus:before {
+ content: "\002b";
+}
+.glyphicon-euro:before,
+.glyphicon-eur:before {
+ content: "\20ac";
+}
+.glyphicon-minus:before {
+ content: "\2212";
+}
+.glyphicon-cloud:before {
+ content: "\2601";
+}
+.glyphicon-envelope:before {
+ content: "\2709";
+}
+.glyphicon-pencil:before {
+ content: "\270f";
+}
+.glyphicon-glass:before {
+ content: "\e001";
+}
+.glyphicon-music:before {
+ content: "\e002";
+}
+.glyphicon-search:before {
+ content: "\e003";
+}
+.glyphicon-heart:before {
+ content: "\e005";
+}
+.glyphicon-star:before {
+ content: "\e006";
+}
+.glyphicon-star-empty:before {
+ content: "\e007";
+}
+.glyphicon-user:before {
+ content: "\e008";
+}
+.glyphicon-film:before {
+ content: "\e009";
+}
+.glyphicon-th-large:before {
+ content: "\e010";
+}
+.glyphicon-th:before {
+ content: "\e011";
+}
+.glyphicon-th-list:before {
+ content: "\e012";
+}
+.glyphicon-ok:before {
+ content: "\e013";
+}
+.glyphicon-remove:before {
+ content: "\e014";
+}
+.glyphicon-zoom-in:before {
+ content: "\e015";
+}
+.glyphicon-zoom-out:before {
+ content: "\e016";
+}
+.glyphicon-off:before {
+ content: "\e017";
+}
+.glyphicon-signal:before {
+ content: "\e018";
+}
+.glyphicon-cog:before {
+ content: "\e019";
+}
+.glyphicon-trash:before {
+ content: "\e020";
+}
+.glyphicon-home:before {
+ content: "\e021";
+}
+.glyphicon-file:before {
+ content: "\e022";
+}
+.glyphicon-time:before {
+ content: "\e023";
+}
+.glyphicon-road:before {
+ content: "\e024";
+}
+.glyphicon-download-alt:before {
+ content: "\e025";
+}
+.glyphicon-download:before {
+ content: "\e026";
+}
+.glyphicon-upload:before {
+ content: "\e027";
+}
+.glyphicon-inbox:before {
+ content: "\e028";
+}
+.glyphicon-play-circle:before {
+ content: "\e029";
+}
+.glyphicon-repeat:before {
+ content: "\e030";
+}
+.glyphicon-refresh:before {
+ content: "\e031";
+}
+.glyphicon-list-alt:before {
+ content: "\e032";
+}
+.glyphicon-lock:before {
+ content: "\e033";
+}
+.glyphicon-flag:before {
+ content: "\e034";
+}
+.glyphicon-headphones:before {
+ content: "\e035";
+}
+.glyphicon-volume-off:before {
+ content: "\e036";
+}
+.glyphicon-volume-down:before {
+ content: "\e037";
+}
+.glyphicon-volume-up:before {
+ content: "\e038";
+}
+.glyphicon-qrcode:before {
+ content: "\e039";
+}
+.glyphicon-barcode:before {
+ content: "\e040";
+}
+.glyphicon-tag:before {
+ content: "\e041";
+}
+.glyphicon-tags:before {
+ content: "\e042";
+}
+.glyphicon-book:before {
+ content: "\e043";
+}
+.glyphicon-bookmark:before {
+ content: "\e044";
+}
+.glyphicon-print:before {
+ content: "\e045";
+}
+.glyphicon-camera:before {
+ content: "\e046";
+}
+.glyphicon-font:before {
+ content: "\e047";
+}
+.glyphicon-bold:before {
+ content: "\e048";
+}
+.glyphicon-italic:before {
+ content: "\e049";
+}
+.glyphicon-text-height:before {
+ content: "\e050";
+}
+.glyphicon-text-width:before {
+ content: "\e051";
+}
+.glyphicon-align-left:before {
+ content: "\e052";
+}
+.glyphicon-align-center:before {
+ content: "\e053";
+}
+.glyphicon-align-right:before {
+ content: "\e054";
+}
+.glyphicon-align-justify:before {
+ content: "\e055";
+}
+.glyphicon-list:before {
+ content: "\e056";
+}
+.glyphicon-indent-left:before {
+ content: "\e057";
+}
+.glyphicon-indent-right:before {
+ content: "\e058";
+}
+.glyphicon-facetime-video:before {
+ content: "\e059";
+}
+.glyphicon-picture:before {
+ content: "\e060";
+}
+.glyphicon-map-marker:before {
+ content: "\e062";
+}
+.glyphicon-adjust:before {
+ content: "\e063";
+}
+.glyphicon-tint:before {
+ content: "\e064";
+}
+.glyphicon-edit:before {
+ content: "\e065";
+}
+.glyphicon-share:before {
+ content: "\e066";
+}
+.glyphicon-check:before {
+ content: "\e067";
+}
+.glyphicon-move:before {
+ content: "\e068";
+}
+.glyphicon-step-backward:before {
+ content: "\e069";
+}
+.glyphicon-fast-backward:before {
+ content: "\e070";
+}
+.glyphicon-backward:before {
+ content: "\e071";
+}
+.glyphicon-play:before {
+ content: "\e072";
+}
+.glyphicon-pause:before {
+ content: "\e073";
+}
+.glyphicon-stop:before {
+ content: "\e074";
+}
+.glyphicon-forward:before {
+ content: "\e075";
+}
+.glyphicon-fast-forward:before {
+ content: "\e076";
+}
+.glyphicon-step-forward:before {
+ content: "\e077";
+}
+.glyphicon-eject:before {
+ content: "\e078";
+}
+.glyphicon-chevron-left:before {
+ content: "\e079";
+}
+.glyphicon-chevron-right:before {
+ content: "\e080";
+}
+.glyphicon-plus-sign:before {
+ content: "\e081";
+}
+.glyphicon-minus-sign:before {
+ content: "\e082";
+}
+.glyphicon-remove-sign:before {
+ content: "\e083";
+}
+.glyphicon-ok-sign:before {
+ content: "\e084";
+}
+.glyphicon-question-sign:before {
+ content: "\e085";
+}
+.glyphicon-info-sign:before {
+ content: "\e086";
+}
+.glyphicon-screenshot:before {
+ content: "\e087";
+}
+.glyphicon-remove-circle:before {
+ content: "\e088";
+}
+.glyphicon-ok-circle:before {
+ content: "\e089";
+}
+.glyphicon-ban-circle:before {
+ content: "\e090";
+}
+.glyphicon-arrow-left:before {
+ content: "\e091";
+}
+.glyphicon-arrow-right:before {
+ content: "\e092";
+}
+.glyphicon-arrow-up:before {
+ content: "\e093";
+}
+.glyphicon-arrow-down:before {
+ content: "\e094";
+}
+.glyphicon-share-alt:before {
+ content: "\e095";
+}
+.glyphicon-resize-full:before {
+ content: "\e096";
+}
+.glyphicon-resize-small:before {
+ content: "\e097";
+}
+.glyphicon-exclamation-sign:before {
+ content: "\e101";
+}
+.glyphicon-gift:before {
+ content: "\e102";
+}
+.glyphicon-leaf:before {
+ content: "\e103";
+}
+.glyphicon-fire:before {
+ content: "\e104";
+}
+.glyphicon-eye-open:before {
+ content: "\e105";
+}
+.glyphicon-eye-close:before {
+ content: "\e106";
+}
+.glyphicon-warning-sign:before {
+ content: "\e107";
+}
+.glyphicon-plane:before {
+ content: "\e108";
+}
+.glyphicon-calendar:before {
+ content: "\e109";
+}
+.glyphicon-random:before {
+ content: "\e110";
+}
+.glyphicon-comment:before {
+ content: "\e111";
+}
+.glyphicon-magnet:before {
+ content: "\e112";
+}
+.glyphicon-chevron-up:before {
+ content: "\e113";
+}
+.glyphicon-chevron-down:before {
+ content: "\e114";
+}
+.glyphicon-retweet:before {
+ content: "\e115";
+}
+.glyphicon-shopping-cart:before {
+ content: "\e116";
+}
+.glyphicon-folder-close:before {
+ content: "\e117";
+}
+.glyphicon-folder-open:before {
+ content: "\e118";
+}
+.glyphicon-resize-vertical:before {
+ content: "\e119";
+}
+.glyphicon-resize-horizontal:before {
+ content: "\e120";
+}
+.glyphicon-hdd:before {
+ content: "\e121";
+}
+.glyphicon-bullhorn:before {
+ content: "\e122";
+}
+.glyphicon-bell:before {
+ content: "\e123";
+}
+.glyphicon-certificate:before {
+ content: "\e124";
+}
+.glyphicon-thumbs-up:before {
+ content: "\e125";
+}
+.glyphicon-thumbs-down:before {
+ content: "\e126";
+}
+.glyphicon-hand-right:before {
+ content: "\e127";
+}
+.glyphicon-hand-left:before {
+ content: "\e128";
+}
+.glyphicon-hand-up:before {
+ content: "\e129";
+}
+.glyphicon-hand-down:before {
+ content: "\e130";
+}
+.glyphicon-circle-arrow-right:before {
+ content: "\e131";
+}
+.glyphicon-circle-arrow-left:before {
+ content: "\e132";
+}
+.glyphicon-circle-arrow-up:before {
+ content: "\e133";
+}
+.glyphicon-circle-arrow-down:before {
+ content: "\e134";
+}
+.glyphicon-globe:before {
+ content: "\e135";
+}
+.glyphicon-wrench:before {
+ content: "\e136";
+}
+.glyphicon-tasks:before {
+ content: "\e137";
+}
+.glyphicon-filter:before {
+ content: "\e138";
+}
+.glyphicon-briefcase:before {
+ content: "\e139";
+}
+.glyphicon-fullscreen:before {
+ content: "\e140";
+}
+.glyphicon-dashboard:before {
+ content: "\e141";
+}
+.glyphicon-paperclip:before {
+ content: "\e142";
+}
+.glyphicon-heart-empty:before {
+ content: "\e143";
+}
+.glyphicon-link:before {
+ content: "\e144";
+}
+.glyphicon-phone:before {
+ content: "\e145";
+}
+.glyphicon-pushpin:before {
+ content: "\e146";
+}
+.glyphicon-usd:before {
+ content: "\e148";
+}
+.glyphicon-gbp:before {
+ content: "\e149";
+}
+.glyphicon-sort:before {
+ content: "\e150";
+}
+.glyphicon-sort-by-alphabet:before {
+ content: "\e151";
+}
+.glyphicon-sort-by-alphabet-alt:before {
+ content: "\e152";
+}
+.glyphicon-sort-by-order:before {
+ content: "\e153";
+}
+.glyphicon-sort-by-order-alt:before {
+ content: "\e154";
+}
+.glyphicon-sort-by-attributes:before {
+ content: "\e155";
+}
+.glyphicon-sort-by-attributes-alt:before {
+ content: "\e156";
+}
+.glyphicon-unchecked:before {
+ content: "\e157";
+}
+.glyphicon-expand:before {
+ content: "\e158";
+}
+.glyphicon-collapse-down:before {
+ content: "\e159";
+}
+.glyphicon-collapse-up:before {
+ content: "\e160";
+}
+.glyphicon-log-in:before {
+ content: "\e161";
+}
+.glyphicon-flash:before {
+ content: "\e162";
+}
+.glyphicon-log-out:before {
+ content: "\e163";
+}
+.glyphicon-new-window:before {
+ content: "\e164";
+}
+.glyphicon-record:before {
+ content: "\e165";
+}
+.glyphicon-save:before {
+ content: "\e166";
+}
+.glyphicon-open:before {
+ content: "\e167";
+}
+.glyphicon-saved:before {
+ content: "\e168";
+}
+.glyphicon-import:before {
+ content: "\e169";
+}
+.glyphicon-export:before {
+ content: "\e170";
+}
+.glyphicon-send:before {
+ content: "\e171";
+}
+.glyphicon-floppy-disk:before {
+ content: "\e172";
+}
+.glyphicon-floppy-saved:before {
+ content: "\e173";
+}
+.glyphicon-floppy-remove:before {
+ content: "\e174";
+}
+.glyphicon-floppy-save:before {
+ content: "\e175";
+}
+.glyphicon-floppy-open:before {
+ content: "\e176";
+}
+.glyphicon-credit-card:before {
+ content: "\e177";
+}
+.glyphicon-transfer:before {
+ content: "\e178";
+}
+.glyphicon-cutlery:before {
+ content: "\e179";
+}
+.glyphicon-header:before {
+ content: "\e180";
+}
+.glyphicon-compressed:before {
+ content: "\e181";
+}
+.glyphicon-earphone:before {
+ content: "\e182";
+}
+.glyphicon-phone-alt:before {
+ content: "\e183";
+}
+.glyphicon-tower:before {
+ content: "\e184";
+}
+.glyphicon-stats:before {
+ content: "\e185";
+}
+.glyphicon-sd-video:before {
+ content: "\e186";
+}
+.glyphicon-hd-video:before {
+ content: "\e187";
+}
+.glyphicon-subtitles:before {
+ content: "\e188";
+}
+.glyphicon-sound-stereo:before {
+ content: "\e189";
+}
+.glyphicon-sound-dolby:before {
+ content: "\e190";
+}
+.glyphicon-sound-5-1:before {
+ content: "\e191";
+}
+.glyphicon-sound-6-1:before {
+ content: "\e192";
+}
+.glyphicon-sound-7-1:before {
+ content: "\e193";
+}
+.glyphicon-copyright-mark:before {
+ content: "\e194";
+}
+.glyphicon-registration-mark:before {
+ content: "\e195";
+}
+.glyphicon-cloud-download:before {
+ content: "\e197";
+}
+.glyphicon-cloud-upload:before {
+ content: "\e198";
+}
+.glyphicon-tree-conifer:before {
+ content: "\e199";
+}
+.glyphicon-tree-deciduous:before {
+ content: "\e200";
+}
+.glyphicon-cd:before {
+ content: "\e201";
+}
+.glyphicon-save-file:before {
+ content: "\e202";
+}
+.glyphicon-open-file:before {
+ content: "\e203";
+}
+.glyphicon-level-up:before {
+ content: "\e204";
+}
+.glyphicon-copy:before {
+ content: "\e205";
+}
+.glyphicon-paste:before {
+ content: "\e206";
+}
+.glyphicon-alert:before {
+ content: "\e209";
+}
+.glyphicon-equalizer:before {
+ content: "\e210";
+}
+.glyphicon-king:before {
+ content: "\e211";
+}
+.glyphicon-queen:before {
+ content: "\e212";
+}
+.glyphicon-pawn:before {
+ content: "\e213";
+}
+.glyphicon-bishop:before {
+ content: "\e214";
+}
+.glyphicon-knight:before {
+ content: "\e215";
+}
+.glyphicon-baby-formula:before {
+ content: "\e216";
+}
+.glyphicon-tent:before {
+ content: "\26fa";
+}
+.glyphicon-blackboard:before {
+ content: "\e218";
+}
+.glyphicon-bed:before {
+ content: "\e219";
+}
+.glyphicon-apple:before {
+ content: "\f8ff";
+}
+.glyphicon-erase:before {
+ content: "\e221";
+}
+.glyphicon-hourglass:before {
+ content: "\231b";
+}
+.glyphicon-lamp:before {
+ content: "\e223";
+}
+.glyphicon-duplicate:before {
+ content: "\e224";
+}
+.glyphicon-piggy-bank:before {
+ content: "\e225";
+}
+.glyphicon-scissors:before {
+ content: "\e226";
+}
+.glyphicon-bitcoin:before {
+ content: "\e227";
+}
+.glyphicon-btc:before {
+ content: "\e227";
+}
+.glyphicon-xbt:before {
+ content: "\e227";
+}
+.glyphicon-yen:before {
+ content: "\00a5";
+}
+.glyphicon-jpy:before {
+ content: "\00a5";
+}
+.glyphicon-ruble:before {
+ content: "\20bd";
+}
+.glyphicon-rub:before {
+ content: "\20bd";
+}
+.glyphicon-scale:before {
+ content: "\e230";
+}
+.glyphicon-ice-lolly:before {
+ content: "\e231";
+}
+.glyphicon-ice-lolly-tasted:before {
+ content: "\e232";
+}
+.glyphicon-education:before {
+ content: "\e233";
+}
+.glyphicon-option-horizontal:before {
+ content: "\e234";
+}
+.glyphicon-option-vertical:before {
+ content: "\e235";
+}
+.glyphicon-menu-hamburger:before {
+ content: "\e236";
+}
+.glyphicon-modal-window:before {
+ content: "\e237";
+}
+.glyphicon-oil:before {
+ content: "\e238";
+}
+.glyphicon-grain:before {
+ content: "\e239";
+}
+.glyphicon-sunglasses:before {
+ content: "\e240";
+}
+.glyphicon-text-size:before {
+ content: "\e241";
+}
+.glyphicon-text-color:before {
+ content: "\e242";
+}
+.glyphicon-text-background:before {
+ content: "\e243";
+}
+.glyphicon-object-align-top:before {
+ content: "\e244";
+}
+.glyphicon-object-align-bottom:before {
+ content: "\e245";
+}
+.glyphicon-object-align-horizontal:before {
+ content: "\e246";
+}
+.glyphicon-object-align-left:before {
+ content: "\e247";
+}
+.glyphicon-object-align-vertical:before {
+ content: "\e248";
+}
+.glyphicon-object-align-right:before {
+ content: "\e249";
+}
+.glyphicon-triangle-right:before {
+ content: "\e250";
+}
+.glyphicon-triangle-left:before {
+ content: "\e251";
+}
+.glyphicon-triangle-bottom:before {
+ content: "\e252";
+}
+.glyphicon-triangle-top:before {
+ content: "\e253";
+}
+.glyphicon-console:before {
+ content: "\e254";
+}
+.glyphicon-superscript:before {
+ content: "\e255";
+}
+.glyphicon-subscript:before {
+ content: "\e256";
+}
+.glyphicon-menu-left:before {
+ content: "\e257";
+}
+.glyphicon-menu-right:before {
+ content: "\e258";
+}
+.glyphicon-menu-down:before {
+ content: "\e259";
+}
+.glyphicon-menu-up:before {
+ content: "\e260";
+}
+* {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+*:before,
+*:after {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+html {
+ font-size: 10px;
+
+ -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+body {
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 14px;
+ line-height: 1.42857143;
+ color: #333;
+ background-color: #fff;
+}
+input,
+button,
+select,
+textarea {
+ font-family: inherit;
+ font-size: inherit;
+ line-height: inherit;
+}
+a {
+ color: #337ab7;
+ text-decoration: none;
+}
+a:hover,
+a:focus {
+ color: #23527c;
+ text-decoration: underline;
+}
+a:focus {
+ outline: thin dotted;
+ outline: 5px auto -webkit-focus-ring-color;
+ outline-offset: -2px;
+}
+figure {
+ margin: 0;
+}
+img {
+ vertical-align: middle;
+}
+.img-responsive,
+.thumbnail > img,
+.thumbnail a > img,
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
+ display: block;
+ max-width: 100%;
+ height: auto;
+}
+.img-rounded {
+ border-radius: 6px;
+}
+.img-thumbnail {
+ display: inline-block;
+ max-width: 100%;
+ height: auto;
+ padding: 4px;
+ line-height: 1.42857143;
+ background-color: #fff;
+ border: 1px solid #ddd;
+ border-radius: 4px;
+ -webkit-transition: all .2s ease-in-out;
+ -o-transition: all .2s ease-in-out;
+ transition: all .2s ease-in-out;
+}
+.img-circle {
+ border-radius: 50%;
+}
+hr {
+ margin-top: 20px;
+ margin-bottom: 20px;
+ border: 0;
+ border-top: 1px solid #eee;
+}
+.sr-only {
+ position: absolute;
+ width: 1px;
+ height: 1px;
+ padding: 0;
+ margin: -1px;
+ overflow: hidden;
+ clip: rect(0, 0, 0, 0);
+ border: 0;
+}
+.sr-only-focusable:active,
+.sr-only-focusable:focus {
+ position: static;
+ width: auto;
+ height: auto;
+ margin: 0;
+ overflow: visible;
+ clip: auto;
+}
+[role="button"] {
+ cursor: pointer;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+.h1,
+.h2,
+.h3,
+.h4,
+.h5,
+.h6 {
+ font-family: inherit;
+ font-weight: 500;
+ line-height: 1.1;
+ color: inherit;
+}
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small,
+.h1 small,
+.h2 small,
+.h3 small,
+.h4 small,
+.h5 small,
+.h6 small,
+h1 .small,
+h2 .small,
+h3 .small,
+h4 .small,
+h5 .small,
+h6 .small,
+.h1 .small,
+.h2 .small,
+.h3 .small,
+.h4 .small,
+.h5 .small,
+.h6 .small {
+ font-weight: normal;
+ line-height: 1;
+ color: #777;
+}
+h1,
+.h1,
+h2,
+.h2,
+h3,
+.h3 {
+ margin-top: 20px;
+ margin-bottom: 10px;
+}
+h1 small,
+.h1 small,
+h2 small,
+.h2 small,
+h3 small,
+.h3 small,
+h1 .small,
+.h1 .small,
+h2 .small,
+.h2 .small,
+h3 .small,
+.h3 .small {
+ font-size: 65%;
+}
+h4,
+.h4,
+h5,
+.h5,
+h6,
+.h6 {
+ margin-top: 10px;
+ margin-bottom: 10px;
+}
+h4 small,
+.h4 small,
+h5 small,
+.h5 small,
+h6 small,
+.h6 small,
+h4 .small,
+.h4 .small,
+h5 .small,
+.h5 .small,
+h6 .small,
+.h6 .small {
+ font-size: 75%;
+}
+h1,
+.h1 {
+ font-size: 36px;
+}
+h2,
+.h2 {
+ font-size: 30px;
+}
+h3,
+.h3 {
+ font-size: 24px;
+}
+h4,
+.h4 {
+ font-size: 18px;
+}
+h5,
+.h5 {
+ font-size: 14px;
+}
+h6,
+.h6 {
+ font-size: 12px;
+}
+p {
+ margin: 0 0 10px;
+}
+.lead {
+ margin-bottom: 20px;
+ font-size: 16px;
+ font-weight: 300;
+ line-height: 1.4;
+}
+@media (min-width: 768px) {
+ .lead {
+ font-size: 21px;
+ }
+}
+small,
+.small {
+ font-size: 85%;
+}
+mark,
+.mark {
+ padding: .2em;
+ background-color: #fcf8e3;
+}
+.text-left {
+ text-align: left;
+}
+.text-right {
+ text-align: right;
+}
+.text-center {
+ text-align: center;
+}
+.text-justify {
+ text-align: justify;
+}
+.text-nowrap {
+ white-space: nowrap;
+}
+.text-lowercase {
+ text-transform: lowercase;
+}
+.text-uppercase {
+ text-transform: uppercase;
+}
+.text-capitalize {
+ text-transform: capitalize;
+}
+.text-muted {
+ color: #777;
+}
+.text-primary {
+ color: #337ab7;
+}
+a.text-primary:hover,
+a.text-primary:focus {
+ color: #286090;
+}
+.text-success {
+ color: #3c763d;
+}
+a.text-success:hover,
+a.text-success:focus {
+ color: #2b542c;
+}
+.text-info {
+ color: #31708f;
+}
+a.text-info:hover,
+a.text-info:focus {
+ color: #245269;
+}
+.text-warning {
+ color: #8a6d3b;
+}
+a.text-warning:hover,
+a.text-warning:focus {
+ color: #66512c;
+}
+.text-danger {
+ color: #a94442;
+}
+a.text-danger:hover,
+a.text-danger:focus {
+ color: #843534;
+}
+.bg-primary {
+ color: #fff;
+ background-color: #337ab7;
+}
+a.bg-primary:hover,
+a.bg-primary:focus {
+ background-color: #286090;
+}
+.bg-success {
+ background-color: #dff0d8;
+}
+a.bg-success:hover,
+a.bg-success:focus {
+ background-color: #c1e2b3;
+}
+.bg-info {
+ background-color: #d9edf7;
+}
+a.bg-info:hover,
+a.bg-info:focus {
+ background-color: #afd9ee;
+}
+.bg-warning {
+ background-color: #fcf8e3;
+}
+a.bg-warning:hover,
+a.bg-warning:focus {
+ background-color: #f7ecb5;
+}
+.bg-danger {
+ background-color: #f2dede;
+}
+a.bg-danger:hover,
+a.bg-danger:focus {
+ background-color: #e4b9b9;
+}
+.page-header {
+ padding-bottom: 9px;
+ margin: 40px 0 20px;
+ border-bottom: 1px solid #eee;
+}
+ul,
+ol {
+ margin-top: 0;
+ margin-bottom: 10px;
+}
+ul ul,
+ol ul,
+ul ol,
+ol ol {
+ margin-bottom: 0;
+}
+.list-unstyled {
+ padding-left: 0;
+ list-style: none;
+}
+.list-inline {
+ padding-left: 0;
+ margin-left: -5px;
+ list-style: none;
+}
+.list-inline > li {
+ display: inline-block;
+ padding-right: 5px;
+ padding-left: 5px;
+}
+dl {
+ margin-top: 0;
+ margin-bottom: 20px;
+}
+dt,
+dd {
+ line-height: 1.42857143;
+}
+dt {
+ font-weight: bold;
+}
+dd {
+ margin-left: 0;
+}
+@media (min-width: 768px) {
+ .dl-horizontal dt {
+ float: left;
+ width: 160px;
+ overflow: hidden;
+ clear: left;
+ text-align: right;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+ .dl-horizontal dd {
+ margin-left: 180px;
+ }
+}
+abbr[title],
+abbr[data-original-title] {
+ cursor: help;
+ border-bottom: 1px dotted #777;
+}
+.initialism {
+ font-size: 90%;
+ text-transform: uppercase;
+}
+blockquote {
+ padding: 10px 20px;
+ margin: 0 0 20px;
+ font-size: 17.5px;
+ border-left: 5px solid #eee;
+}
+blockquote p:last-child,
+blockquote ul:last-child,
+blockquote ol:last-child {
+ margin-bottom: 0;
+}
+blockquote footer,
+blockquote small,
+blockquote .small {
+ display: block;
+ font-size: 80%;
+ line-height: 1.42857143;
+ color: #777;
+}
+blockquote footer:before,
+blockquote small:before,
+blockquote .small:before {
+ content: '\2014 \00A0';
+}
+.blockquote-reverse,
+blockquote.pull-right {
+ padding-right: 15px;
+ padding-left: 0;
+ text-align: right;
+ border-right: 5px solid #eee;
+ border-left: 0;
+}
+.blockquote-reverse footer:before,
+blockquote.pull-right footer:before,
+.blockquote-reverse small:before,
+blockquote.pull-right small:before,
+.blockquote-reverse .small:before,
+blockquote.pull-right .small:before {
+ content: '';
+}
+.blockquote-reverse footer:after,
+blockquote.pull-right footer:after,
+.blockquote-reverse small:after,
+blockquote.pull-right small:after,
+.blockquote-reverse .small:after,
+blockquote.pull-right .small:after {
+ content: '\00A0 \2014';
+}
+address {
+ margin-bottom: 20px;
+ font-style: normal;
+ line-height: 1.42857143;
+}
+code,
+kbd,
+pre,
+samp {
+ font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+}
+code {
+ padding: 2px 4px;
+ font-size: 90%;
+ color: #c7254e;
+ background-color: #f9f2f4;
+ border-radius: 4px;
+}
+kbd {
+ padding: 2px 4px;
+ font-size: 90%;
+ color: #fff;
+ background-color: #333;
+ border-radius: 3px;
+ -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);
+ box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);
+}
+kbd kbd {
+ padding: 0;
+ font-size: 100%;
+ font-weight: bold;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+pre {
+ display: block;
+ padding: 9.5px;
+ margin: 0 0 10px;
+ font-size: 13px;
+ line-height: 1.42857143;
+ color: #333;
+ word-break: break-all;
+ word-wrap: break-word;
+ background-color: #f5f5f5;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+}
+pre code {
+ padding: 0;
+ font-size: inherit;
+ color: inherit;
+ white-space: pre-wrap;
+ background-color: transparent;
+ border-radius: 0;
+}
+.pre-scrollable {
+ max-height: 340px;
+ overflow-y: scroll;
+}
+.container {
+ padding-right: 15px;
+ padding-left: 15px;
+ margin-right: auto;
+ margin-left: auto;
+}
+@media (min-width: 768px) {
+ .container {
+ width: 750px;
+ }
+}
+@media (min-width: 992px) {
+ .container {
+ width: 970px;
+ }
+}
+@media (min-width: 1200px) {
+ .container {
+ width: 1170px;
+ }
+}
+.container-fluid {
+ padding-right: 15px;
+ padding-left: 15px;
+ margin-right: auto;
+ margin-left: auto;
+}
+.row {
+ margin-right: -15px;
+ margin-left: -15px;
+}
+.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
+ position: relative;
+ min-height: 1px;
+ padding-right: 15px;
+ padding-left: 15px;
+}
+.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 {
+ float: left;
+}
+.col-xs-12 {
+ width: 100%;
+}
+.col-xs-11 {
+ width: 91.66666667%;
+}
+.col-xs-10 {
+ width: 83.33333333%;
+}
+.col-xs-9 {
+ width: 75%;
+}
+.col-xs-8 {
+ width: 66.66666667%;
+}
+.col-xs-7 {
+ width: 58.33333333%;
+}
+.col-xs-6 {
+ width: 50%;
+}
+.col-xs-5 {
+ width: 41.66666667%;
+}
+.col-xs-4 {
+ width: 33.33333333%;
+}
+.col-xs-3 {
+ width: 25%;
+}
+.col-xs-2 {
+ width: 16.66666667%;
+}
+.col-xs-1 {
+ width: 8.33333333%;
+}
+.col-xs-pull-12 {
+ right: 100%;
+}
+.col-xs-pull-11 {
+ right: 91.66666667%;
+}
+.col-xs-pull-10 {
+ right: 83.33333333%;
+}
+.col-xs-pull-9 {
+ right: 75%;
+}
+.col-xs-pull-8 {
+ right: 66.66666667%;
+}
+.col-xs-pull-7 {
+ right: 58.33333333%;
+}
+.col-xs-pull-6 {
+ right: 50%;
+}
+.col-xs-pull-5 {
+ right: 41.66666667%;
+}
+.col-xs-pull-4 {
+ right: 33.33333333%;
+}
+.col-xs-pull-3 {
+ right: 25%;
+}
+.col-xs-pull-2 {
+ right: 16.66666667%;
+}
+.col-xs-pull-1 {
+ right: 8.33333333%;
+}
+.col-xs-pull-0 {
+ right: auto;
+}
+.col-xs-push-12 {
+ left: 100%;
+}
+.col-xs-push-11 {
+ left: 91.66666667%;
+}
+.col-xs-push-10 {
+ left: 83.33333333%;
+}
+.col-xs-push-9 {
+ left: 75%;
+}
+.col-xs-push-8 {
+ left: 66.66666667%;
+}
+.col-xs-push-7 {
+ left: 58.33333333%;
+}
+.col-xs-push-6 {
+ left: 50%;
+}
+.col-xs-push-5 {
+ left: 41.66666667%;
+}
+.col-xs-push-4 {
+ left: 33.33333333%;
+}
+.col-xs-push-3 {
+ left: 25%;
+}
+.col-xs-push-2 {
+ left: 16.66666667%;
+}
+.col-xs-push-1 {
+ left: 8.33333333%;
+}
+.col-xs-push-0 {
+ left: auto;
+}
+.col-xs-offset-12 {
+ margin-left: 100%;
+}
+.col-xs-offset-11 {
+ margin-left: 91.66666667%;
+}
+.col-xs-offset-10 {
+ margin-left: 83.33333333%;
+}
+.col-xs-offset-9 {
+ margin-left: 75%;
+}
+.col-xs-offset-8 {
+ margin-left: 66.66666667%;
+}
+.col-xs-offset-7 {
+ margin-left: 58.33333333%;
+}
+.col-xs-offset-6 {
+ margin-left: 50%;
+}
+.col-xs-offset-5 {
+ margin-left: 41.66666667%;
+}
+.col-xs-offset-4 {
+ margin-left: 33.33333333%;
+}
+.col-xs-offset-3 {
+ margin-left: 25%;
+}
+.col-xs-offset-2 {
+ margin-left: 16.66666667%;
+}
+.col-xs-offset-1 {
+ margin-left: 8.33333333%;
+}
+.col-xs-offset-0 {
+ margin-left: 0;
+}
+@media (min-width: 768px) {
+ .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
+ float: left;
+ }
+ .col-sm-12 {
+ width: 100%;
+ }
+ .col-sm-11 {
+ width: 91.66666667%;
+ }
+ .col-sm-10 {
+ width: 83.33333333%;
+ }
+ .col-sm-9 {
+ width: 75%;
+ }
+ .col-sm-8 {
+ width: 66.66666667%;
+ }
+ .col-sm-7 {
+ width: 58.33333333%;
+ }
+ .col-sm-6 {
+ width: 50%;
+ }
+ .col-sm-5 {
+ width: 41.66666667%;
+ }
+ .col-sm-4 {
+ width: 33.33333333%;
+ }
+ .col-sm-3 {
+ width: 25%;
+ }
+ .col-sm-2 {
+ width: 16.66666667%;
+ }
+ .col-sm-1 {
+ width: 8.33333333%;
+ }
+ .col-sm-pull-12 {
+ right: 100%;
+ }
+ .col-sm-pull-11 {
+ right: 91.66666667%;
+ }
+ .col-sm-pull-10 {
+ right: 83.33333333%;
+ }
+ .col-sm-pull-9 {
+ right: 75%;
+ }
+ .col-sm-pull-8 {
+ right: 66.66666667%;
+ }
+ .col-sm-pull-7 {
+ right: 58.33333333%;
+ }
+ .col-sm-pull-6 {
+ right: 50%;
+ }
+ .col-sm-pull-5 {
+ right: 41.66666667%;
+ }
+ .col-sm-pull-4 {
+ right: 33.33333333%;
+ }
+ .col-sm-pull-3 {
+ right: 25%;
+ }
+ .col-sm-pull-2 {
+ right: 16.66666667%;
+ }
+ .col-sm-pull-1 {
+ right: 8.33333333%;
+ }
+ .col-sm-pull-0 {
+ right: auto;
+ }
+ .col-sm-push-12 {
+ left: 100%;
+ }
+ .col-sm-push-11 {
+ left: 91.66666667%;
+ }
+ .col-sm-push-10 {
+ left: 83.33333333%;
+ }
+ .col-sm-push-9 {
+ left: 75%;
+ }
+ .col-sm-push-8 {
+ left: 66.66666667%;
+ }
+ .col-sm-push-7 {
+ left: 58.33333333%;
+ }
+ .col-sm-push-6 {
+ left: 50%;
+ }
+ .col-sm-push-5 {
+ left: 41.66666667%;
+ }
+ .col-sm-push-4 {
+ left: 33.33333333%;
+ }
+ .col-sm-push-3 {
+ left: 25%;
+ }
+ .col-sm-push-2 {
+ left: 16.66666667%;
+ }
+ .col-sm-push-1 {
+ left: 8.33333333%;
+ }
+ .col-sm-push-0 {
+ left: auto;
+ }
+ .col-sm-offset-12 {
+ margin-left: 100%;
+ }
+ .col-sm-offset-11 {
+ margin-left: 91.66666667%;
+ }
+ .col-sm-offset-10 {
+ margin-left: 83.33333333%;
+ }
+ .col-sm-offset-9 {
+ margin-left: 75%;
+ }
+ .col-sm-offset-8 {
+ margin-left: 66.66666667%;
+ }
+ .col-sm-offset-7 {
+ margin-left: 58.33333333%;
+ }
+ .col-sm-offset-6 {
+ margin-left: 50%;
+ }
+ .col-sm-offset-5 {
+ margin-left: 41.66666667%;
+ }
+ .col-sm-offset-4 {
+ margin-left: 33.33333333%;
+ }
+ .col-sm-offset-3 {
+ margin-left: 25%;
+ }
+ .col-sm-offset-2 {
+ margin-left: 16.66666667%;
+ }
+ .col-sm-offset-1 {
+ margin-left: 8.33333333%;
+ }
+ .col-sm-offset-0 {
+ margin-left: 0;
+ }
+}
+@media (min-width: 992px) {
+ .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
+ float: left;
+ }
+ .col-md-12 {
+ width: 100%;
+ }
+ .col-md-11 {
+ width: 91.66666667%;
+ }
+ .col-md-10 {
+ width: 83.33333333%;
+ }
+ .col-md-9 {
+ width: 75%;
+ }
+ .col-md-8 {
+ width: 66.66666667%;
+ }
+ .col-md-7 {
+ width: 58.33333333%;
+ }
+ .col-md-6 {
+ width: 50%;
+ }
+ .col-md-5 {
+ width: 41.66666667%;
+ }
+ .col-md-4 {
+ width: 33.33333333%;
+ }
+ .col-md-3 {
+ width: 25%;
+ }
+ .col-md-2 {
+ width: 16.66666667%;
+ }
+ .col-md-1 {
+ width: 8.33333333%;
+ }
+ .col-md-pull-12 {
+ right: 100%;
+ }
+ .col-md-pull-11 {
+ right: 91.66666667%;
+ }
+ .col-md-pull-10 {
+ right: 83.33333333%;
+ }
+ .col-md-pull-9 {
+ right: 75%;
+ }
+ .col-md-pull-8 {
+ right: 66.66666667%;
+ }
+ .col-md-pull-7 {
+ right: 58.33333333%;
+ }
+ .col-md-pull-6 {
+ right: 50%;
+ }
+ .col-md-pull-5 {
+ right: 41.66666667%;
+ }
+ .col-md-pull-4 {
+ right: 33.33333333%;
+ }
+ .col-md-pull-3 {
+ right: 25%;
+ }
+ .col-md-pull-2 {
+ right: 16.66666667%;
+ }
+ .col-md-pull-1 {
+ right: 8.33333333%;
+ }
+ .col-md-pull-0 {
+ right: auto;
+ }
+ .col-md-push-12 {
+ left: 100%;
+ }
+ .col-md-push-11 {
+ left: 91.66666667%;
+ }
+ .col-md-push-10 {
+ left: 83.33333333%;
+ }
+ .col-md-push-9 {
+ left: 75%;
+ }
+ .col-md-push-8 {
+ left: 66.66666667%;
+ }
+ .col-md-push-7 {
+ left: 58.33333333%;
+ }
+ .col-md-push-6 {
+ left: 50%;
+ }
+ .col-md-push-5 {
+ left: 41.66666667%;
+ }
+ .col-md-push-4 {
+ left: 33.33333333%;
+ }
+ .col-md-push-3 {
+ left: 25%;
+ }
+ .col-md-push-2 {
+ left: 16.66666667%;
+ }
+ .col-md-push-1 {
+ left: 8.33333333%;
+ }
+ .col-md-push-0 {
+ left: auto;
+ }
+ .col-md-offset-12 {
+ margin-left: 100%;
+ }
+ .col-md-offset-11 {
+ margin-left: 91.66666667%;
+ }
+ .col-md-offset-10 {
+ margin-left: 83.33333333%;
+ }
+ .col-md-offset-9 {
+ margin-left: 75%;
+ }
+ .col-md-offset-8 {
+ margin-left: 66.66666667%;
+ }
+ .col-md-offset-7 {
+ margin-left: 58.33333333%;
+ }
+ .col-md-offset-6 {
+ margin-left: 50%;
+ }
+ .col-md-offset-5 {
+ margin-left: 41.66666667%;
+ }
+ .col-md-offset-4 {
+ margin-left: 33.33333333%;
+ }
+ .col-md-offset-3 {
+ margin-left: 25%;
+ }
+ .col-md-offset-2 {
+ margin-left: 16.66666667%;
+ }
+ .col-md-offset-1 {
+ margin-left: 8.33333333%;
+ }
+ .col-md-offset-0 {
+ margin-left: 0;
+ }
+}
+@media (min-width: 1200px) {
+ .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {
+ float: left;
+ }
+ .col-lg-12 {
+ width: 100%;
+ }
+ .col-lg-11 {
+ width: 91.66666667%;
+ }
+ .col-lg-10 {
+ width: 83.33333333%;
+ }
+ .col-lg-9 {
+ width: 75%;
+ }
+ .col-lg-8 {
+ width: 66.66666667%;
+ }
+ .col-lg-7 {
+ width: 58.33333333%;
+ }
+ .col-lg-6 {
+ width: 50%;
+ }
+ .col-lg-5 {
+ width: 41.66666667%;
+ }
+ .col-lg-4 {
+ width: 33.33333333%;
+ }
+ .col-lg-3 {
+ width: 25%;
+ }
+ .col-lg-2 {
+ width: 16.66666667%;
+ }
+ .col-lg-1 {
+ width: 8.33333333%;
+ }
+ .col-lg-pull-12 {
+ right: 100%;
+ }
+ .col-lg-pull-11 {
+ right: 91.66666667%;
+ }
+ .col-lg-pull-10 {
+ right: 83.33333333%;
+ }
+ .col-lg-pull-9 {
+ right: 75%;
+ }
+ .col-lg-pull-8 {
+ right: 66.66666667%;
+ }
+ .col-lg-pull-7 {
+ right: 58.33333333%;
+ }
+ .col-lg-pull-6 {
+ right: 50%;
+ }
+ .col-lg-pull-5 {
+ right: 41.66666667%;
+ }
+ .col-lg-pull-4 {
+ right: 33.33333333%;
+ }
+ .col-lg-pull-3 {
+ right: 25%;
+ }
+ .col-lg-pull-2 {
+ right: 16.66666667%;
+ }
+ .col-lg-pull-1 {
+ right: 8.33333333%;
+ }
+ .col-lg-pull-0 {
+ right: auto;
+ }
+ .col-lg-push-12 {
+ left: 100%;
+ }
+ .col-lg-push-11 {
+ left: 91.66666667%;
+ }
+ .col-lg-push-10 {
+ left: 83.33333333%;
+ }
+ .col-lg-push-9 {
+ left: 75%;
+ }
+ .col-lg-push-8 {
+ left: 66.66666667%;
+ }
+ .col-lg-push-7 {
+ left: 58.33333333%;
+ }
+ .col-lg-push-6 {
+ left: 50%;
+ }
+ .col-lg-push-5 {
+ left: 41.66666667%;
+ }
+ .col-lg-push-4 {
+ left: 33.33333333%;
+ }
+ .col-lg-push-3 {
+ left: 25%;
+ }
+ .col-lg-push-2 {
+ left: 16.66666667%;
+ }
+ .col-lg-push-1 {
+ left: 8.33333333%;
+ }
+ .col-lg-push-0 {
+ left: auto;
+ }
+ .col-lg-offset-12 {
+ margin-left: 100%;
+ }
+ .col-lg-offset-11 {
+ margin-left: 91.66666667%;
+ }
+ .col-lg-offset-10 {
+ margin-left: 83.33333333%;
+ }
+ .col-lg-offset-9 {
+ margin-left: 75%;
+ }
+ .col-lg-offset-8 {
+ margin-left: 66.66666667%;
+ }
+ .col-lg-offset-7 {
+ margin-left: 58.33333333%;
+ }
+ .col-lg-offset-6 {
+ margin-left: 50%;
+ }
+ .col-lg-offset-5 {
+ margin-left: 41.66666667%;
+ }
+ .col-lg-offset-4 {
+ margin-left: 33.33333333%;
+ }
+ .col-lg-offset-3 {
+ margin-left: 25%;
+ }
+ .col-lg-offset-2 {
+ margin-left: 16.66666667%;
+ }
+ .col-lg-offset-1 {
+ margin-left: 8.33333333%;
+ }
+ .col-lg-offset-0 {
+ margin-left: 0;
+ }
+}
+table {
+ background-color: transparent;
+}
+caption {
+ padding-top: 8px;
+ padding-bottom: 8px;
+ color: #777;
+ text-align: left;
+}
+th {
+ text-align: left;
+}
+.table {
+ width: 100%;
+ max-width: 100%;
+ margin-bottom: 20px;
+}
+.table > thead > tr > th,
+.table > tbody > tr > th,
+.table > tfoot > tr > th,
+.table > thead > tr > td,
+.table > tbody > tr > td,
+.table > tfoot > tr > td {
+ padding: 8px;
+ line-height: 1.42857143;
+ vertical-align: top;
+ border-top: 1px solid #ddd;
+}
+.table > thead > tr > th {
+ vertical-align: bottom;
+ border-bottom: 2px solid #ddd;
+}
+.table > caption + thead > tr:first-child > th,
+.table > colgroup + thead > tr:first-child > th,
+.table > thead:first-child > tr:first-child > th,
+.table > caption + thead > tr:first-child > td,
+.table > colgroup + thead > tr:first-child > td,
+.table > thead:first-child > tr:first-child > td {
+ border-top: 0;
+}
+.table > tbody + tbody {
+ border-top: 2px solid #ddd;
+}
+.table .table {
+ background-color: #fff;
+}
+.table-condensed > thead > tr > th,
+.table-condensed > tbody > tr > th,
+.table-condensed > tfoot > tr > th,
+.table-condensed > thead > tr > td,
+.table-condensed > tbody > tr > td,
+.table-condensed > tfoot > tr > td {
+ padding: 5px;
+}
+.table-bordered {
+ border: 1px solid #ddd;
+}
+.table-bordered > thead > tr > th,
+.table-bordered > tbody > tr > th,
+.table-bordered > tfoot > tr > th,
+.table-bordered > thead > tr > td,
+.table-bordered > tbody > tr > td,
+.table-bordered > tfoot > tr > td {
+ border: 1px solid #ddd;
+}
+.table-bordered > thead > tr > th,
+.table-bordered > thead > tr > td {
+ border-bottom-width: 2px;
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+ background-color: #f9f9f9;
+}
+.table-hover > tbody > tr:hover {
+ background-color: #f5f5f5;
+}
+table col[class*="col-"] {
+ position: static;
+ display: table-column;
+ float: none;
+}
+table td[class*="col-"],
+table th[class*="col-"] {
+ position: static;
+ display: table-cell;
+ float: none;
+}
+.table > thead > tr > td.active,
+.table > tbody > tr > td.active,
+.table > tfoot > tr > td.active,
+.table > thead > tr > th.active,
+.table > tbody > tr > th.active,
+.table > tfoot > tr > th.active,
+.table > thead > tr.active > td,
+.table > tbody > tr.active > td,
+.table > tfoot > tr.active > td,
+.table > thead > tr.active > th,
+.table > tbody > tr.active > th,
+.table > tfoot > tr.active > th {
+ background-color: #f5f5f5;
+}
+.table-hover > tbody > tr > td.active:hover,
+.table-hover > tbody > tr > th.active:hover,
+.table-hover > tbody > tr.active:hover > td,
+.table-hover > tbody > tr:hover > .active,
+.table-hover > tbody > tr.active:hover > th {
+ background-color: #e8e8e8;
+}
+.table > thead > tr > td.success,
+.table > tbody > tr > td.success,
+.table > tfoot > tr > td.success,
+.table > thead > tr > th.success,
+.table > tbody > tr > th.success,
+.table > tfoot > tr > th.success,
+.table > thead > tr.success > td,
+.table > tbody > tr.success > td,
+.table > tfoot > tr.success > td,
+.table > thead > tr.success > th,
+.table > tbody > tr.success > th,
+.table > tfoot > tr.success > th {
+ background-color: #dff0d8;
+}
+.table-hover > tbody > tr > td.success:hover,
+.table-hover > tbody > tr > th.success:hover,
+.table-hover > tbody > tr.success:hover > td,
+.table-hover > tbody > tr:hover > .success,
+.table-hover > tbody > tr.success:hover > th {
+ background-color: #d0e9c6;
+}
+.table > thead > tr > td.info,
+.table > tbody > tr > td.info,
+.table > tfoot > tr > td.info,
+.table > thead > tr > th.info,
+.table > tbody > tr > th.info,
+.table > tfoot > tr > th.info,
+.table > thead > tr.info > td,
+.table > tbody > tr.info > td,
+.table > tfoot > tr.info > td,
+.table > thead > tr.info > th,
+.table > tbody > tr.info > th,
+.table > tfoot > tr.info > th {
+ background-color: #d9edf7;
+}
+.table-hover > tbody > tr > td.info:hover,
+.table-hover > tbody > tr > th.info:hover,
+.table-hover > tbody > tr.info:hover > td,
+.table-hover > tbody > tr:hover > .info,
+.table-hover > tbody > tr.info:hover > th {
+ background-color: #c4e3f3;
+}
+.table > thead > tr > td.warning,
+.table > tbody > tr > td.warning,
+.table > tfoot > tr > td.warning,
+.table > thead > tr > th.warning,
+.table > tbody > tr > th.warning,
+.table > tfoot > tr > th.warning,
+.table > thead > tr.warning > td,
+.table > tbody > tr.warning > td,
+.table > tfoot > tr.warning > td,
+.table > thead > tr.warning > th,
+.table > tbody > tr.warning > th,
+.table > tfoot > tr.warning > th {
+ background-color: #fcf8e3;
+}
+.table-hover > tbody > tr > td.warning:hover,
+.table-hover > tbody > tr > th.warning:hover,
+.table-hover > tbody > tr.warning:hover > td,
+.table-hover > tbody > tr:hover > .warning,
+.table-hover > tbody > tr.warning:hover > th {
+ background-color: #faf2cc;
+}
+.table > thead > tr > td.danger,
+.table > tbody > tr > td.danger,
+.table > tfoot > tr > td.danger,
+.table > thead > tr > th.danger,
+.table > tbody > tr > th.danger,
+.table > tfoot > tr > th.danger,
+.table > thead > tr.danger > td,
+.table > tbody > tr.danger > td,
+.table > tfoot > tr.danger > td,
+.table > thead > tr.danger > th,
+.table > tbody > tr.danger > th,
+.table > tfoot > tr.danger > th {
+ background-color: #f2dede;
+}
+.table-hover > tbody > tr > td.danger:hover,
+.table-hover > tbody > tr > th.danger:hover,
+.table-hover > tbody > tr.danger:hover > td,
+.table-hover > tbody > tr:hover > .danger,
+.table-hover > tbody > tr.danger:hover > th {
+ background-color: #ebcccc;
+}
+.table-responsive {
+ min-height: .01%;
+ overflow-x: auto;
+}
+@media screen and (max-width: 767px) {
+ .table-responsive {
+ width: 100%;
+ margin-bottom: 15px;
+ overflow-y: hidden;
+ -ms-overflow-style: -ms-autohiding-scrollbar;
+ border: 1px solid #ddd;
+ }
+ .table-responsive > .table {
+ margin-bottom: 0;
+ }
+ .table-responsive > .table > thead > tr > th,
+ .table-responsive > .table > tbody > tr > th,
+ .table-responsive > .table > tfoot > tr > th,
+ .table-responsive > .table > thead > tr > td,
+ .table-responsive > .table > tbody > tr > td,
+ .table-responsive > .table > tfoot > tr > td {
+ white-space: nowrap;
+ }
+ .table-responsive > .table-bordered {
+ border: 0;
+ }
+ .table-responsive > .table-bordered > thead > tr > th:first-child,
+ .table-responsive > .table-bordered > tbody > tr > th:first-child,
+ .table-responsive > .table-bordered > tfoot > tr > th:first-child,
+ .table-responsive > .table-bordered > thead > tr > td:first-child,
+ .table-responsive > .table-bordered > tbody > tr > td:first-child,
+ .table-responsive > .table-bordered > tfoot > tr > td:first-child {
+ border-left: 0;
+ }
+ .table-responsive > .table-bordered > thead > tr > th:last-child,
+ .table-responsive > .table-bordered > tbody > tr > th:last-child,
+ .table-responsive > .table-bordered > tfoot > tr > th:last-child,
+ .table-responsive > .table-bordered > thead > tr > td:last-child,
+ .table-responsive > .table-bordered > tbody > tr > td:last-child,
+ .table-responsive > .table-bordered > tfoot > tr > td:last-child {
+ border-right: 0;
+ }
+ .table-responsive > .table-bordered > tbody > tr:last-child > th,
+ .table-responsive > .table-bordered > tfoot > tr:last-child > th,
+ .table-responsive > .table-bordered > tbody > tr:last-child > td,
+ .table-responsive > .table-bordered > tfoot > tr:last-child > td {
+ border-bottom: 0;
+ }
+}
+fieldset {
+ min-width: 0;
+ padding: 0;
+ margin: 0;
+ border: 0;
+}
+legend {
+ display: block;
+ width: 100%;
+ padding: 0;
+ margin-bottom: 20px;
+ font-size: 21px;
+ line-height: inherit;
+ color: #333;
+ border: 0;
+ border-bottom: 1px solid #e5e5e5;
+}
+label {
+ display: inline-block;
+ max-width: 100%;
+ margin-bottom: 5px;
+ font-weight: bold;
+}
+input[type="search"] {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+input[type="radio"],
+input[type="checkbox"] {
+ margin: 4px 0 0;
+ margin-top: 1px \9;
+ line-height: normal;
+}
+input[type="file"] {
+ display: block;
+}
+input[type="range"] {
+ display: block;
+ width: 100%;
+}
+select[multiple],
+select[size] {
+ height: auto;
+}
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+ outline: thin dotted;
+ outline: 5px auto -webkit-focus-ring-color;
+ outline-offset: -2px;
+}
+output {
+ display: block;
+ padding-top: 7px;
+ font-size: 14px;
+ line-height: 1.42857143;
+ color: #555;
+}
+.form-control {
+ display: block;
+ width: 100%;
+ height: 34px;
+ padding: 6px 12px;
+ font-size: 14px;
+ line-height: 1.42857143;
+ color: #555;
+ background-color: #fff;
+ background-image: none;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+ -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
+ -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+ transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+}
+.form-control:focus {
+ border-color: #66afe9;
+ outline: 0;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
+ box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
+}
+.form-control::-moz-placeholder {
+ color: #999;
+ opacity: 1;
+}
+.form-control:-ms-input-placeholder {
+ color: #999;
+}
+.form-control::-webkit-input-placeholder {
+ color: #999;
+}
+.form-control::-ms-expand {
+ background-color: transparent;
+ border: 0;
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+ background-color: #eee;
+ opacity: 1;
+}
+.form-control[disabled],
+fieldset[disabled] .form-control {
+ cursor: not-allowed;
+}
+textarea.form-control {
+ height: auto;
+}
+input[type="search"] {
+ -webkit-appearance: none;
+}
+@media screen and (-webkit-min-device-pixel-ratio: 0) {
+ input[type="date"].form-control,
+ input[type="time"].form-control,
+ input[type="datetime-local"].form-control,
+ input[type="month"].form-control {
+ line-height: 34px;
+ }
+ input[type="date"].input-sm,
+ input[type="time"].input-sm,
+ input[type="datetime-local"].input-sm,
+ input[type="month"].input-sm,
+ .input-group-sm input[type="date"],
+ .input-group-sm input[type="time"],
+ .input-group-sm input[type="datetime-local"],
+ .input-group-sm input[type="month"] {
+ line-height: 30px;
+ }
+ input[type="date"].input-lg,
+ input[type="time"].input-lg,
+ input[type="datetime-local"].input-lg,
+ input[type="month"].input-lg,
+ .input-group-lg input[type="date"],
+ .input-group-lg input[type="time"],
+ .input-group-lg input[type="datetime-local"],
+ .input-group-lg input[type="month"] {
+ line-height: 46px;
+ }
+}
+.form-group {
+ margin-bottom: 15px;
+}
+.radio,
+.checkbox {
+ position: relative;
+ display: block;
+ margin-top: 10px;
+ margin-bottom: 10px;
+}
+.radio label,
+.checkbox label {
+ min-height: 20px;
+ padding-left: 20px;
+ margin-bottom: 0;
+ font-weight: normal;
+ cursor: pointer;
+}
+.radio input[type="radio"],
+.radio-inline input[type="radio"],
+.checkbox input[type="checkbox"],
+.checkbox-inline input[type="checkbox"] {
+ position: absolute;
+ margin-top: 4px \9;
+ margin-left: -20px;
+}
+.radio + .radio,
+.checkbox + .checkbox {
+ margin-top: -5px;
+}
+.radio-inline,
+.checkbox-inline {
+ position: relative;
+ display: inline-block;
+ padding-left: 20px;
+ margin-bottom: 0;
+ font-weight: normal;
+ vertical-align: middle;
+ cursor: pointer;
+}
+.radio-inline + .radio-inline,
+.checkbox-inline + .checkbox-inline {
+ margin-top: 0;
+ margin-left: 10px;
+}
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"].disabled,
+input[type="checkbox"].disabled,
+fieldset[disabled] input[type="radio"],
+fieldset[disabled] input[type="checkbox"] {
+ cursor: not-allowed;
+}
+.radio-inline.disabled,
+.checkbox-inline.disabled,
+fieldset[disabled] .radio-inline,
+fieldset[disabled] .checkbox-inline {
+ cursor: not-allowed;
+}
+.radio.disabled label,
+.checkbox.disabled label,
+fieldset[disabled] .radio label,
+fieldset[disabled] .checkbox label {
+ cursor: not-allowed;
+}
+.form-control-static {
+ min-height: 34px;
+ padding-top: 7px;
+ padding-bottom: 7px;
+ margin-bottom: 0;
+}
+.form-control-static.input-lg,
+.form-control-static.input-sm {
+ padding-right: 0;
+ padding-left: 0;
+}
+.input-sm {
+ height: 30px;
+ padding: 5px 10px;
+ font-size: 12px;
+ line-height: 1.5;
+ border-radius: 3px;
+}
+select.input-sm {
+ height: 30px;
+ line-height: 30px;
+}
+textarea.input-sm,
+select[multiple].input-sm {
+ height: auto;
+}
+.form-group-sm .form-control {
+ height: 30px;
+ padding: 5px 10px;
+ font-size: 12px;
+ line-height: 1.5;
+ border-radius: 3px;
+}
+.form-group-sm select.form-control {
+ height: 30px;
+ line-height: 30px;
+}
+.form-group-sm textarea.form-control,
+.form-group-sm select[multiple].form-control {
+ height: auto;
+}
+.form-group-sm .form-control-static {
+ height: 30px;
+ min-height: 32px;
+ padding: 6px 10px;
+ font-size: 12px;
+ line-height: 1.5;
+}
+.input-lg {
+ height: 46px;
+ padding: 10px 16px;
+ font-size: 18px;
+ line-height: 1.3333333;
+ border-radius: 6px;
+}
+select.input-lg {
+ height: 46px;
+ line-height: 46px;
+}
+textarea.input-lg,
+select[multiple].input-lg {
+ height: auto;
+}
+.form-group-lg .form-control {
+ height: 46px;
+ padding: 10px 16px;
+ font-size: 18px;
+ line-height: 1.3333333;
+ border-radius: 6px;
+}
+.form-group-lg select.form-control {
+ height: 46px;
+ line-height: 46px;
+}
+.form-group-lg textarea.form-control,
+.form-group-lg select[multiple].form-control {
+ height: auto;
+}
+.form-group-lg .form-control-static {
+ height: 46px;
+ min-height: 38px;
+ padding: 11px 16px;
+ font-size: 18px;
+ line-height: 1.3333333;
+}
+.has-feedback {
+ position: relative;
+}
+.has-feedback .form-control {
+ padding-right: 42.5px;
+}
+.form-control-feedback {
+ position: absolute;
+ top: 0;
+ right: 0;
+ z-index: 2;
+ display: block;
+ width: 34px;
+ height: 34px;
+ line-height: 34px;
+ text-align: center;
+ pointer-events: none;
+}
+.input-lg + .form-control-feedback,
+.input-group-lg + .form-control-feedback,
+.form-group-lg .form-control + .form-control-feedback {
+ width: 46px;
+ height: 46px;
+ line-height: 46px;
+}
+.input-sm + .form-control-feedback,
+.input-group-sm + .form-control-feedback,
+.form-group-sm .form-control + .form-control-feedback {
+ width: 30px;
+ height: 30px;
+ line-height: 30px;
+}
+.has-success .help-block,
+.has-success .control-label,
+.has-success .radio,
+.has-success .checkbox,
+.has-success .radio-inline,
+.has-success .checkbox-inline,
+.has-success.radio label,
+.has-success.checkbox label,
+.has-success.radio-inline label,
+.has-success.checkbox-inline label {
+ color: #3c763d;
+}
+.has-success .form-control {
+ border-color: #3c763d;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+}
+.has-success .form-control:focus {
+ border-color: #2b542c;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
+}
+.has-success .input-group-addon {
+ color: #3c763d;
+ background-color: #dff0d8;
+ border-color: #3c763d;
+}
+.has-success .form-control-feedback {
+ color: #3c763d;
+}
+.has-warning .help-block,
+.has-warning .control-label,
+.has-warning .radio,
+.has-warning .checkbox,
+.has-warning .radio-inline,
+.has-warning .checkbox-inline,
+.has-warning.radio label,
+.has-warning.checkbox label,
+.has-warning.radio-inline label,
+.has-warning.checkbox-inline label {
+ color: #8a6d3b;
+}
+.has-warning .form-control {
+ border-color: #8a6d3b;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+}
+.has-warning .form-control:focus {
+ border-color: #66512c;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
+}
+.has-warning .input-group-addon {
+ color: #8a6d3b;
+ background-color: #fcf8e3;
+ border-color: #8a6d3b;
+}
+.has-warning .form-control-feedback {
+ color: #8a6d3b;
+}
+.has-error .help-block,
+.has-error .control-label,
+.has-error .radio,
+.has-error .checkbox,
+.has-error .radio-inline,
+.has-error .checkbox-inline,
+.has-error.radio label,
+.has-error.checkbox label,
+.has-error.radio-inline label,
+.has-error.checkbox-inline label {
+ color: #a94442;
+}
+.has-error .form-control {
+ border-color: #a94442;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+}
+.has-error .form-control:focus {
+ border-color: #843534;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
+}
+.has-error .input-group-addon {
+ color: #a94442;
+ background-color: #f2dede;
+ border-color: #a94442;
+}
+.has-error .form-control-feedback {
+ color: #a94442;
+}
+.has-feedback label ~ .form-control-feedback {
+ top: 25px;
+}
+.has-feedback label.sr-only ~ .form-control-feedback {
+ top: 0;
+}
+.help-block {
+ display: block;
+ margin-top: 5px;
+ margin-bottom: 10px;
+ color: #737373;
+}
+@media (min-width: 768px) {
+ .form-inline .form-group {
+ display: inline-block;
+ margin-bottom: 0;
+ vertical-align: middle;
+ }
+ .form-inline .form-control {
+ display: inline-block;
+ width: auto;
+ vertical-align: middle;
+ }
+ .form-inline .form-control-static {
+ display: inline-block;
+ }
+ .form-inline .input-group {
+ display: inline-table;
+ vertical-align: middle;
+ }
+ .form-inline .input-group .input-group-addon,
+ .form-inline .input-group .input-group-btn,
+ .form-inline .input-group .form-control {
+ width: auto;
+ }
+ .form-inline .input-group > .form-control {
+ width: 100%;
+ }
+ .form-inline .control-label {
+ margin-bottom: 0;
+ vertical-align: middle;
+ }
+ .form-inline .radio,
+ .form-inline .checkbox {
+ display: inline-block;
+ margin-top: 0;
+ margin-bottom: 0;
+ vertical-align: middle;
+ }
+ .form-inline .radio label,
+ .form-inline .checkbox label {
+ padding-left: 0;
+ }
+ .form-inline .radio input[type="radio"],
+ .form-inline .checkbox input[type="checkbox"] {
+ position: relative;
+ margin-left: 0;
+ }
+ .form-inline .has-feedback .form-control-feedback {
+ top: 0;
+ }
+}
+.form-horizontal .radio,
+.form-horizontal .checkbox,
+.form-horizontal .radio-inline,
+.form-horizontal .checkbox-inline {
+ padding-top: 7px;
+ margin-top: 0;
+ margin-bottom: 0;
+}
+.form-horizontal .radio,
+.form-horizontal .checkbox {
+ min-height: 27px;
+}
+.form-horizontal .form-group {
+ margin-right: -15px;
+ margin-left: -15px;
+}
+@media (min-width: 768px) {
+ .form-horizontal .control-label {
+ padding-top: 7px;
+ margin-bottom: 0;
+ text-align: right;
+ }
+}
+.form-horizontal .has-feedback .form-control-feedback {
+ right: 15px;
+}
+@media (min-width: 768px) {
+ .form-horizontal .form-group-lg .control-label {
+ padding-top: 11px;
+ font-size: 18px;
+ }
+}
+@media (min-width: 768px) {
+ .form-horizontal .form-group-sm .control-label {
+ padding-top: 6px;
+ font-size: 12px;
+ }
+}
+.btn {
+ display: inline-block;
+ padding: 6px 12px;
+ margin-bottom: 0;
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 1.42857143;
+ text-align: center;
+ white-space: nowrap;
+ vertical-align: middle;
+ -ms-touch-action: manipulation;
+ touch-action: manipulation;
+ cursor: pointer;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ background-image: none;
+ border: 1px solid transparent;
+ border-radius: 4px;
+}
+.btn:focus,
+.btn:active:focus,
+.btn.active:focus,
+.btn.focus,
+.btn:active.focus,
+.btn.active.focus {
+ outline: thin dotted;
+ outline: 5px auto -webkit-focus-ring-color;
+ outline-offset: -2px;
+}
+.btn:hover,
+.btn:focus,
+.btn.focus {
+ color: #333;
+ text-decoration: none;
+}
+.btn:active,
+.btn.active {
+ background-image: none;
+ outline: 0;
+ -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+ box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+}
+.btn.disabled,
+.btn[disabled],
+fieldset[disabled] .btn {
+ cursor: not-allowed;
+ filter: alpha(opacity=65);
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ opacity: .65;
+}
+a.btn.disabled,
+fieldset[disabled] a.btn {
+ pointer-events: none;
+}
+.btn-default {
+ color: #333;
+ background-color: #fff;
+ border-color: #ccc;
+}
+.btn-default:focus,
+.btn-default.focus {
+ color: #333;
+ background-color: #e6e6e6;
+ border-color: #8c8c8c;
+}
+.btn-default:hover {
+ color: #333;
+ background-color: #e6e6e6;
+ border-color: #adadad;
+}
+.btn-default:active,
+.btn-default.active,
+.open > .dropdown-toggle.btn-default {
+ color: #333;
+ background-color: #e6e6e6;
+ border-color: #adadad;
+}
+.btn-default:active:hover,
+.btn-default.active:hover,
+.open > .dropdown-toggle.btn-default:hover,
+.btn-default:active:focus,
+.btn-default.active:focus,
+.open > .dropdown-toggle.btn-default:focus,
+.btn-default:active.focus,
+.btn-default.active.focus,
+.open > .dropdown-toggle.btn-default.focus {
+ color: #333;
+ background-color: #d4d4d4;
+ border-color: #8c8c8c;
+}
+.btn-default:active,
+.btn-default.active,
+.open > .dropdown-toggle.btn-default {
+ background-image: none;
+}
+.btn-default.disabled:hover,
+.btn-default[disabled]:hover,
+fieldset[disabled] .btn-default:hover,
+.btn-default.disabled:focus,
+.btn-default[disabled]:focus,
+fieldset[disabled] .btn-default:focus,
+.btn-default.disabled.focus,
+.btn-default[disabled].focus,
+fieldset[disabled] .btn-default.focus {
+ background-color: #fff;
+ border-color: #ccc;
+}
+.btn-default .badge {
+ color: #fff;
+ background-color: #333;
+}
+.btn-primary {
+ color: #fff;
+ background-color: #337ab7;
+ border-color: #2e6da4;
+}
+.btn-primary:focus,
+.btn-primary.focus {
+ color: #fff;
+ background-color: #286090;
+ border-color: #122b40;
+}
+.btn-primary:hover {
+ color: #fff;
+ background-color: #286090;
+ border-color: #204d74;
+}
+.btn-primary:active,
+.btn-primary.active,
+.open > .dropdown-toggle.btn-primary {
+ color: #fff;
+ background-color: #286090;
+ border-color: #204d74;
+}
+.btn-primary:active:hover,
+.btn-primary.active:hover,
+.open > .dropdown-toggle.btn-primary:hover,
+.btn-primary:active:focus,
+.btn-primary.active:focus,
+.open > .dropdown-toggle.btn-primary:focus,
+.btn-primary:active.focus,
+.btn-primary.active.focus,
+.open > .dropdown-toggle.btn-primary.focus {
+ color: #fff;
+ background-color: #204d74;
+ border-color: #122b40;
+}
+.btn-primary:active,
+.btn-primary.active,
+.open > .dropdown-toggle.btn-primary {
+ background-image: none;
+}
+.btn-primary.disabled:hover,
+.btn-primary[disabled]:hover,
+fieldset[disabled] .btn-primary:hover,
+.btn-primary.disabled:focus,
+.btn-primary[disabled]:focus,
+fieldset[disabled] .btn-primary:focus,
+.btn-primary.disabled.focus,
+.btn-primary[disabled].focus,
+fieldset[disabled] .btn-primary.focus {
+ background-color: #337ab7;
+ border-color: #2e6da4;
+}
+.btn-primary .badge {
+ color: #337ab7;
+ background-color: #fff;
+}
+.btn-success {
+ color: #fff;
+ background-color: #5cb85c;
+ border-color: #4cae4c;
+}
+.btn-success:focus,
+.btn-success.focus {
+ color: #fff;
+ background-color: #449d44;
+ border-color: #255625;
+}
+.btn-success:hover {
+ color: #fff;
+ background-color: #449d44;
+ border-color: #398439;
+}
+.btn-success:active,
+.btn-success.active,
+.open > .dropdown-toggle.btn-success {
+ color: #fff;
+ background-color: #449d44;
+ border-color: #398439;
+}
+.btn-success:active:hover,
+.btn-success.active:hover,
+.open > .dropdown-toggle.btn-success:hover,
+.btn-success:active:focus,
+.btn-success.active:focus,
+.open > .dropdown-toggle.btn-success:focus,
+.btn-success:active.focus,
+.btn-success.active.focus,
+.open > .dropdown-toggle.btn-success.focus {
+ color: #fff;
+ background-color: #398439;
+ border-color: #255625;
+}
+.btn-success:active,
+.btn-success.active,
+.open > .dropdown-toggle.btn-success {
+ background-image: none;
+}
+.btn-success.disabled:hover,
+.btn-success[disabled]:hover,
+fieldset[disabled] .btn-success:hover,
+.btn-success.disabled:focus,
+.btn-success[disabled]:focus,
+fieldset[disabled] .btn-success:focus,
+.btn-success.disabled.focus,
+.btn-success[disabled].focus,
+fieldset[disabled] .btn-success.focus {
+ background-color: #5cb85c;
+ border-color: #4cae4c;
+}
+.btn-success .badge {
+ color: #5cb85c;
+ background-color: #fff;
+}
+.btn-info {
+ color: #fff;
+ background-color: #5bc0de;
+ border-color: #46b8da;
+}
+.btn-info:focus,
+.btn-info.focus {
+ color: #fff;
+ background-color: #31b0d5;
+ border-color: #1b6d85;
+}
+.btn-info:hover {
+ color: #fff;
+ background-color: #31b0d5;
+ border-color: #269abc;
+}
+.btn-info:active,
+.btn-info.active,
+.open > .dropdown-toggle.btn-info {
+ color: #fff;
+ background-color: #31b0d5;
+ border-color: #269abc;
+}
+.btn-info:active:hover,
+.btn-info.active:hover,
+.open > .dropdown-toggle.btn-info:hover,
+.btn-info:active:focus,
+.btn-info.active:focus,
+.open > .dropdown-toggle.btn-info:focus,
+.btn-info:active.focus,
+.btn-info.active.focus,
+.open > .dropdown-toggle.btn-info.focus {
+ color: #fff;
+ background-color: #269abc;
+ border-color: #1b6d85;
+}
+.btn-info:active,
+.btn-info.active,
+.open > .dropdown-toggle.btn-info {
+ background-image: none;
+}
+.btn-info.disabled:hover,
+.btn-info[disabled]:hover,
+fieldset[disabled] .btn-info:hover,
+.btn-info.disabled:focus,
+.btn-info[disabled]:focus,
+fieldset[disabled] .btn-info:focus,
+.btn-info.disabled.focus,
+.btn-info[disabled].focus,
+fieldset[disabled] .btn-info.focus {
+ background-color: #5bc0de;
+ border-color: #46b8da;
+}
+.btn-info .badge {
+ color: #5bc0de;
+ background-color: #fff;
+}
+.btn-warning {
+ color: #fff;
+ background-color: #f0ad4e;
+ border-color: #eea236;
+}
+.btn-warning:focus,
+.btn-warning.focus {
+ color: #fff;
+ background-color: #ec971f;
+ border-color: #985f0d;
+}
+.btn-warning:hover {
+ color: #fff;
+ background-color: #ec971f;
+ border-color: #d58512;
+}
+.btn-warning:active,
+.btn-warning.active,
+.open > .dropdown-toggle.btn-warning {
+ color: #fff;
+ background-color: #ec971f;
+ border-color: #d58512;
+}
+.btn-warning:active:hover,
+.btn-warning.active:hover,
+.open > .dropdown-toggle.btn-warning:hover,
+.btn-warning:active:focus,
+.btn-warning.active:focus,
+.open > .dropdown-toggle.btn-warning:focus,
+.btn-warning:active.focus,
+.btn-warning.active.focus,
+.open > .dropdown-toggle.btn-warning.focus {
+ color: #fff;
+ background-color: #d58512;
+ border-color: #985f0d;
+}
+.btn-warning:active,
+.btn-warning.active,
+.open > .dropdown-toggle.btn-warning {
+ background-image: none;
+}
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled.focus,
+.btn-warning[disabled].focus,
+fieldset[disabled] .btn-warning.focus {
+ background-color: #f0ad4e;
+ border-color: #eea236;
+}
+.btn-warning .badge {
+ color: #f0ad4e;
+ background-color: #fff;
+}
+.btn-danger {
+ color: #fff;
+ background-color: #d9534f;
+ border-color: #d43f3a;
+}
+.btn-danger:focus,
+.btn-danger.focus {
+ color: #fff;
+ background-color: #c9302c;
+ border-color: #761c19;
+}
+.btn-danger:hover {
+ color: #fff;
+ background-color: #c9302c;
+ border-color: #ac2925;
+}
+.btn-danger:active,
+.btn-danger.active,
+.open > .dropdown-toggle.btn-danger {
+ color: #fff;
+ background-color: #c9302c;
+ border-color: #ac2925;
+}
+.btn-danger:active:hover,
+.btn-danger.active:hover,
+.open > .dropdown-toggle.btn-danger:hover,
+.btn-danger:active:focus,
+.btn-danger.active:focus,
+.open > .dropdown-toggle.btn-danger:focus,
+.btn-danger:active.focus,
+.btn-danger.active.focus,
+.open > .dropdown-toggle.btn-danger.focus {
+ color: #fff;
+ background-color: #ac2925;
+ border-color: #761c19;
+}
+.btn-danger:active,
+.btn-danger.active,
+.open > .dropdown-toggle.btn-danger {
+ background-image: none;
+}
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled.focus,
+.btn-danger[disabled].focus,
+fieldset[disabled] .btn-danger.focus {
+ background-color: #d9534f;
+ border-color: #d43f3a;
+}
+.btn-danger .badge {
+ color: #d9534f;
+ background-color: #fff;
+}
+.btn-link {
+ font-weight: normal;
+ color: #337ab7;
+ border-radius: 0;
+}
+.btn-link,
+.btn-link:active,
+.btn-link.active,
+.btn-link[disabled],
+fieldset[disabled] .btn-link {
+ background-color: transparent;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+.btn-link,
+.btn-link:hover,
+.btn-link:focus,
+.btn-link:active {
+ border-color: transparent;
+}
+.btn-link:hover,
+.btn-link:focus {
+ color: #23527c;
+ text-decoration: underline;
+ background-color: transparent;
+}
+.btn-link[disabled]:hover,
+fieldset[disabled] .btn-link:hover,
+.btn-link[disabled]:focus,
+fieldset[disabled] .btn-link:focus {
+ color: #777;
+ text-decoration: none;
+}
+.btn-lg,
+.btn-group-lg > .btn {
+ padding: 10px 16px;
+ font-size: 18px;
+ line-height: 1.3333333;
+ border-radius: 6px;
+}
+.btn-sm,
+.btn-group-sm > .btn {
+ padding: 5px 10px;
+ font-size: 12px;
+ line-height: 1.5;
+ border-radius: 3px;
+}
+.btn-xs,
+.btn-group-xs > .btn {
+ padding: 1px 5px;
+ font-size: 12px;
+ line-height: 1.5;
+ border-radius: 3px;
+}
+.btn-block {
+ display: block;
+ width: 100%;
+}
+.btn-block + .btn-block {
+ margin-top: 5px;
+}
+input[type="submit"].btn-block,
+input[type="reset"].btn-block,
+input[type="button"].btn-block {
+ width: 100%;
+}
+.fade {
+ opacity: 0;
+ -webkit-transition: opacity .15s linear;
+ -o-transition: opacity .15s linear;
+ transition: opacity .15s linear;
+}
+.fade.in {
+ opacity: 1;
+}
+.collapse {
+ display: none;
+}
+.collapse.in {
+ display: block;
+}
+tr.collapse.in {
+ display: table-row;
+}
+tbody.collapse.in {
+ display: table-row-group;
+}
+.collapsing {
+ position: relative;
+ height: 0;
+ overflow: hidden;
+ -webkit-transition-timing-function: ease;
+ -o-transition-timing-function: ease;
+ transition-timing-function: ease;
+ -webkit-transition-duration: .35s;
+ -o-transition-duration: .35s;
+ transition-duration: .35s;
+ -webkit-transition-property: height, visibility;
+ -o-transition-property: height, visibility;
+ transition-property: height, visibility;
+}
+.caret {
+ display: inline-block;
+ width: 0;
+ height: 0;
+ margin-left: 2px;
+ vertical-align: middle;
+ border-top: 4px dashed;
+ border-top: 4px solid \9;
+ border-right: 4px solid transparent;
+ border-left: 4px solid transparent;
+}
+.dropup,
+.dropdown {
+ position: relative;
+}
+.dropdown-toggle:focus {
+ outline: 0;
+}
+.dropdown-menu {
+ position: absolute;
+ top: 100%;
+ left: 0;
+ z-index: 1000;
+ display: none;
+ float: left;
+ min-width: 160px;
+ padding: 5px 0;
+ margin: 2px 0 0;
+ font-size: 14px;
+ text-align: left;
+ list-style: none;
+ background-color: #fff;
+ -webkit-background-clip: padding-box;
+ background-clip: padding-box;
+ border: 1px solid #ccc;
+ border: 1px solid rgba(0, 0, 0, .15);
+ border-radius: 4px;
+ -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+ box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+}
+.dropdown-menu.pull-right {
+ right: 0;
+ left: auto;
+}
+.dropdown-menu .divider {
+ height: 1px;
+ margin: 9px 0;
+ overflow: hidden;
+ background-color: #e5e5e5;
+}
+.dropdown-menu > li > a {
+ display: block;
+ padding: 3px 20px;
+ clear: both;
+ font-weight: normal;
+ line-height: 1.42857143;
+ color: #333;
+ white-space: nowrap;
+}
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus {
+ color: #262626;
+ text-decoration: none;
+ background-color: #f5f5f5;
+}
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+ color: #fff;
+ text-decoration: none;
+ background-color: #337ab7;
+ outline: 0;
+}
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+ color: #777;
+}
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+ text-decoration: none;
+ cursor: not-allowed;
+ background-color: transparent;
+ background-image: none;
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.open > .dropdown-menu {
+ display: block;
+}
+.open > a {
+ outline: 0;
+}
+.dropdown-menu-right {
+ right: 0;
+ left: auto;
+}
+.dropdown-menu-left {
+ right: auto;
+ left: 0;
+}
+.dropdown-header {
+ display: block;
+ padding: 3px 20px;
+ font-size: 12px;
+ line-height: 1.42857143;
+ color: #777;
+ white-space: nowrap;
+}
+.dropdown-backdrop {
+ position: fixed;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ z-index: 990;
+}
+.pull-right > .dropdown-menu {
+ right: 0;
+ left: auto;
+}
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+ content: "";
+ border-top: 0;
+ border-bottom: 4px dashed;
+ border-bottom: 4px solid \9;
+}
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+ top: auto;
+ bottom: 100%;
+ margin-bottom: 2px;
+}
+@media (min-width: 768px) {
+ .navbar-right .dropdown-menu {
+ right: 0;
+ left: auto;
+ }
+ .navbar-right .dropdown-menu-left {
+ right: auto;
+ left: 0;
+ }
+}
+.btn-group,
+.btn-group-vertical {
+ position: relative;
+ display: inline-block;
+ vertical-align: middle;
+}
+.btn-group > .btn,
+.btn-group-vertical > .btn {
+ position: relative;
+ float: left;
+}
+.btn-group > .btn:hover,
+.btn-group-vertical > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group-vertical > .btn:focus,
+.btn-group > .btn:active,
+.btn-group-vertical > .btn:active,
+.btn-group > .btn.active,
+.btn-group-vertical > .btn.active {
+ z-index: 2;
+}
+.btn-group .btn + .btn,
+.btn-group .btn + .btn-group,
+.btn-group .btn-group + .btn,
+.btn-group .btn-group + .btn-group {
+ margin-left: -1px;
+}
+.btn-toolbar {
+ margin-left: -5px;
+}
+.btn-toolbar .btn,
+.btn-toolbar .btn-group,
+.btn-toolbar .input-group {
+ float: left;
+}
+.btn-toolbar > .btn,
+.btn-toolbar > .btn-group,
+.btn-toolbar > .input-group {
+ margin-left: 5px;
+}
+.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
+ border-radius: 0;
+}
+.btn-group > .btn:first-child {
+ margin-left: 0;
+}
+.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+}
+.btn-group > .btn:last-child:not(:first-child),
+.btn-group > .dropdown-toggle:not(:first-child) {
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0;
+}
+.btn-group > .btn-group {
+ float: left;
+}
+.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
+ border-radius: 0;
+}
+.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child,
+.btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+}
+.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0;
+}
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+ outline: 0;
+}
+.btn-group > .btn + .dropdown-toggle {
+ padding-right: 8px;
+ padding-left: 8px;
+}
+.btn-group > .btn-lg + .dropdown-toggle {
+ padding-right: 12px;
+ padding-left: 12px;
+}
+.btn-group.open .dropdown-toggle {
+ -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+ box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+}
+.btn-group.open .dropdown-toggle.btn-link {
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+.btn .caret {
+ margin-left: 0;
+}
+.btn-lg .caret {
+ border-width: 5px 5px 0;
+ border-bottom-width: 0;
+}
+.dropup .btn-lg .caret {
+ border-width: 0 5px 5px;
+}
+.btn-group-vertical > .btn,
+.btn-group-vertical > .btn-group,
+.btn-group-vertical > .btn-group > .btn {
+ display: block;
+ float: none;
+ width: 100%;
+ max-width: 100%;
+}
+.btn-group-vertical > .btn-group > .btn {
+ float: none;
+}
+.btn-group-vertical > .btn + .btn,
+.btn-group-vertical > .btn + .btn-group,
+.btn-group-vertical > .btn-group + .btn,
+.btn-group-vertical > .btn-group + .btn-group {
+ margin-top: -1px;
+ margin-left: 0;
+}
+.btn-group-vertical > .btn:not(:first-child):not(:last-child) {
+ border-radius: 0;
+}
+.btn-group-vertical > .btn:first-child:not(:last-child) {
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 0;
+ border-bottom-left-radius: 0;
+}
+.btn-group-vertical > .btn:last-child:not(:first-child) {
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 4px;
+ border-bottom-left-radius: 4px;
+}
+.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
+ border-radius: 0;
+}
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
+ border-bottom-right-radius: 0;
+ border-bottom-left-radius: 0;
+}
+.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+}
+.btn-group-justified {
+ display: table;
+ width: 100%;
+ table-layout: fixed;
+ border-collapse: separate;
+}
+.btn-group-justified > .btn,
+.btn-group-justified > .btn-group {
+ display: table-cell;
+ float: none;
+ width: 1%;
+}
+.btn-group-justified > .btn-group .btn {
+ width: 100%;
+}
+.btn-group-justified > .btn-group .dropdown-menu {
+ left: auto;
+}
+[data-toggle="buttons"] > .btn input[type="radio"],
+[data-toggle="buttons"] > .btn-group > .btn input[type="radio"],
+[data-toggle="buttons"] > .btn input[type="checkbox"],
+[data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] {
+ position: absolute;
+ clip: rect(0, 0, 0, 0);
+ pointer-events: none;
+}
+.input-group {
+ position: relative;
+ display: table;
+ border-collapse: separate;
+}
+.input-group[class*="col-"] {
+ float: none;
+ padding-right: 0;
+ padding-left: 0;
+}
+.input-group .form-control {
+ position: relative;
+ z-index: 2;
+ float: left;
+ width: 100%;
+ margin-bottom: 0;
+}
+.input-group .form-control:focus {
+ z-index: 3;
+}
+.input-group-lg > .form-control,
+.input-group-lg > .input-group-addon,
+.input-group-lg > .input-group-btn > .btn {
+ height: 46px;
+ padding: 10px 16px;
+ font-size: 18px;
+ line-height: 1.3333333;
+ border-radius: 6px;
+}
+select.input-group-lg > .form-control,
+select.input-group-lg > .input-group-addon,
+select.input-group-lg > .input-group-btn > .btn {
+ height: 46px;
+ line-height: 46px;
+}
+textarea.input-group-lg > .form-control,
+textarea.input-group-lg > .input-group-addon,
+textarea.input-group-lg > .input-group-btn > .btn,
+select[multiple].input-group-lg > .form-control,
+select[multiple].input-group-lg > .input-group-addon,
+select[multiple].input-group-lg > .input-group-btn > .btn {
+ height: auto;
+}
+.input-group-sm > .form-control,
+.input-group-sm > .input-group-addon,
+.input-group-sm > .input-group-btn > .btn {
+ height: 30px;
+ padding: 5px 10px;
+ font-size: 12px;
+ line-height: 1.5;
+ border-radius: 3px;
+}
+select.input-group-sm > .form-control,
+select.input-group-sm > .input-group-addon,
+select.input-group-sm > .input-group-btn > .btn {
+ height: 30px;
+ line-height: 30px;
+}
+textarea.input-group-sm > .form-control,
+textarea.input-group-sm > .input-group-addon,
+textarea.input-group-sm > .input-group-btn > .btn,
+select[multiple].input-group-sm > .form-control,
+select[multiple].input-group-sm > .input-group-addon,
+select[multiple].input-group-sm > .input-group-btn > .btn {
+ height: auto;
+}
+.input-group-addon,
+.input-group-btn,
+.input-group .form-control {
+ display: table-cell;
+}
+.input-group-addon:not(:first-child):not(:last-child),
+.input-group-btn:not(:first-child):not(:last-child),
+.input-group .form-control:not(:first-child):not(:last-child) {
+ border-radius: 0;
+}
+.input-group-addon,
+.input-group-btn {
+ width: 1%;
+ white-space: nowrap;
+ vertical-align: middle;
+}
+.input-group-addon {
+ padding: 6px 12px;
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 1;
+ color: #555;
+ text-align: center;
+ background-color: #eee;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+}
+.input-group-addon.input-sm {
+ padding: 5px 10px;
+ font-size: 12px;
+ border-radius: 3px;
+}
+.input-group-addon.input-lg {
+ padding: 10px 16px;
+ font-size: 18px;
+ border-radius: 6px;
+}
+.input-group-addon input[type="radio"],
+.input-group-addon input[type="checkbox"] {
+ margin-top: 0;
+}
+.input-group .form-control:first-child,
+.input-group-addon:first-child,
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group > .btn,
+.input-group-btn:first-child > .dropdown-toggle,
+.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
+.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+}
+.input-group-addon:first-child {
+ border-right: 0;
+}
+.input-group .form-control:last-child,
+.input-group-addon:last-child,
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group > .btn,
+.input-group-btn:last-child > .dropdown-toggle,
+.input-group-btn:first-child > .btn:not(:first-child),
+.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
+ border-top-left-radius: 0;
+ border-bottom-left-radius: 0;
+}
+.input-group-addon:last-child {
+ border-left: 0;
+}
+.input-group-btn {
+ position: relative;
+ font-size: 0;
+ white-space: nowrap;
+}
+.input-group-btn > .btn {
+ position: relative;
+}
+.input-group-btn > .btn + .btn {
+ margin-left: -1px;
+}
+.input-group-btn > .btn:hover,
+.input-group-btn > .btn:focus,
+.input-group-btn > .btn:active {
+ z-index: 2;
+}
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group {
+ margin-right: -1px;
+}
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group {
+ z-index: 2;
+ margin-left: -1px;
+}
+.nav {
+ padding-left: 0;
+ margin-bottom: 0;
+ list-style: none;
+}
+.nav > li {
+ position: relative;
+ display: block;
+}
+.nav > li > a {
+ position: relative;
+ display: block;
+ padding: 10px 15px;
+}
+.nav > li > a:hover,
+.nav > li > a:focus {
+ text-decoration: none;
+ background-color: #eee;
+}
+.nav > li.disabled > a {
+ color: #777;
+}
+.nav > li.disabled > a:hover,
+.nav > li.disabled > a:focus {
+ color: #777;
+ text-decoration: none;
+ cursor: not-allowed;
+ background-color: transparent;
+}
+.nav .open > a,
+.nav .open > a:hover,
+.nav .open > a:focus {
+ background-color: #eee;
+ border-color: #337ab7;
+}
+.nav .nav-divider {
+ height: 1px;
+ margin: 9px 0;
+ overflow: hidden;
+ background-color: #e5e5e5;
+}
+.nav > li > a > img {
+ max-width: none;
+}
+.nav-tabs {
+ border-bottom: 1px solid #ddd;
+}
+.nav-tabs > li {
+ float: left;
+ margin-bottom: -1px;
+}
+.nav-tabs > li > a {
+ margin-right: 2px;
+ line-height: 1.42857143;
+ border: 1px solid transparent;
+ border-radius: 4px 4px 0 0;
+}
+.nav-tabs > li > a:hover {
+ border-color: #eee #eee #ddd;
+}
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
+.nav-tabs > li.active > a:focus {
+ color: #555;
+ cursor: default;
+ background-color: #fff;
+ border: 1px solid #ddd;
+ border-bottom-color: transparent;
+}
+.nav-tabs.nav-justified {
+ width: 100%;
+ border-bottom: 0;
+}
+.nav-tabs.nav-justified > li {
+ float: none;
+}
+.nav-tabs.nav-justified > li > a {
+ margin-bottom: 5px;
+ text-align: center;
+}
+.nav-tabs.nav-justified > .dropdown .dropdown-menu {
+ top: auto;
+ left: auto;
+}
+@media (min-width: 768px) {
+ .nav-tabs.nav-justified > li {
+ display: table-cell;
+ width: 1%;
+ }
+ .nav-tabs.nav-justified > li > a {
+ margin-bottom: 0;
+ }
+}
+.nav-tabs.nav-justified > li > a {
+ margin-right: 0;
+ border-radius: 4px;
+}
+.nav-tabs.nav-justified > .active > a,
+.nav-tabs.nav-justified > .active > a:hover,
+.nav-tabs.nav-justified > .active > a:focus {
+ border: 1px solid #ddd;
+}
+@media (min-width: 768px) {
+ .nav-tabs.nav-justified > li > a {
+ border-bottom: 1px solid #ddd;
+ border-radius: 4px 4px 0 0;
+ }
+ .nav-tabs.nav-justified > .active > a,
+ .nav-tabs.nav-justified > .active > a:hover,
+ .nav-tabs.nav-justified > .active > a:focus {
+ border-bottom-color: #fff;
+ }
+}
+.nav-pills > li {
+ float: left;
+}
+.nav-pills > li > a {
+ border-radius: 4px;
+}
+.nav-pills > li + li {
+ margin-left: 2px;
+}
+.nav-pills > li.active > a,
+.nav-pills > li.active > a:hover,
+.nav-pills > li.active > a:focus {
+ color: #fff;
+ background-color: #337ab7;
+}
+.nav-stacked > li {
+ float: none;
+}
+.nav-stacked > li + li {
+ margin-top: 2px;
+ margin-left: 0;
+}
+.nav-justified {
+ width: 100%;
+}
+.nav-justified > li {
+ float: none;
+}
+.nav-justified > li > a {
+ margin-bottom: 5px;
+ text-align: center;
+}
+.nav-justified > .dropdown .dropdown-menu {
+ top: auto;
+ left: auto;
+}
+@media (min-width: 768px) {
+ .nav-justified > li {
+ display: table-cell;
+ width: 1%;
+ }
+ .nav-justified > li > a {
+ margin-bottom: 0;
+ }
+}
+.nav-tabs-justified {
+ border-bottom: 0;
+}
+.nav-tabs-justified > li > a {
+ margin-right: 0;
+ border-radius: 4px;
+}
+.nav-tabs-justified > .active > a,
+.nav-tabs-justified > .active > a:hover,
+.nav-tabs-justified > .active > a:focus {
+ border: 1px solid #ddd;
+}
+@media (min-width: 768px) {
+ .nav-tabs-justified > li > a {
+ border-bottom: 1px solid #ddd;
+ border-radius: 4px 4px 0 0;
+ }
+ .nav-tabs-justified > .active > a,
+ .nav-tabs-justified > .active > a:hover,
+ .nav-tabs-justified > .active > a:focus {
+ border-bottom-color: #fff;
+ }
+}
+.tab-content > .tab-pane {
+ display: none;
+}
+.tab-content > .active {
+ display: block;
+}
+.nav-tabs .dropdown-menu {
+ margin-top: -1px;
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+}
+.navbar {
+ position: relative;
+ min-height: 50px;
+ margin-bottom: 20px;
+ border: 1px solid transparent;
+}
+@media (min-width: 768px) {
+ .navbar {
+ border-radius: 4px;
+ }
+}
+@media (min-width: 768px) {
+ .navbar-header {
+ float: left;
+ }
+}
+.navbar-collapse {
+ padding-right: 15px;
+ padding-left: 15px;
+ overflow-x: visible;
+ -webkit-overflow-scrolling: touch;
+ border-top: 1px solid transparent;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
+}
+.navbar-collapse.in {
+ overflow-y: auto;
+}
+@media (min-width: 768px) {
+ .navbar-collapse {
+ width: auto;
+ border-top: 0;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ }
+ .navbar-collapse.collapse {
+ display: block !important;
+ height: auto !important;
+ padding-bottom: 0;
+ overflow: visible !important;
+ }
+ .navbar-collapse.in {
+ overflow-y: visible;
+ }
+ .navbar-fixed-top .navbar-collapse,
+ .navbar-static-top .navbar-collapse,
+ .navbar-fixed-bottom .navbar-collapse {
+ padding-right: 0;
+ padding-left: 0;
+ }
+}
+.navbar-fixed-top .navbar-collapse,
+.navbar-fixed-bottom .navbar-collapse {
+ max-height: 340px;
+}
+@media (max-device-width: 480px) and (orientation: landscape) {
+ .navbar-fixed-top .navbar-collapse,
+ .navbar-fixed-bottom .navbar-collapse {
+ max-height: 200px;
+ }
+}
+.container > .navbar-header,
+.container-fluid > .navbar-header,
+.container > .navbar-collapse,
+.container-fluid > .navbar-collapse {
+ margin-right: -15px;
+ margin-left: -15px;
+}
+@media (min-width: 768px) {
+ .container > .navbar-header,
+ .container-fluid > .navbar-header,
+ .container > .navbar-collapse,
+ .container-fluid > .navbar-collapse {
+ margin-right: 0;
+ margin-left: 0;
+ }
+}
+.navbar-static-top {
+ z-index: 1000;
+ border-width: 0 0 1px;
+}
+@media (min-width: 768px) {
+ .navbar-static-top {
+ border-radius: 0;
+ }
+}
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+ position: fixed;
+ right: 0;
+ left: 0;
+ z-index: 1030;
+}
+@media (min-width: 768px) {
+ .navbar-fixed-top,
+ .navbar-fixed-bottom {
+ border-radius: 0;
+ }
+}
+.navbar-fixed-top {
+ top: 0;
+ border-width: 0 0 1px;
+}
+.navbar-fixed-bottom {
+ bottom: 0;
+ margin-bottom: 0;
+ border-width: 1px 0 0;
+}
+.navbar-brand {
+ float: left;
+ height: 50px;
+ padding: 15px 15px;
+ font-size: 18px;
+ line-height: 20px;
+}
+.navbar-brand:hover,
+.navbar-brand:focus {
+ text-decoration: none;
+}
+.navbar-brand > img {
+ display: block
<TRUNCATED>
[42/47] roller git commit: Add new blogroll implemented
Posted by sn...@apache.org.
Add new blogroll implemented
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/0f5c8691
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/0f5c8691
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/0f5c8691
Branch: refs/heads/bootstrap-ui
Commit: 0f5c86913c1e509872cd30c24575f3a29a52e32a
Parents: 8116858
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Mar 27 15:05:39 2016 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Mar 27 15:05:39 2016 -0400
----------------------------------------------------------------------
.../resources/ApplicationResources.properties | 6 +
.../webapp/WEB-INF/jsps/editor/Bookmarks.jsp | 142 ++++++++++++++++---
2 files changed, 129 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/0f5c8691/app/src/main/resources/ApplicationResources.properties
----------------------------------------------------------------------
diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties
index cee7e75..ac0f1a8 100644
--- a/app/src/main/resources/ApplicationResources.properties
+++ b/app/src/main/resources/ApplicationResources.properties
@@ -84,6 +84,7 @@ bookmarksForm.path=Blogroll
bookmarksForm.blogrollName=Blogroll name
bookmarksForm.switchTo=Switch to blogroll
bookmarksForm.deleteFolder=Delete current blogroll
+bookmarksForm.newBlogroll=New blogroll...
bookmarksForm.addBookmark=Add blogroll link
bookmarksForm.addFolder=New blogroll
@@ -106,6 +107,11 @@ bookmarksForm.error.move=Error performing move, parent to child moves not allowe
bookmarksForm.importBookmarks=Import Blogroll via OPML
bookmarksForm.noresults=There are currently no Blogroll links
+bookmarksForm.addBlogroll.title=Add New Blogroll
+bookmarksForm.editBlogroll.title=Edit Blogroll
+bookmarksForm.blogroll.requiredFields=You must specify a blogroll name
+bookmarkForm.error.duplicateName=No duplicate blogroll names
+
# --------------------------------------------------------- Bookmarks import.jsp
bookmarksImport.title=Import OPML Bookmarks
http://git-wip-us.apache.org/repos/asf/roller/blob/0f5c8691/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
index f569c98..ee4eb61 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
@@ -21,7 +21,7 @@
<%--
Blogroll link management
-We used to call them Bookmarks and Folders, now we call them blogroll links and blogrolls.
+We used to call them Bookmarks and Folders, now we call them Blogroll links and Blogrolls.
--%>
<%-- ================================================================================================ --%>
@@ -94,7 +94,7 @@ We used to call them Bookmarks and Folders, now we call them blogroll links and
<%-- allow user to select the bookmark folder to view --%>
<s:select name="viewFolderId" list="allFolders" listKey="id" listValue="name"
- label="%{getText('bookmarksForm.switchTo')}" onchange="changeFolder()" />
+ label="%{getText('bookmarksForm.switchTo')}" onchange="viewChanged()" />
</s:if>
@@ -231,6 +231,7 @@ We used to call them Bookmarks and Folders, now we call them blogroll links and
var renameCancel;
var deleteSelectedButton;
var moveSelectedButton;
+ var viewSelector;
var moveToSelector;
$( document ).ready(function() {
@@ -245,10 +246,17 @@ We used to call them Bookmarks and Folders, now we call them blogroll links and
renameCancel = $("#rename_cancel:first");
deleteSelectedButton = $("#delete_selected:first");
moveSelectedButton = $("#move_selected:first");
+ viewSelector = $("#bookmarks_viewFolderId:first");
moveToSelector = $("#bookmarks_targetFolderId:first");
nameChanged();
selectionChanged();
+
+ // add the "New Blogroll" option to blogroll selectors
+ viewSelector.append(
+ new Option('<s:text name="bookmarksForm.newBlogroll"/>', "new_blogroll" ));
+ moveToSelector.append(
+ new Option( '<s:text name="bookmarksForm.newBlogroll"/>', "new_blogroll" ));
});
function nameChanged() {
@@ -270,7 +278,7 @@ We used to call them Bookmarks and Folders, now we call them blogroll links and
function selectionChanged() {
var checked = false;
var selected = $("[name=selectedBookmarks]");
- for ( i in selected ) {
+ for ( var i in selected ) {
if ( selected[i].checked ) {
checked = true;
break;
@@ -283,6 +291,8 @@ We used to call them Bookmarks and Folders, now we call them blogroll links and
moveSelectedButton.attr("disabled", false );
moveSelectedButton.addClass("btn-warning");
+ moveToSelector.attr("disabled", false);
+
} else {
deleteSelectedButton.attr("disabled", true );
deleteSelectedButton.removeClass("btn-danger");
@@ -290,13 +300,12 @@ We used to call them Bookmarks and Folders, now we call them blogroll links and
moveSelectedButton.attr("disabled", true );
moveSelectedButton.removeClass("btn-warning");
- moveToSelector.attr("disabled", true)
+ moveToSelector.attr("disabled", true);
}
}
function renameFolder( event ) {
event.preventDefault();
- alert("renameFolder");
}
function cancelRenameFolder( event ) {
@@ -305,12 +314,14 @@ We used to call them Bookmarks and Folders, now we call them blogroll links and
}
function confirmDelete() {
+ // TODO: do not use plain old DHTML confirm here
if (confirm("<s:text name='bookmarksForm.delete.confirm' />")) {
document.bookmarks.submit();
}
}
function deleteFolder() {
+ // TODO: do not use plain old DHTML confirm here
if (confirm("<s:text name='bookmarksForm.deleteFolder.confirm' />")) {
document.bookmarks.action = '<s:url action="bookmarks!deleteFolder" />';
document.bookmarks.submit();
@@ -318,17 +329,33 @@ We used to call them Bookmarks and Folders, now we call them blogroll links and
}
function onMoveToFolder() {
+ // TODO: do not use plain old DHTML confirm here
if (confirm("<s:text name='bookmarksForm.move.confirm' />")) {
document.bookmarks.action = '<s:url action="bookmarks!move" />';
document.bookmarks.submit();
}
}
- function changeFolder() {
- // user changed the blogroll/folder, post to "view" action to get new page
+ function viewChanged() {
+
var bookmarksForm = $("#bookmarks")[0];
- bookmarksForm.action = "bookmarks!view.rol";
- bookmarksForm.submit();
+ var folderEditForm = $("#folderEditForm")[0];
+
+ if ( "new_blogroll" == bookmarksForm.viewFolderId.value ) {
+
+ // user selected New Blogroll option, show the add/edit blogroll modal
+ $('#blogroll-edit-title').html('<s:text name="bookmarksForm.addBlogroll.title" />');
+
+ folderEditForm.action = "folderAdd!save.rol";
+ folderEditForm.actionName.value = "folderAdd";
+
+ $('#addedit-bookmarkfolder-modal').modal({show: true});
+
+ } else {
+ // user changed the blogroll/folder, post to "view" action to get new page
+ bookmarksForm.action = "bookmarks!view.rol";
+ bookmarksForm.submit();
+ }
}
</script>
@@ -338,19 +365,96 @@ We used to call them Bookmarks and Folders, now we call them blogroll links and
<%-- add/edit blogroll / folder form --%>
-<s:form name="folderEdit" cssStyle="display:none" theme="bootstrap" cssClass="form-horizontal">
- <s:hidden name="salt" />
- <s:hidden name="weblog" />
- <s:hidden name="bean.id" />
- <s:textfield name="bean.name" size="70" maxlength="255" />
- <s:submit value="%{getText('generic.save')}" action="%{#mainAction}!save"/>
- <s:submit value="%{getText('generic.cancel')}" action="folderEdit!cancel" />
-</s:form>
+<div id="addedit-bookmarkfolder-modal" class="modal fade addedit-bookmarkfolder-modal" tabindex="-1" role="dialog">
+
+ <div class="modal-dialog modal-lg">
+
+ <div class="modal-content">
+
+ <div class="modal-header">
+ <h3 id="blogroll-edit-title"></h3>
+ </div>
+
+ <div class="modal-body">
+ <s:form action="#" id="folderEditForm" theme="bootstrap" cssClass="form-horizontal">
+ <s:hidden name="salt" />
+ <s:hidden name="actionName" />
+ <s:hidden name="weblog" />
+ <s:hidden name="bean.id" />
+
+ <%-- action needed here because we are using AJAX to post this form --%>
+ <s:hidden name="action:folderEdit!save" value="save"/>
+
+ <s:textfield name="bean.name" label="%{getText('generic.name')}" maxlength="255"/>
+ </s:form>
+ </div> <!-- modal-body-->
+
+ <div class="modal-footer">
+ <p id="feedback-area-blogroll-edit"></p>
+ <button onclick="submitEditedBlogroll()" class="btn btn-primary">
+ <s:text name="generic.save"/>
+ </button>
+ <button type="button" class="btn" data-dismiss="modal">
+ <s:text name="generic.cancel"/>
+ </button>
+ </div>
+
+ </div> <!-- modal-content-->
+ </div> <!-- modal-dialog -->
+
+</div>
+
+<script>
+
+ <%-- JavaScript for add/edit blogroll modal --%>
+
+ function submitEditedBlogroll() {
+
+ var folderEditForm = $("#folderEditForm")[0];
+
+ var feedbackAreaBlogrollEdit = $("#feedback-area-blogroll-edit");
+
+ // if name is empty reject and show error message
+ if ($("#folderEditForm_bean_name").val().trim() == "") {
+ feedbackAreaBlogrollEdit.html('<s:text name="bookmarksForm.blogroll.requiredFields" />');
+ feedbackAreaBlogrollEdit.css("color", "red");
+ return;
+ }
+
+ // post blogroll via AJAX
+ $.ajax({
+ method: 'post',
+ url: folderEditForm.attributes["action"].value,
+ data: $("#folderEditForm").serialize(),
+ context: document.body
+
+ }).done(function (data) {
+
+ // kludge: scrape response status from HTML returned by Struts
+ var alertEnd = data.indexOf("ALERT_END");
+ if (data.indexOf('<s:text name="bookmarkForm.error.duplicateName" />') < alertEnd) {
+ feedbackAreaBlogrollEdit.css("color", "red");
+ feedbackAreaBlogrollEdit.html('<s:text name="bookmarkForm.error.duplicateName" />');
+
+ } else {
+ feedbackAreaBlogrollEdit.css("color", "green");
+ feedbackAreaBlogrollEdit.html('<s:text name="generic.success" />');
+ $('#blogroll-edit-modal').modal("hide");
+ location.reload(true);
+ }
+
+ }).error(function (data) {
+ feedbackAreaBlogrollEdit.html('<s:text name="generic.error.check.logs" />');
+ feedbackAreaBlogrollEdit.css("color", "red");
+ });
+ }
+
+</script>
<%-- ================================================================================================ --%>
-<%-- add/edit blogroll link form: a modal --%>
+<%-- add/edit link form: a modal --%>
<div id="addedit-bookmark-modal" class="modal fade addedit-bookmark-modal" tabindex="-1" role="dialog">
@@ -445,7 +549,7 @@ We used to call them Bookmarks and Folders, now we call them blogroll links and
<%-- ---------------------------------------------------- --%>
-<%-- JavaScript for add/edit blogroll link modal --%>
+<%-- JavaScript for add/edit link modal --%>
<script>
[19/47] roller git commit: Beginnings of a Bootstrap rewrite of the
Roller editor/admin UI,
using Struts-Bootstrap plugin. The main menu and edit weblog page are
essentially complete.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
index 381a964..2a0fa41 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
@@ -18,47 +18,24 @@
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
<!doctype html>
<html>
- <head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <link rel="icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/x-icon">
- <title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle" /></title>
+<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link rel="icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/x-icon">
+ <title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle"/></title>
+ <tiles:insertAttribute name="head"/>
+ <style> <tiles:insertAttribute name="styles" /> </style>
+</head>
+<body>
- <tiles:insertAttribute name="head" />
- <style>
- <tiles:insertAttribute name="styles" />
- </style>
- </head>
- <body>
-
- <div id="banner">
- <tiles:insertAttribute name="banner" />
- <tiles:insertAttribute name="bannerStatus" />
- </div>
-
- <div id="wrapper">
- <div id="leftcontent_wrap">
- <div id="leftcontent">
- </div>
- </div>
-
- <div id="centercontent_wrap">
- <div id="centercontent">
- <h1><s:property value="pageTitle" /></h1>
- <tiles:insertAttribute name="messages" />
- <tiles:insertAttribute name="content" />
- </div>
- </div>
-
- <div id="rightcontent_wrap">
- <div id="rightcontent">
- </div>
- </div>
- </div>
-
- <div id="footer">
- <tiles:insertAttribute name="footer" />
- </div>
-
- </body>
+<tiles:insertAttribute name="banner"/>
+<tiles:insertAttribute name="bannerStatus"/>
+
+<h1 class="roller-page-title"><s:property value="pageTitle"/></h1>
+<tiles:insertAttribute name="messages"/>
+
+<tiles:insertAttribute name="content"/>
+
+</body>
</html>
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
index 0c9b148..acf44be 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
@@ -18,50 +18,50 @@
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
<!doctype html>
<html>
- <head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <link rel="icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/x-icon">
- <title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle" /></title>
+<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <link rel="icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/x-icon">
+ <title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle"/></title>
- <tiles:insertAttribute name="head" />
- <style>
- <tiles:insertAttribute name="styles" />
- </style>
- </head>
- <body>
- <div id="banner">
- <tiles:insertAttribute name="bannerStatus" />
- </div>
-
- <div id="menu">
- <h1><s:property value="pageTitle" /></h1>
- <tiles:insertAttribute name="menu" />
- </div>
-
- <div id="content">
- <div id="leftcontent_wrap">
- <div id="leftcontent">
- </div>
- </div>
-
- <div id="centercontent_wrap">
- <div id="centercontent">
- <tiles:insertAttribute name="messages" />
- <tiles:insertAttribute name="content" />
- </div>
+ <tiles:insertAttribute name="head"/>
+ <style> <tiles:insertAttribute name="styles" /> </style>
+</head>
+<body>
+
+<tiles:insertAttribute name="bannerStatus"/>
+
+<div class="row">
+ <div class="col-md-9 roller-column-left">
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <h2><s:property value="pageTitle"/></h2>
+ <tiles:insertAttribute name="messages"/>
+ <tiles:insertAttribute name="content"/>
</div>
-
- <div id="rightcontent_wrap">
- <div id="rightcontent">
- <tiles:insertAttribute name="sidebar" />
- </div>
+ </div>
+ </div>
+ <div class="col-md-3 roller-column-right">
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <s:if test="authenticatedUser != null || actionWeblog != null">
+ <tiles:insertAttribute name="userStatus"/>
+ </s:if>
</div>
</div>
-
- <div id="footer">
- <tiles:insertAttribute name="footer" />
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <tiles:insertAttribute name="sidebar"/>
+ </div>
</div>
-
- </body>
+ </div>
+</div>
+
+<footer class="footer">
+ <div class="container">
+ <tiles:insertAttribute name="footer"/>
+ </div>
+</footer>
+
+</body>
</html>
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/WEB-INF/jsps/tiles/userStatus.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/userStatus.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/userStatus.jsp
new file mode 100644
index 0000000..754df4c
--- /dev/null
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/userStatus.jsp
@@ -0,0 +1,38 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. The ASF licenses this file to You
+ under the Apache License, Version 2.0 (the "License"); you may not
+ use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. For additional information regarding
+ copyright in this work, please see the NOTICE file in the top level
+ directory of this distribution.
+--%>
+
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
+<s:if test="authenticatedUser != null">
+ <p>
+ <s:text name="mainPage.loggedInAs" />:
+ <a href="<s:url action="menu" namespace="/roller-ui" />">
+ <s:property value="authenticatedUser.userName"/>
+ </a>
+ </p>
+</s:if>
+
+<s:if test="actionWeblog != null">
+ <p>
+ <s:text name="mainPage.currentWebsite" />:
+ <a href='<s:property value="actionWeblog.absoluteURL" />'>
+ <s:property value="actionWeblog.handle" />
+ </a>
+ </p>
+</s:if>
+
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/WEB-INF/tiles.xml
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/tiles.xml b/app/src/main/webapp/WEB-INF/tiles.xml
index 7b90dc5..5168c0e 100644
--- a/app/src/main/webapp/WEB-INF/tiles.xml
+++ b/app/src/main/webapp/WEB-INF/tiles.xml
@@ -33,9 +33,11 @@
<definition name=".tiles-tabbedpage" template="/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp">
<put-attribute name="bannerStatus" value="/WEB-INF/jsps/tiles/bannerStatus.jsp" />
+ <put-attribute name="userStatus" value="/WEB-INF/jsps/tiles/userStatus.jsp" />
<put-attribute name="head" value="/WEB-INF/jsps/tiles/head.jsp" />
<put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
<put-attribute name="menu" value="/WEB-INF/jsps/tiles/menu.jsp" />
+ <put-attribute name="sidemenu" value="/WEB-INF/jsps/tiles/sidemenu.jsp" />
<put-attribute name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" />
<put-attribute name="content" value="${content}" />
<put-attribute name="sidebar" value="/WEB-INF/jsps/tiles/empty.jsp" />
@@ -46,7 +48,7 @@
<put-attribute name="banner" value="/WEB-INF/jsps/tiles/empty.jsp" />
<put-attribute name="bannerStatus" value="/WEB-INF/jsps/tiles/bannerStatus.jsp" />
<put-attribute name="head" value="/WEB-INF/jsps/tiles/head.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
<put-attribute name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" />
<put-attribute name="content" value="${content}" />
<put-attribute name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" />
@@ -121,7 +123,7 @@
<definition name=".MainMenu" extends=".tiles-mainmenupage" >
<put-attribute name="content" value="/WEB-INF/jsps/core/MainMenu.jsp" />
<put-attribute name="sidebar" value="/WEB-INF/jsps/core/MainMenuSidebar.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
@@ -176,7 +178,7 @@
<put-attribute name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" />
<put-attribute name="content" value="/WEB-INF/jsps/editor/Comments.jsp" />
<put-attribute name="sidebar" value="/WEB-INF/jsps/editor/CommentsSidebar.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-checkboxlistFix.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".PingTargets" extends=".tiles-tabbedpage" >
@@ -212,7 +214,7 @@
<put-attribute name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" />
<put-attribute name="content" value="/WEB-INF/jsps/editor/MediaFileAdd.jsp" />
<put-attribute name="sidebar" value="/WEB-INF/jsps/tiles/empty.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".MediaFileEdit" extends=".tiles-popuppage" >
@@ -260,84 +262,84 @@
<put-attribute name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" />
<put-attribute name="content" value="/WEB-INF/jsps/editor/MediaFileView.jsp" />
<put-attribute name="sidebar" value="/WEB-INF/jsps/editor/MediaFileSidebar.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".MediaFileAddSuccess" extends=".tiles-tabbedpage" >
<put-attribute name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" />
<put-attribute name="content" value="/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp" />
<put-attribute name="sidebar" value="/WEB-INF/jsps/tiles/empty.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".TabularView" extends=".tiles-tabbedpage" >
<put-attribute name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" />
<put-attribute name="content" value="/WEB-INF/jsps/editor/TabularView.jsp" />
<put-attribute name="sidebar" value="/WEB-INF/jsps/editor/MediaFileSidebar.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".EntryEdit" extends=".tiles-tabbedpage" >
<put-attribute name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" />
<put-attribute name="content" value="/WEB-INF/jsps/editor/EntryEdit.jsp" />
<put-attribute name="sidebar" value="/WEB-INF/jsps/editor/EntrySidebar.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".EntryRemove" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/EntryRemove.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".Entries" extends=".tiles-tabbedpage" >
<put-attribute name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" />
<put-attribute name="content" value="/WEB-INF/jsps/editor/Entries.jsp" />
<put-attribute name="sidebar" value="/WEB-INF/jsps/editor/EntriesSidebar.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".Comments" extends=".tiles-tabbedpage" >
<put-attribute name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" />
<put-attribute name="content" value="/WEB-INF/jsps/editor/Comments.jsp" />
<put-attribute name="sidebar" value="/WEB-INF/jsps/editor/CommentsSidebar.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-checkboxlistFix.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".Categories" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/Categories.jsp" />
<put-attribute name="sidebar" value="/WEB-INF/jsps/editor/CategoriesSidebar.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".CategoryEdit" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/CategoryEdit.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".CategoryRemove" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/CategoryRemove.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".Bookmarks" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/Bookmarks.jsp" />
<put-attribute name="sidebar" value="/WEB-INF/jsps/editor/BookmarksSidebar.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".BookmarkEdit" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/BookmarkEdit.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".BookmarksImport" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/BookmarksImport.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".FolderEdit" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/FolderEdit.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".Resources" extends=".tiles-tabbedpage" >
@@ -351,7 +353,7 @@
<definition name=".WeblogRemoveConfirm" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".ThemeEdit" extends=".tiles-tabbedpage" >
@@ -361,39 +363,39 @@
<definition name=".StylesheetEdit" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/StylesheetEdit.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".Templates" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/Templates.jsp" />
<put-attribute name="sidebar" value="/WEB-INF/jsps/editor/TemplatesSidebar.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".TemplateEdit" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/TemplateEdit.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".TemplateRemove" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/TemplateRemove.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".TemplatesRemove" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/TemplatesRemove.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".Members" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/Members.jsp" />
<put-attribute name="sidebar" value="/WEB-INF/jsps/editor/MembersSidebar.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".MembersInvite" extends=".tiles-tabbedpage" >
<put-attribute name="content" value="/WEB-INF/jsps/editor/MembersInvite.jsp" />
- <put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
</definition>
<definition name=".MemberResign" extends=".tiles-simplepage" >
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap-theme.css
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap-theme.css b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap-theme.css
new file mode 100644
index 0000000..ebe57fb
--- /dev/null
+++ b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap-theme.css
@@ -0,0 +1,587 @@
+/*!
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+.btn-default,
+.btn-primary,
+.btn-success,
+.btn-info,
+.btn-warning,
+.btn-danger {
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, .2);
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
+}
+.btn-default:active,
+.btn-primary:active,
+.btn-success:active,
+.btn-info:active,
+.btn-warning:active,
+.btn-danger:active,
+.btn-default.active,
+.btn-primary.active,
+.btn-success.active,
+.btn-info.active,
+.btn-warning.active,
+.btn-danger.active {
+ -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+ box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+}
+.btn-default.disabled,
+.btn-primary.disabled,
+.btn-success.disabled,
+.btn-info.disabled,
+.btn-warning.disabled,
+.btn-danger.disabled,
+.btn-default[disabled],
+.btn-primary[disabled],
+.btn-success[disabled],
+.btn-info[disabled],
+.btn-warning[disabled],
+.btn-danger[disabled],
+fieldset[disabled] .btn-default,
+fieldset[disabled] .btn-primary,
+fieldset[disabled] .btn-success,
+fieldset[disabled] .btn-info,
+fieldset[disabled] .btn-warning,
+fieldset[disabled] .btn-danger {
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+.btn-default .badge,
+.btn-primary .badge,
+.btn-success .badge,
+.btn-info .badge,
+.btn-warning .badge,
+.btn-danger .badge {
+ text-shadow: none;
+}
+.btn:active,
+.btn.active {
+ background-image: none;
+}
+.btn-default {
+ text-shadow: 0 1px 0 #fff;
+ background-image: -webkit-linear-gradient(top, #fff 0%, #e0e0e0 100%);
+ background-image: -o-linear-gradient(top, #fff 0%, #e0e0e0 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#e0e0e0));
+ background-image: linear-gradient(to bottom, #fff 0%, #e0e0e0 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ background-repeat: repeat-x;
+ border-color: #dbdbdb;
+ border-color: #ccc;
+}
+.btn-default:hover,
+.btn-default:focus {
+ background-color: #e0e0e0;
+ background-position: 0 -15px;
+}
+.btn-default:active,
+.btn-default.active {
+ background-color: #e0e0e0;
+ border-color: #dbdbdb;
+}
+.btn-default.disabled,
+.btn-default[disabled],
+fieldset[disabled] .btn-default,
+.btn-default.disabled:hover,
+.btn-default[disabled]:hover,
+fieldset[disabled] .btn-default:hover,
+.btn-default.disabled:focus,
+.btn-default[disabled]:focus,
+fieldset[disabled] .btn-default:focus,
+.btn-default.disabled.focus,
+.btn-default[disabled].focus,
+fieldset[disabled] .btn-default.focus,
+.btn-default.disabled:active,
+.btn-default[disabled]:active,
+fieldset[disabled] .btn-default:active,
+.btn-default.disabled.active,
+.btn-default[disabled].active,
+fieldset[disabled] .btn-default.active {
+ background-color: #e0e0e0;
+ background-image: none;
+}
+.btn-primary {
+ background-image: -webkit-linear-gradient(top, #337ab7 0%, #265a88 100%);
+ background-image: -o-linear-gradient(top, #337ab7 0%, #265a88 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#265a88));
+ background-image: linear-gradient(to bottom, #337ab7 0%, #265a88 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ background-repeat: repeat-x;
+ border-color: #245580;
+}
+.btn-primary:hover,
+.btn-primary:focus {
+ background-color: #265a88;
+ background-position: 0 -15px;
+}
+.btn-primary:active,
+.btn-primary.active {
+ background-color: #265a88;
+ border-color: #245580;
+}
+.btn-primary.disabled,
+.btn-primary[disabled],
+fieldset[disabled] .btn-primary,
+.btn-primary.disabled:hover,
+.btn-primary[disabled]:hover,
+fieldset[disabled] .btn-primary:hover,
+.btn-primary.disabled:focus,
+.btn-primary[disabled]:focus,
+fieldset[disabled] .btn-primary:focus,
+.btn-primary.disabled.focus,
+.btn-primary[disabled].focus,
+fieldset[disabled] .btn-primary.focus,
+.btn-primary.disabled:active,
+.btn-primary[disabled]:active,
+fieldset[disabled] .btn-primary:active,
+.btn-primary.disabled.active,
+.btn-primary[disabled].active,
+fieldset[disabled] .btn-primary.active {
+ background-color: #265a88;
+ background-image: none;
+}
+.btn-success {
+ background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%);
+ background-image: -o-linear-gradient(top, #5cb85c 0%, #419641 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#5cb85c), to(#419641));
+ background-image: linear-gradient(to bottom, #5cb85c 0%, #419641 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ background-repeat: repeat-x;
+ border-color: #3e8f3e;
+}
+.btn-success:hover,
+.btn-success:focus {
+ background-color: #419641;
+ background-position: 0 -15px;
+}
+.btn-success:active,
+.btn-success.active {
+ background-color: #419641;
+ border-color: #3e8f3e;
+}
+.btn-success.disabled,
+.btn-success[disabled],
+fieldset[disabled] .btn-success,
+.btn-success.disabled:hover,
+.btn-success[disabled]:hover,
+fieldset[disabled] .btn-success:hover,
+.btn-success.disabled:focus,
+.btn-success[disabled]:focus,
+fieldset[disabled] .btn-success:focus,
+.btn-success.disabled.focus,
+.btn-success[disabled].focus,
+fieldset[disabled] .btn-success.focus,
+.btn-success.disabled:active,
+.btn-success[disabled]:active,
+fieldset[disabled] .btn-success:active,
+.btn-success.disabled.active,
+.btn-success[disabled].active,
+fieldset[disabled] .btn-success.active {
+ background-color: #419641;
+ background-image: none;
+}
+.btn-info {
+ background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
+ background-image: -o-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#5bc0de), to(#2aabd2));
+ background-image: linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ background-repeat: repeat-x;
+ border-color: #28a4c9;
+}
+.btn-info:hover,
+.btn-info:focus {
+ background-color: #2aabd2;
+ background-position: 0 -15px;
+}
+.btn-info:active,
+.btn-info.active {
+ background-color: #2aabd2;
+ border-color: #28a4c9;
+}
+.btn-info.disabled,
+.btn-info[disabled],
+fieldset[disabled] .btn-info,
+.btn-info.disabled:hover,
+.btn-info[disabled]:hover,
+fieldset[disabled] .btn-info:hover,
+.btn-info.disabled:focus,
+.btn-info[disabled]:focus,
+fieldset[disabled] .btn-info:focus,
+.btn-info.disabled.focus,
+.btn-info[disabled].focus,
+fieldset[disabled] .btn-info.focus,
+.btn-info.disabled:active,
+.btn-info[disabled]:active,
+fieldset[disabled] .btn-info:active,
+.btn-info.disabled.active,
+.btn-info[disabled].active,
+fieldset[disabled] .btn-info.active {
+ background-color: #2aabd2;
+ background-image: none;
+}
+.btn-warning {
+ background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
+ background-image: -o-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#f0ad4e), to(#eb9316));
+ background-image: linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ background-repeat: repeat-x;
+ border-color: #e38d13;
+}
+.btn-warning:hover,
+.btn-warning:focus {
+ background-color: #eb9316;
+ background-position: 0 -15px;
+}
+.btn-warning:active,
+.btn-warning.active {
+ background-color: #eb9316;
+ border-color: #e38d13;
+}
+.btn-warning.disabled,
+.btn-warning[disabled],
+fieldset[disabled] .btn-warning,
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled.focus,
+.btn-warning[disabled].focus,
+fieldset[disabled] .btn-warning.focus,
+.btn-warning.disabled:active,
+.btn-warning[disabled]:active,
+fieldset[disabled] .btn-warning:active,
+.btn-warning.disabled.active,
+.btn-warning[disabled].active,
+fieldset[disabled] .btn-warning.active {
+ background-color: #eb9316;
+ background-image: none;
+}
+.btn-danger {
+ background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
+ background-image: -o-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#d9534f), to(#c12e2a));
+ background-image: linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ background-repeat: repeat-x;
+ border-color: #b92c28;
+}
+.btn-danger:hover,
+.btn-danger:focus {
+ background-color: #c12e2a;
+ background-position: 0 -15px;
+}
+.btn-danger:active,
+.btn-danger.active {
+ background-color: #c12e2a;
+ border-color: #b92c28;
+}
+.btn-danger.disabled,
+.btn-danger[disabled],
+fieldset[disabled] .btn-danger,
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled.focus,
+.btn-danger[disabled].focus,
+fieldset[disabled] .btn-danger.focus,
+.btn-danger.disabled:active,
+.btn-danger[disabled]:active,
+fieldset[disabled] .btn-danger:active,
+.btn-danger.disabled.active,
+.btn-danger[disabled].active,
+fieldset[disabled] .btn-danger.active {
+ background-color: #c12e2a;
+ background-image: none;
+}
+.thumbnail,
+.img-thumbnail {
+ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
+ box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
+}
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus {
+ background-color: #e8e8e8;
+ background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+ background-image: -o-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#e8e8e8));
+ background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
+ background-repeat: repeat-x;
+}
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+ background-color: #2e6da4;
+ background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+ background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
+ background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
+ background-repeat: repeat-x;
+}
+.navbar-default {
+ background-image: -webkit-linear-gradient(top, #fff 0%, #f8f8f8 100%);
+ background-image: -o-linear-gradient(top, #fff 0%, #f8f8f8 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#f8f8f8));
+ background-image: linear-gradient(to bottom, #fff 0%, #f8f8f8 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ background-repeat: repeat-x;
+ border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
+}
+.navbar-default .navbar-nav > .open > a,
+.navbar-default .navbar-nav > .active > a {
+ background-image: -webkit-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
+ background-image: -o-linear-gradient(top, #dbdbdb 0%, #e2e2e2 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#dbdbdb), to(#e2e2e2));
+ background-image: linear-gradient(to bottom, #dbdbdb 0%, #e2e2e2 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);
+ background-repeat: repeat-x;
+ -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
+ box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
+}
+.navbar-brand,
+.navbar-nav > li > a {
+ text-shadow: 0 1px 0 rgba(255, 255, 255, .25);
+}
+.navbar-inverse {
+ background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222 100%);
+ background-image: -o-linear-gradient(top, #3c3c3c 0%, #222 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#3c3c3c), to(#222));
+ background-image: linear-gradient(to bottom, #3c3c3c 0%, #222 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ background-repeat: repeat-x;
+ border-radius: 4px;
+}
+.navbar-inverse .navbar-nav > .open > a,
+.navbar-inverse .navbar-nav > .active > a {
+ background-image: -webkit-linear-gradient(top, #080808 0%, #0f0f0f 100%);
+ background-image: -o-linear-gradient(top, #080808 0%, #0f0f0f 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#080808), to(#0f0f0f));
+ background-image: linear-gradient(to bottom, #080808 0%, #0f0f0f 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);
+ background-repeat: repeat-x;
+ -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
+ box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
+}
+.navbar-inverse .navbar-brand,
+.navbar-inverse .navbar-nav > li > a {
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, .25);
+}
+.navbar-static-top,
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+ border-radius: 0;
+}
+@media (max-width: 767px) {
+ .navbar .navbar-nav .open .dropdown-menu > .active > a,
+ .navbar .navbar-nav .open .dropdown-menu > .active > a:hover,
+ .navbar .navbar-nav .open .dropdown-menu > .active > a:focus {
+ color: #fff;
+ background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+ background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
+ background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
+ background-repeat: repeat-x;
+ }
+}
+.alert {
+ text-shadow: 0 1px 0 rgba(255, 255, 255, .2);
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
+}
+.alert-success {
+ background-image: -webkit-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
+ background-image: -o-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#dff0d8), to(#c8e5bc));
+ background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
+ background-repeat: repeat-x;
+ border-color: #b2dba1;
+}
+.alert-info {
+ background-image: -webkit-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
+ background-image: -o-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#d9edf7), to(#b9def0));
+ background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
+ background-repeat: repeat-x;
+ border-color: #9acfea;
+}
+.alert-warning {
+ background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
+ background-image: -o-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#fcf8e3), to(#f8efc0));
+ background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
+ background-repeat: repeat-x;
+ border-color: #f5e79e;
+}
+.alert-danger {
+ background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
+ background-image: -o-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#f2dede), to(#e7c3c3));
+ background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
+ background-repeat: repeat-x;
+ border-color: #dca7a7;
+}
+.progress {
+ background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
+ background-image: -o-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#ebebeb), to(#f5f5f5));
+ background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
+ background-repeat: repeat-x;
+}
+.progress-bar {
+ background-image: -webkit-linear-gradient(top, #337ab7 0%, #286090 100%);
+ background-image: -o-linear-gradient(top, #337ab7 0%, #286090 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#286090));
+ background-image: linear-gradient(to bottom, #337ab7 0%, #286090 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0);
+ background-repeat: repeat-x;
+}
+.progress-bar-success {
+ background-image: -webkit-linear-gradient(top, #5cb85c 0%, #449d44 100%);
+ background-image: -o-linear-gradient(top, #5cb85c 0%, #449d44 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#5cb85c), to(#449d44));
+ background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
+ background-repeat: repeat-x;
+}
+.progress-bar-info {
+ background-image: -webkit-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
+ background-image: -o-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#5bc0de), to(#31b0d5));
+ background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
+ background-repeat: repeat-x;
+}
+.progress-bar-warning {
+ background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
+ background-image: -o-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#f0ad4e), to(#ec971f));
+ background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
+ background-repeat: repeat-x;
+}
+.progress-bar-danger {
+ background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%);
+ background-image: -o-linear-gradient(top, #d9534f 0%, #c9302c 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#d9534f), to(#c9302c));
+ background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
+ background-repeat: repeat-x;
+}
+.progress-bar-striped {
+ background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+ background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+ background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+}
+.list-group {
+ border-radius: 4px;
+ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
+ box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
+}
+.list-group-item.active,
+.list-group-item.active:hover,
+.list-group-item.active:focus {
+ text-shadow: 0 -1px 0 #286090;
+ background-image: -webkit-linear-gradient(top, #337ab7 0%, #2b669a 100%);
+ background-image: -o-linear-gradient(top, #337ab7 0%, #2b669a 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2b669a));
+ background-image: linear-gradient(to bottom, #337ab7 0%, #2b669a 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2b669a', GradientType=0);
+ background-repeat: repeat-x;
+ border-color: #2b669a;
+}
+.list-group-item.active .badge,
+.list-group-item.active:hover .badge,
+.list-group-item.active:focus .badge {
+ text-shadow: none;
+}
+.panel {
+ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
+ box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
+}
+.panel-default > .panel-heading {
+ background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+ background-image: -o-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#e8e8e8));
+ background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
+ background-repeat: repeat-x;
+}
+.panel-primary > .panel-heading {
+ background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+ background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
+ background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
+ background-repeat: repeat-x;
+}
+.panel-success > .panel-heading {
+ background-image: -webkit-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
+ background-image: -o-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#dff0d8), to(#d0e9c6));
+ background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
+ background-repeat: repeat-x;
+}
+.panel-info > .panel-heading {
+ background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
+ background-image: -o-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#d9edf7), to(#c4e3f3));
+ background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
+ background-repeat: repeat-x;
+}
+.panel-warning > .panel-heading {
+ background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
+ background-image: -o-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#fcf8e3), to(#faf2cc));
+ background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
+ background-repeat: repeat-x;
+}
+.panel-danger > .panel-heading {
+ background-image: -webkit-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
+ background-image: -o-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#f2dede), to(#ebcccc));
+ background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
+ background-repeat: repeat-x;
+}
+.well {
+ background-image: -webkit-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
+ background-image: -o-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#f5f5f5));
+ background-image: linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
+ background-repeat: repeat-x;
+ border-color: #dcdcdc;
+ -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
+ box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
+}
+/*# sourceMappingURL=bootstrap-theme.css.map */
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css
new file mode 100644
index 0000000..dc95d8e
--- /dev/null
+++ b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css
@@ -0,0 +1,6 @@
+/*!
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */.btn-danger,.btn-default,.btn-info,.btn-primary,.btn-success,.btn-warning{text-shadow:0 -1px 0 rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075)}.btn-danger.active,.btn-danger:active,.btn-default.active,.btn-default:active,.btn-info.active,.btn-info:active,.btn-primary.active,.btn-primary:active,.btn-success.active,.btn-success:active,.btn-warning.active,.btn-warning:active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-danger.disabled,.btn-danger[disabled],.btn-default.disabled,.btn-default[disabled],.btn-info.disabled,.btn-info[disabled],.btn-primary.disabled,.btn-primary[disabled],.btn-success.disabled,.btn-success[disabled],.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-danger,fieldset[disabled] .btn-default,fieldset[disabled] .btn-info,fieldset[disabled] .btn-primary,fieldset[disab
led] .btn-success,fieldset[disabled] .btn-warning{-webkit-box-shadow:none;box-shadow:none}.btn-danger .badge,.btn-default .badge,.btn-info .badge,.btn-primary .badge,.btn-success .badge,.btn-warning .badge{text-shadow:none}.btn.active,.btn:active{background-image:none}.btn-default{text-shadow:0 1px 0 #fff;background-image:-webkit-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-o-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e0e0e0));background-image:linear-gradient(to bottom,#fff 0,#e0e0e0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#dbdbdb;border-color:#ccc}.btn-default:focus,.btn-default:hover{background-color:#e0e0e0;background-position:0 -15px}.btn-default.active,.btn-default:active{background-color:#e0e0e0;border-c
olor:#dbdbdb}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#e0e0e0;background-image:none}.btn-primary{background-image:-webkit-linear-gradient(top,#337ab7 0,#265a88 100%);background-image:-o-linear-gradient(top,#337ab7 0,#265a88 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#265a88));background-image:linear-gradient(to bottom,#337ab7 0,#265a88 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7',
endColorstr='#ff265a88', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#245580}.btn-primary:focus,.btn-primary:hover{background-color:#265a88;background-position:0 -15px}.btn-primary.active,.btn-primary:active{background-color:#265a88;border-color:#245580}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#265a88;background-image:none}.btn-success{background-image:-webkit-linear-gradient(top,#5c
b85c 0,#419641 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#419641));background-image:linear-gradient(to bottom,#5cb85c 0,#419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:focus,.btn-success:hover{background-color:#419641;background-position:0 -15px}.btn-success.active,.btn-success:active{background-color:#419641;border-color:#3e8f3e}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disab
led] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#419641;background-image:none}.btn-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#2aabd2));background-image:linear-gradient(to bottom,#5bc0de 0,#2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#28a4c9}.btn-info:focus,.btn-info:hover{background-color:#2aabd2;background-position:0 -15px}.btn-info.active,.btn-info:active{background-color:#2aabd2;border-color:#28a4c9}.btn-info.disabled,.btn-info.disabled.active,
.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#2aabd2;background-image:none}.btn-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#eb9316));background-image:linear-gradient(to bottom,#f0ad4e 0,#eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);backgr
ound-repeat:repeat-x;border-color:#e38d13}.btn-warning:focus,.btn-warning:hover{background-color:#eb9316;background-position:0 -15px}.btn-warning.active,.btn-warning:active{background-color:#eb9316;border-color:#e38d13}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#eb9316;background-image:none}.btn-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-webkit-gra
dient(linear,left top,left bottom,from(#d9534f),to(#c12e2a));background-image:linear-gradient(to bottom,#d9534f 0,#c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#b92c28}.btn-danger:focus,.btn-danger:hover{background-color:#c12e2a;background-position:0 -15px}.btn-danger.active,.btn-danger:active{background-color:#c12e2a;border-color:#b92c28}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active
,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#c12e2a;background-image:none}.img-thumbnail,.thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#e8e8e8;background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-repeat:repeat-x}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#2e6da4;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);backgroun
d-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}.navbar-default{background-image:-webkit-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-o-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f8f8f8));background-image:linear-gradient(to bottom,#fff 0,#f8f8f8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075)}.navbar-default .navbar-nav>
.active>a,.navbar-default .navbar-nav>.open>a{background-image:-webkit-linear-gradient(top,#dbdbdb 0,#e2e2e2 100%);background-image:-o-linear-gradient(top,#dbdbdb 0,#e2e2e2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dbdbdb),to(#e2e2e2));background-image:linear-gradient(to bottom,#dbdbdb 0,#e2e2e2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.075);box-shadow:inset 0 3px 9px rgba(0,0,0,.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-o-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#3c3c3c),to(#222));background-image:linear-gradient(to bottom,#3c3c3c 0,#222 100%);filter:progid:DXImageTransform.Microsoft.gradient(start
Colorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-radius:4px}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.open>a{background-image:-webkit-linear-gradient(top,#080808 0,#0f0f0f 100%);background-image:-o-linear-gradient(top,#080808 0,#0f0f0f 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#080808),to(#0f0f0f));background-image:linear-gradient(to bottom,#080808 0,#0f0f0f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.25);box-shadow:inset 0 3px 9px rgba(0,0,0,.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,.25)}.navbar-fixed-bottom,.navbar-fixed-top,.navbar-static-top{border-radius:0}@media (max-width:767px){.navbar .navbar-nav .op
en .dropdown-menu>.active>a,.navbar .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}}.alert{text-shadow:0 1px 0 rgba(255,255,255,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05)}.alert-success{background-image:-webkit-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-webkit-gradient(linear,left top,left bott
om,from(#dff0d8),to(#c8e5bc));background-image:linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);background-repeat:repeat-x;border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#b9def0));background-image:linear-gradient(to bottom,#d9edf7 0,#b9def0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);background-repeat:repeat-x;border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#f8efc0));background-image:linear-gradie
nt(to bottom,#fcf8e3 0,#f8efc0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);background-repeat:repeat-x;border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-o-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#e7c3c3));background-image:linear-gradient(to bottom,#f2dede 0,#e7c3c3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);background-repeat:repeat-x;border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#f5f5f5));background-image:linear-gradient(to bottom,#ebebeb 0,#f5f5f5 100%);filter:progid:DXImageTrans
form.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);background-repeat:repeat-x}.progress-bar{background-image:-webkit-linear-gradient(top,#337ab7 0,#286090 100%);background-image:-o-linear-gradient(top,#337ab7 0,#286090 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#286090));background-image:linear-gradient(to bottom,#337ab7 0,#286090 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0);background-repeat:repeat-x}.progress-bar-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#449d44));background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);b
ackground-repeat:repeat-x}.progress-bar-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#31b0d5));background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);background-repeat:repeat-x}.progress-bar-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#ec971f));background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);background-repeat:repeat-x}.progress-bar-danger{background-image:-webkit-linear-gradient(
top,#d9534f 0,#c9302c 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9534f),to(#c9302c));background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);background-repeat:repeat-x}.progress-bar-striped{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.list-group{border-radius:4px;-webkit
-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{text-shadow:0 -1px 0 #286090;background-image:-webkit-linear-gradient(top,#337ab7 0,#2b669a 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2b669a 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2b669a));background-image:linear-gradient(to bottom,#337ab7 0,#2b669a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2b669a', GradientType=0);background-repeat:repeat-x;border-color:#2b669a}.list-group-item.active .badge,.list-group-item.active:focus .badge,.list-group-item.active:hover .badge{text-shadow:none}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 1px 2px rgba(0,0,0,.05)}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f
5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-repeat:repeat-x}.panel-primary>.panel-heading{background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}.panel-success>.panel-heading{background-image:-webkit-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-webkit-gradient(linear,left t
op,left bottom,from(#dff0d8),to(#d0e9c6));background-image:linear-gradient(to bottom,#dff0d8 0,#d0e9c6 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);background-repeat:repeat-x}.panel-info>.panel-heading{background-image:-webkit-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#c4e3f3));background-image:linear-gradient(to bottom,#d9edf7 0,#c4e3f3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);background-repeat:repeat-x}.panel-warning>.panel-heading{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#faf2cc));background-image:linear-gradie
nt(to bottom,#fcf8e3 0,#faf2cc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);background-repeat:repeat-x}.panel-danger>.panel-heading{background-image:-webkit-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-o-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#ebcccc));background-image:linear-gradient(to bottom,#f2dede 0,#ebcccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);background-repeat:repeat-x}.well{background-image:-webkit-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#e8e8e8),to(#f5f5f5));background-image:linear-gradient(to bottom,#e8e8e8 0,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startCo
lorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);background-repeat:repeat-x;border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1)}
+/*# sourceMappingURL=bootstrap-theme.min.css.map */
\ No newline at end of file
[38/47] roller git commit: Merge pull request #3 from
lbtc-xxx/prevent_annoying_scrolling_in_editpage
Posted by sn...@apache.org.
Merge pull request #3 from lbtc-xxx/prevent_annoying_scrolling_in_editpage
Prevent annoying scrolling in EntryEdit page
Thanks!
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/c206a691
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/c206a691
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/c206a691
Branch: refs/heads/bootstrap-ui
Commit: c206a6916e89424375c1289143e014b1228bd75b
Parents: 8a3e3fc a376348
Author: David M. Johnson <sn...@apache.org>
Authored: Sat Jan 9 11:33:36 2016 -0500
Committer: David M. Johnson <sn...@apache.org>
Committed: Sat Jan 9 11:33:36 2016 -0500
----------------------------------------------------------------------
app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp | 11 ++++++++++-
app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp | 4 ++--
2 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/c206a691/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
----------------------------------------------------------------------
[47/47] roller git commit: Fix bad alignment of buttons below
blogroll table on Safari
Posted by sn...@apache.org.
Fix bad alignment of buttons below blogroll table on Safari
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/a3f685b2
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/a3f685b2
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/a3f685b2
Branch: refs/heads/bootstrap-ui
Commit: a3f685b2289214a5b82e03a5476d0c67bc0b281f
Parents: 3d5d89b
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Apr 10 14:21:44 2016 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Apr 10 14:21:44 2016 -0400
----------------------------------------------------------------------
.../webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp | 91 --------------------
.../webapp/WEB-INF/jsps/editor/Bookmarks.jsp | 45 ++++------
2 files changed, 17 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/a3f685b2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
deleted file mode 100644
index cdb01b9..0000000
--- a/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
+++ /dev/null
@@ -1,91 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. The ASF licenses this file to You
- under the Apache License, Version 2.0 (the "License"); you may not
- use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. For additional information regarding
- copyright in this work, please see the NOTICE file in the top level
- directory of this distribution.
---%>
-<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-
-<%-- Titling, processing actions different between add and edit --%>
-<s:if test="actionName == 'bookmarkEdit'">
- <s:set var="subtitleKey">bookmarkForm.edit.subtitle</s:set>
- <s:set var="mainAction">bookmarkEdit</s:set>
-</s:if>
-<s:else>
- <s:set var="subtitleKey">bookmarkForm.add.subtitle</s:set>
- <s:set var="mainAction">bookmarkAdd</s:set>
-</s:else>
-
-<p class="subtitle">
- <s:text name="%{#subtitleKey}" >
- <s:param value="bookmark.folder.name"/>
- </s:text>
-</p>
-
-<p class="pagetip">
- <s:text name="bookmarkForm.requiredFields">
- <s:param><s:text name="generic.name"/></s:param>
- <s:param><s:text name="bookmarkForm.url"/></s:param>
- </s:text>
-</p>
-
-<s:form>
- <s:hidden name="salt" />
- <s:hidden name="weblog" />
- <%--
- Edit action uses folderId for redirection back to proper bookmarks folder on cancel
- (as configured in struts.xml); add action also, plus to know which folder to put new
- bookmark in.
- --%>
- <s:hidden name="folderId" />
- <s:if test="actionName == 'bookmarkEdit'">
- <%-- bean for bookmark add does not have a bean id yet --%>
- <s:hidden name="bean.id" />
- </s:if>
-
- <table>
-
- <tr>
- <td><s:text name="generic.name" /></td>
- <td><s:textfield name="bean.name" maxlength="255" size="70" style="width:50%"/></td>
- </tr>
-
- <tr>
- <td><s:text name="bookmarkForm.url" /></td>
- <td><s:textfield name="bean.url" maxlength="255" size="70" style="width:50%"/></td>
- </tr>
-
- <tr>
- <td><s:text name="bookmarkForm.rssUrl" /></td>
- <td><s:textfield name="bean.feedUrl" maxlength="255" size="70" style="width:50%"/></td>
- </tr>
-
- <tr>
- <td><s:text name="generic.description" /></td>
- <td><s:textfield name="bean.description" maxlength="255" size="70" style="width:50%"/></td>
- </tr>
-
- <tr>
- <td><s:text name="bookmarkForm.image" /></td>
- <td><s:textfield name="bean.image" maxlength="255" size="70" style="width:50%"/></td>
- </tr>
-
- </table>
-
- <p>
- <s:submit value="%{getText('generic.save')}" action="%{#mainAction}!save"/>
- <s:submit value="%{getText('generic.cancel')}" action="bookmarkEdit!cancel" />
- </p>
-
-</s:form>
http://git-wip-us.apache.org/repos/asf/roller/blob/a3f685b2/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
index 1f52b9a..8313cb9 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
@@ -179,44 +179,33 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
</table>
<%-- Add new blogroll link --%>
- <button type="button"
- class="btn btn-success" style="float:left; margin-right: 0.5em"
- onclick="addBookmark();return false;">
+ <button type="button" class="btn btn-success" onclick="addBookmark();return false;"
+ style="float:left; margin-right: 2em">
<s:text name="bookmarksForm.addBookmark"/>
</button>
- <s:if test="folder.bookmarks.size > 0">
-
- <%-- Delete-selected button --%>
- <input id="delete_selected"
- value="<s:text name="bookmarksForm.delete"/>"
- type="button" class="btn btn-danger" style="float:right; margin-right: 0.5em"
- onclick="confirmDeleteSelected();return false;"/>
-
- </s:if>
-
<s:if test="!allFolders.isEmpty && folder.bookmarks.size > 0">
-
- <%-- Move-to combo-box --%>
- <s:select name="targetFolderId"
- theme="simple" cssClass="form-control" cssStyle="float:right; width:30%; margin-right: 5em"
- list="allFolders" listKey="id" listValue="name"/>
-
<%-- Move-selected button --%>
- <s:submit id="move_selected"
- value="%{getText('bookmarksForm.move')}"
- theme="simple" cssClass="btn btn-warning" cssStyle="float:right; margin-right: 0.5em"
- action="bookmarks!move"
- onclick="onMoveToFolder();return false;"/>
+ <s:submit id="move_selected" value="%{getText('bookmarksForm.move')}" theme="simple"
+ cssClass="btn btn-warning" cssStyle="float:left; margin-right: 0.5em"
+ action="bookmarks!move" onclick="onMoveToFolder();return false;"/>
+ <%-- Move-to combo-box --%>
+ <s:select name="targetFolderId" theme="simple"
+ cssClass="form-control" cssStyle="float:left; width:30%; margin-right: 2em"
+ list="allFolders" listKey="id" listValue="name"/>
+ </s:if>
+ <s:if test="folder.bookmarks.size > 0">
+ <%-- Delete-selected button --%>
+ <input id="delete_selected" value="<s:text name="bookmarksForm.delete"/>" type="button"
+ class="btn btn-danger" style="float:left;"
+ onclick="confirmDeleteSelected();return false;"/>
</s:if>
<s:if test="folder.name != 'default'">
-
<%-- Delete the whole blogroll --%>
-
- <s:submit value="%{getText('bookmarksForm.deleteFolder')}"
- theme="simple" cssClass="btn btn-danger" cssStyle="float:right; clear:left; margin-top:2em"
+ <s:submit value="%{getText('bookmarksForm.deleteFolder')}" theme="simple"
+ cssClass="btn btn-danger" cssStyle="float:right; clear:left; margin-top:2em"
action="bookmarks!deleteFolder"
onclick="confirmDeleteFolder();return false;"/>
[26/47] roller git commit: Merge branch 'trunk' into bootstrap-ui
Posted by sn...@apache.org.
Merge branch 'trunk' into bootstrap-ui
Conflicts:
README.md
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/8925b140
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/8925b140
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/8925b140
Branch: refs/heads/bootstrap-ui
Commit: 8925b1401d814e2a7e1d9a625eca1d08f0ceff72
Parents: 700682a f515dea
Author: Dave Johnson <sn...@gmail.com>
Authored: Sat Dec 26 15:35:05 2015 -0500
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sat Dec 26 15:35:05 2015 -0500
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/8925b140/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 0000000,0000000..bfa6a22
new file mode 100644
--- /dev/null
+++ b/.gitignore
@@@ -1,0 -1,0 +1,1 @@@
++# Created by .ignore support plugin (hsz.mobi)
[22/47] roller git commit: Ready updates
Posted by sn...@apache.org.
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 <sn...@apache.org>
Authored: Tue Dec 22 19:16:35 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
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
[45/47] roller git commit: Blogroll rename implemented
Posted by sn...@apache.org.
Blogroll rename implemented
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/dec85591
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/dec85591
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/dec85591
Branch: refs/heads/bootstrap-ui
Commit: dec85591ee84f620e9c31d5c2606188879f84989
Parents: 8553cb5
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Apr 3 12:49:50 2016 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Apr 3 12:49:50 2016 -0400
----------------------------------------------------------------------
.../resources/ApplicationResources.properties | 6 +-
.../webapp/WEB-INF/jsps/editor/Bookmarks.jsp | 141 ++++++++++++-------
2 files changed, 96 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/dec85591/app/src/main/resources/ApplicationResources.properties
----------------------------------------------------------------------
diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties
index 45b1e2c..f24c31f 100644
--- a/app/src/main/resources/ApplicationResources.properties
+++ b/app/src/main/resources/ApplicationResources.properties
@@ -89,8 +89,8 @@ bookmarksForm.newBlogroll=New blogroll...
bookmarksForm.addBookmark=Add blogroll link
bookmarksForm.addFolder=New blogroll
bookmarksForm.delete=Delete selected
-bookmarksForm.delete.confirm=Delete selected blogroll links?
-bookmarksForm.deleteFolder.confirm=Delete entire blogroll including all its links?
+bookmarksForm.delete.confirm=Confirm Selected Link Delete
+bookmarksForm.delete.areYouSure=Are you sure you want to delete the selected blogroll links?
bookmarksForm.url=URL
bookmarksForm.feedurl=Newsfeed URL
bookmarksForm.folder=Blogroll
@@ -112,7 +112,7 @@ bookmarksForm.editBlogroll.title=Edit Blogroll
bookmarksForm.blogroll.requiredFields=You must specify a blogroll name
blogrollDeleteOK.removeBlogroll=Confirm Blogroll Delete
-blogrollDeleteOK.areYouSure=Are you sure you want to delete blogroll
+blogrollDeleteOK.areYouSure=Are you sure you want to delete blogroll and all of its links?
# --------------------------------------------------------- Bookmarks import.jsp
http://git-wip-us.apache.org/repos/asf/roller/blob/dec85591/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
index d211877..89e8b58 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
@@ -186,7 +186,7 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
<input id="delete_selected"
value="<s:text name="bookmarksForm.delete"/>"
type="button" class="btn btn-danger" style="float:right; margin-right: 0.5em"
- onclick="deleteFolder();return false;"/>
+ onclick="confirmDeleteSelected();return false;"/>
</s:if>
@@ -213,7 +213,7 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
<s:submit value="%{getText('bookmarksForm.deleteFolder')}"
theme="simple" cssClass="btn btn-danger" cssStyle="float:right; clear:left; margin-top:2em"
action="bookmarks!deleteFolder"
- onclick="deleteFolder();return false;"/>
+ onclick="confirmDeleteFolder();return false;"/>
</s:if>
@@ -259,21 +259,7 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
new Option( '<s:text name="bookmarksForm.newBlogroll"/>', "new_blogroll" ));
});
- function nameChanged() {
- var newName = $("#bookmarks_folder_name:first").val();
- if ( newName != originalName ) {
- renameButton.attr("disabled", false );
- renameButton.addClass("btn-success");
-
- renameCancel.attr("disabled", false );
- } else {
- renameButton.attr("disabled", true );
- renameButton.removeClass("btn-success");
-
- renameCancel.attr("disabled", true );
- }
- }
function selectionChanged() {
var checked = false;
@@ -304,8 +290,53 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
}
}
- function renameFolder( event ) {
- event.preventDefault();
+ function nameChanged() {
+ var newName = $("#bookmarks_folder_name:first").val();
+ if ( newName != originalName && newName.trim().length > 0 ) {
+ renameButton.attr("disabled", false );
+ renameButton.addClass("btn-success");
+
+ renameCancel.attr("disabled", false );
+
+ } else {
+ renameButton.attr("disabled", true );
+ renameButton.removeClass("btn-success");
+
+ renameCancel.attr("disabled", true );
+ }
+ }
+
+ function renameFolder() {
+
+ var newName = $("#bookmarks_folder_name:first").val();
+ $("#folderEditForm_bean_name").val(newName);
+
+ var folderId = $("#bookmarks_folderId").val();
+ $("#folderEditForm_bean_id").val(folderId);
+
+ // post blogroll via AJAX
+ var folderEditForm = $("#folderEditForm")[0];
+ $.ajax({
+ method: 'post',
+ url: folderEditForm.attributes["action"].value,
+ data: $("#folderEditForm").serialize(),
+ context: document.body
+
+ }).done(function (data, status, response) {
+
+ // kludge: scrape response status from HTML returned by Struts
+ var alertEnd = data.indexOf("ALERT_END");
+ if (data.indexOf('<s:text name="bookmarkForm.error.duplicateName" />') < alertEnd) {
+ alert('<s:text name="bookmarkForm.error.duplicateName" />');
+
+ } else {
+ originalName = newName;
+ nameChanged();
+ }
+
+ }).error(function (data) {
+ alert('<s:text name="generic.error.check.logs" />');
+ });
}
function cancelRenameFolder( event ) {
@@ -313,35 +344,22 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
nameChanged();
}
- function confirmDelete() {
- // TODO: do not use plain old DHTML confirm here
- if (confirm("<s:text name='bookmarksForm.delete.confirm' />")) {
- document.bookmarks.submit();
- }
+ function confirmDeleteSelected() {
+ $('#delete-links-modal').modal({show: true});
}
- function deleteFolder() {
+ function deleteSelected() {
+ document.bookmarks[0].submit();
+ }
+ function confirmDeleteFolder() {
$('#boomarks_delete_folder_folderId').val( $('#bookmarks_folderId:first').val() );
-
$('#deleteBlogrollName').html('<s:text name="%{folder.name}"/>');
-
$('#delete-blogroll-modal').modal({show: true});
-
- <%--
- if (confirm("<s:text name='bookmarksForm.deleteFolder.confirm' />")) {
- document.bookmarks.action = '<s:url action="bookmarks!deleteFolder" />';
- document.bookmarks.submit();
- }
- --%>
}
function onMoveToFolder() {
- // TODO: do not use plain old DHTML confirm here
- if (confirm("<s:text name='bookmarksForm.move.confirm' />")) {
- document.bookmarks.action = '<s:url action="bookmarks!move" />';
- document.bookmarks.submit();
- }
+ $('#move-links-modal').modal({show: true});
}
function viewChanged() {
@@ -473,6 +491,43 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
<%-- delete blogroll confirmation modal --%>
+<div id="delete-links-modal" class="modal fade delete-links-modal" tabindex="-1" role="dialog">
+
+ <div class="modal-dialog modal-lg">
+
+ <div class="modal-content">
+
+ <div class="modal-header">
+ <h3>
+ <s:text name="bookmarksForm.delete.confirm" />
+ </h3>
+ </div>
+
+ <s:form theme="bootstrap" cssClass="form-horizontal">
+ <div class="modal-body">
+ <s:text name="bookmarksForm.delete.areYouSure"></s:text>
+ </div>
+
+ <div class="modal-footer">
+ <button type="button" class="btn" value="%{getText('generic.yes')}" onclick="deleteSelected()">
+ <s:text name="generic.yes" />
+ </button>
+
+ <button type="button" class="btn btn-default btn-primary" data-dismiss="modal">
+ <s:text name="generic.no" />
+ </button>
+ </div>
+ </s:form>
+
+ </div>
+ </div>
+</div>
+
+
+<%-- ========================================================================================== --%>
+
+<%-- delete blogroll confirmation modal --%>
+
<div id="delete-blogroll-modal" class="modal fade delete-blogroll-modal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg">
@@ -509,16 +564,6 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
</div>
</div>
-<script>
-
- function showBlogrollDeleteModal( id, name ) {
- $('#blogrollRemove_removeId').val(id);
- $('#blogroll-name').html(name);
- $('#delete-remove-modal').modal({show: true});
- }
-
-</script>
-
<%-- ================================================================================================ --%>
[21/47] roller git commit: More progress: the Entries page is
essentially complete.
Posted by sn...@apache.org.
More progress: the Entries page is essentially complete.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/bf13e4f3
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/bf13e4f3
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/bf13e4f3
Branch: refs/heads/bootstrap-ui
Commit: bf13e4f31aa21c76dd1c5e2c0e8aa67891a1da50
Parents: 2da6c3c
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Dec 22 18:27:06 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Dec 22 18:27:06 2015 -0500
----------------------------------------------------------------------
.../main/webapp/WEB-INF/jsps/core/MainMenu.jsp | 39 ++--
.../main/webapp/WEB-INF/jsps/editor/Entries.jsp | 233 +++++++++++--------
.../WEB-INF/jsps/editor/EntriesSidebar.jsp | 151 +++++-------
.../webapp/WEB-INF/jsps/editor/EntryEdit.jsp | 137 ++++++-----
.../webapp/WEB-INF/jsps/editor/EntryEditor.jsp | 16 +-
.../webapp/WEB-INF/jsps/editor/EntrySidebar.jsp | 43 ++--
.../webapp/WEB-INF/jsps/tiles/head-ajax.jsp | 20 +-
app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp | 22 +-
.../main/webapp/WEB-INF/jsps/tiles/messages.jsp | 4 +-
.../WEB-INF/jsps/tiles/tiles-mainmenupage.jsp | 2 +-
.../WEB-INF/jsps/tiles/tiles-tabbedpage.jsp | 7 +-
app/src/main/webapp/roller-ui/styles/roller.css | 31 ++-
12 files changed, 374 insertions(+), 331 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
index 6a5b547..7b57b0d 100644
--- a/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
@@ -122,35 +122,24 @@
<%-- And only show theme option if custom themes are enabled --%>
<s:if test="getProp('themes.customtheme.allowed')">
-
<s:if test="#perms.weblog.editorTheme == 'custom'">
-
- <%-- Templates button --%>
- <button type="button" class="btn btn-default">
- <s:url action="templates" namespace="/roller-ui/authoring" id="weblogTheme">
- <s:param name="weblog" value="#perms.weblog.handle"/>
- </s:url>
- </button>
-
+ <s:url action="templates" namespace="/roller-ui/authoring" id="weblogTheme">
+ <s:param name="weblog" value="#perms.weblog.handle" />
+ </s:url>
</s:if>
<s:else>
-
- <%-- Theme edit button --%>
- <button type="button" class="btn btn-default">
- <s:url action="themeEdit" namespace="/roller-ui/authoring" id="weblogTheme">
- <s:param name="weblog" value="#perms.weblog.handle"/>
- </s:url>
- <span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span>
- <a href='<s:property value="weblogTheme" />'>
- <s:text name="yourWebsites.theme"/></a>
- </button>
-
+ <s:url action="themeEdit" namespace="/roller-ui/authoring" id="weblogTheme">
+ <s:param name="weblog" value="#perms.weblog.handle" />
+ </s:url>
</s:else>
-
+ <button type="button" class="btn btn-default">
+ <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
+ <a href='<s:property value="weblogTheme" />'>
+ <s:text name="yourWebsites.theme" /></a>
+ </button>
</s:if>
-
-
- <%-- Resign button --%>
+
+ <%-- settings button --%>
<button type="button" class="btn btn-default">
<s:url action="weblogConfig" namespace="/roller-ui/authoring" id="manageWeblog">
<s:param name="weblog" value="#perms.weblog.handle"/>
@@ -162,7 +151,7 @@
</s:if>
- <%-- don't allow last admin to resign from blog --%>
+ <%-- don't allow last admin to resign from blog --%>
<s:if test='!(#perms.hasAction("admin") && #perms.weblog.adminUserCount == 1)'>
<button type="button" class="btn btn-default">
http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
index 2aa9d38..27b4aa6 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
@@ -28,76 +28,32 @@
<%-- ============================================================= --%>
-<%-- Number of entries and date message --%>
+<%-- Next / previous links --%>
<%-- ============================================================= --%>
-<div class="tablenav">
-
- <div style="float:left;">
- <s:text name="weblogEntryQuery.nowShowing">
- <s:param value="pager.items.size()" />
- </s:text>
- </div>
- <s:if test="pager.items.size() > 0">
- <div style="float:right;">
- <s:if test="firstEntry.pubTime != null">
- <s:text name="weblogEntryQuery.date.toStringFormat">
- <s:param value="firstEntry.pubTime" />
- </s:text>
- </s:if>
- ---
- <s:if test="lastEntry.pubTime != null">
- <s:text name="weblogEntryQuery.date.toStringFormat">
- <s:param value="lastEntry.pubTime" />
- </s:text>
- </s:if>
- </div>
- </s:if>
- <br />
-
-
- <%-- ============================================================= --%>
- <%-- Next / previous links --%>
- <%-- ============================================================= --%>
-
- <s:if test="pager.prevLink != null && pager.nextLink != null">
- <br /><center>
- «
- <a href='<s:property value="pager.prevLink" />'>
- <s:text name="weblogEntryQuery.prev" /></a>
- | <a href='<s:property value="pager.nextLink" />'>
- <s:text name="weblogEntryQuery.next" /></a>
- »
- </center><br />
- </s:if>
- <s:elseif test="pager.prevLink != null">
- <br /><center>
- «
- <a href='<s:property value="pager.prevLink" />'>
- <s:text name="weblogEntryQuery.prev" /></a>
- | <s:text name="weblogEntryQuery.next" />
- »
- </center><br />
- </s:elseif>
- <s:elseif test="pager.nextLink != null">
- <br /><center>
- «
- <s:text name="weblogEntryQuery.prev" />
- | <a class="" href='<s:property value="pager.nextLink" />'>
- <s:text name="weblogEntryQuery.next" /></a>
- »
- </center><br />
- </s:elseif>
- <s:else><br /></s:else>
+<nav>
+ <ul class="pager">
+ <s:if test="pager.prevLink != null">
+ <li class="previous">
+ <a href='<s:property value="pager.prevLink" />'>
+ <span aria-hidden="true">←</span>Newer</a>
+ </li>
+ </s:if>
+ <s:if test="pager.nextLink != null">
+ <li class="next">
+ <a href='<s:property value="pager.nextLink"/>'>Older
+ <span aria-hidden="true">→</span></a>
+ </li>
+ </s:if>
+ </ul>
+</nav>
-</div> <%-- class="tablenav" --%>
-
<%-- ============================================================= --%>
<%-- Entry table--%>
<%-- ============================================================= --%>
-<p>
+<p style="text-align: center">
<span class="draftEntryBox"> </span>
<s:text name="weblogEntryQuery.draft" />
<span class="pendingEntryBox"> </span>
@@ -106,9 +62,11 @@
<s:text name="weblogEntryQuery.scheduled" />
</p>
-<table class="rollertable" width="100%">
+<table class="rollertable table table-striped" width="100%">
<tr>
+ <th class="rollertable" width="5%"> </th>
+ <th class="rollertable" width="5%"> </th>
<th class="rollertable" width="5%">
<s:text name="weblogEntryQuery.pubTime" />
</th>
@@ -121,12 +79,6 @@
<th class="rollertable" width="5%">
<s:text name="weblogEntryQuery.category" />
</th>
- <th class="rollertable" width="5%">
- </th>
- <th class="rollertable" width="5%">
- </th>
- <th class="rollertable" width="5%">
- </th>
</tr>
<s:iterator id="post" value="pager.items">
@@ -143,6 +95,26 @@
<s:else>
<tr>
</s:else>
+
+ <td>
+ <s:url var="editUrl" action="entryEdit">
+ <s:param name="weblog" value="%{actionWeblog.handle}" />
+ <s:param name="bean.id" value="#post.id" />
+ </s:url>
+ <s:a href="%{editUrl}"><span class="glyphicon glyphicon-edit"></s:a>
+ </td>
+
+ <td>
+ <s:url var="deleteUrl" action="entryRemoveViaList">
+ <s:param name="weblog" value="%{actionWeblog.handle}" />
+ <s:param name="removeId" value="#post.id" />
+ </s:url>
+ <s:set name="postId" value="#post.id" />
+ <s:set name="postTitle" value="#post.title" />
+ <a href="#"
+ onclick="showDeleteModal('<s:property value="postId" />', '<s:property value="postTitle"/>' )">
+ <span class="glyphicon glyphicon-trash"></span></a>
+ </td>
<td>
<s:if test="#post.pubTime != null">
@@ -161,33 +133,18 @@
</td>
<td>
- <str:truncateNicely upper="80"><s:property value="#post.displayTitle" /></str:truncateNicely>
- </td>
-
- <td>
- <s:property value="#post.category.name" />
- </td>
-
- <td>
<s:if test="#post.status.name() == 'PUBLISHED'">
- <a href='<s:property value="#post.permalink" />'><s:text name="weblogEntryQuery.view" /></a>
+ <a href='<s:property value="#post.permalink" />'>
+ <str:truncateNicely upper="80"><s:property value="#post.displayTitle" /></str:truncateNicely>
+ </a>
</s:if>
+ <s:else>
+ <str:truncateNicely upper="80"><s:property value="#post.displayTitle" /></str:truncateNicely>
+ </s:else>
</td>
-
- <td>
- <s:url var="editUrl" action="entryEdit">
- <s:param name="weblog" value="%{actionWeblog.handle}" />
- <s:param name="bean.id" value="#post.id" />
- </s:url>
- <s:a href="%{editUrl}"><s:text name="generic.edit" /></s:a>
- </td>
-
+
<td>
- <s:url var="deleteUrl" action="entryRemoveViaList">
- <s:param name="weblog" value="%{actionWeblog.handle}" />
- <s:param name="removeId" value="#post.id" />
- </s:url>
- <s:a href="%{deleteUrl}"><s:text name="generic.delete" /></s:a>
+ <s:property value="#post.category.name" />
</td>
</tr>
@@ -195,7 +152,97 @@
</table>
+
+<%-- ============================================================= --%>
+<%-- Next / previous links --%>
+<%-- ============================================================= --%>
+
+<nav>
+ <ul class="pager">
+ <s:if test="pager.prevLink != null">
+ <li class="previous">
+ <a href='<s:property value="pager.prevLink" />'>
+ <span aria-hidden="true">←</span> Older</a>
+ </li>
+ </s:if>
+ <s:if test="pager.nextLink != null">
+ <li class="next">
+ <a href='<s:property value="pager.nextLink"/>'>Newer
+ <span aria-hidden="true">→</span></a>
+ </li>
+ </s:if>
+ </ul>
+</nav>
+
<s:if test="pager.items.isEmpty">
<s:text name="weblogEntryQuery.noneFound" />
- <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />
</s:if>
+
+
+<div id="delete-entry-modal" class="modal fade delete-entry-modal" tabindex="-1" role="dialog">
+
+ <div class="modal-dialog modal-lg">
+
+ <div class="modal-content">
+
+ <s:set var="deleteAction">entryRemoveViaList!remove</s:set>
+
+ <s:form action="%{#deleteAction}" theme="bootstrap">
+ <s:hidden name="salt"/>
+ <s:hidden name="weblog"/>
+ <s:hidden name="removeId" id="removeId"/>
+
+ <div class="modal-header">
+ <div class="modal-title">
+ <h3><s:text name="weblogEntryRemove.removeWeblogEntry"/></h3>
+ <p><s:text name="weblogEntryRemove.areYouSure"/></p>
+ </div>
+ </div>
+
+ <div class="modal-header">
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">
+ <s:text name="weblogEntryRemove.entryTitle"/>
+ </label>
+ <div class="col-sm-9 controls">
+ <p class="form-control-static" style="padding-top:0px" id="postTitleLabel"></p>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">
+ <s:text name="weblogEntryRemove.entryId"/>
+ </label>
+ <div class="col-sm-9 controls">
+ <p class="form-control-static" style="padding-top:0px" id="postIdLabel"></p>
+ </div>
+ </div>
+
+ </div>
+
+ <div class="modal-footer">
+ <s:submit cssClass="btn" value="%{getText('generic.yes')}"/>
+ <button type="button" class="btn btn-default btn-primary" data-dismiss="modal">
+ <s:text name="generic.no" />
+ </button>
+ </div>
+
+ </s:form>
+
+ </div>
+
+ </div>
+
+</div>
+
+<script>
+ function showDeleteModal( postId, postTitle ) {
+ $('#postIdLabel').html(postId);
+ $('#postTitleLabel').html(postTitle);
+ $('#removeId').val(postId);
+ $('#delete-entry-modal').modal({show: true});
+ }
+</script>
+
+
http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
index c1903db..8d9f376 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
@@ -17,8 +17,7 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css"/>' />
-<script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script>
+<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css"/>'/>
<script src='<s:url value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js"/>'></script>
<div class="sidebarFade">
@@ -27,128 +26,106 @@
<div class="sidebarInner">
- <h3><s:text name="weblogEntryQuery.sidebarTitle" /></h3>
- <hr size="1" noshade="noshade" />
+ <h3><s:text name="weblogEntryQuery.sidebarTitle"/></h3>
+ <hr size="1" noshade="noshade"/>
- <p><s:text name="weblogEntryQuery.sidebarDescription" /></p>
+ <p><s:text name="weblogEntryQuery.sidebarDescription"/></p>
- <s:form action="entries">
- <s:hidden name="salt" />
- <s:hidden name="weblog" />
+ <s:form action="entries" theme="bootstrap" cssClass="form-vertical">
+ <s:hidden name="salt"/>
+ <s:hidden name="weblog"/>
<%-- ========================================================= --%>
<%-- filter by category --%>
- <div class="sideformrow">
- <label for="categoryId" class="sideformrow">
- <s:text name="weblogEntryQuery.label.category" /></label>
- <s:select name="bean.categoryName" list="categories" listKey="name" listValue="name" size="1" />
- </div>
- <br />
- <br />
+ <s:select name="bean.categoryName"
+ label="%{getText('weblogEntryQuery.label.category')}"
+ list="categories" listKey="name" listValue="name" size="1"/>
<%-- ========================================================= --%>
<%-- filter by tag --%>
- <div class="sideformrow">
- <label for="tags" class="sideformrow">
- <s:text name="weblogEntryQuery.label.tags" /></label>
- <s:textfield name="bean.tagsAsString" size="14" />
- </div>
- <br />
- <br />
+ <s:textfield name="bean.tagsAsString" size="14"
+ label="%{getText('weblogEntryQuery.label.tags')}"/>
<%-- ========================================================= --%>
<%-- filter by text --%>
- <div class="sideformrow">
- <label for="text" class="sideformrow">
- <s:text name="weblogEntryQuery.label.text" /></label>
- <s:textfield name="bean.text" size="14" />
- </div>
- <br />
- <br />
+ <s:textfield name="bean.text" size="14"
+ label="%{getText('weblogEntryQuery.label.text')}"/>
<%-- ========================================================= --%>
<%-- filter by date --%>
- <div class="sideformrow">
- <label for="startDateString" class="sideformrow"><s:text name="weblogEntryQuery.label.startDate" />:</label>
- <script>
- $(function() {
- $( "#entries_bean_startDateString" ).datepicker({
- showOn: "button",
- buttonImage: "../../images/calendar.png",
- buttonImageOnly: true,
- changeMonth: true,
- changeYear: true
- });
+ <script>
+ $(function () {
+ $("#entries_bean_startDateString").datepicker();
});
- </script>
- <s:textfield name="bean.startDateString" size="12" readonly="true"/>
- </div>
+ </script>
- <div class="sideformrow">
- <label for="endDateString" class="sideformrow"><s:text name="weblogEntryQuery.label.endDate" />:</label>
- <script>
- $(function() {
- $( "#entries_bean_endDateString" ).datepicker({
- showOn: "button",
- buttonImage: "../../images/calendar.png",
- buttonImageOnly: true,
- changeMonth: true,
- changeYear: true
- });
+ <div class="control-group">
+ <label for="bean.startDateString" class="control-label">
+ <s:text name="weblogEntryQuery.label.startDate" />
+ </label>
+ <div class="controls">
+ <div class="input-group">
+
+ <s:textfield name="bean.startDateString" readonly="true"
+ theme="simple" cssClass="date-picker form-control" />
+ <label for="bean.startDateString" class="input-group-addon btn">
+ <span class="glyphicon glyphicon-calendar"></span>
+ </label>
+
+ </div>
+ </div>
+ </div>
+
+ <script>
+ $(function () {
+ $("#entries_bean_endDateString").datepicker();
});
- </script>
- <s:textfield name="bean.endDateString" size="12" readonly="true"/>
+ </script>
+
+ <div class="control-group">
+ <label for="bean.endDateString" class="control-label">
+ <s:text name="weblogEntryQuery.label.endDate" />
+ </label>
+ <div class="controls">
+ <div class="input-group">
+
+ <s:textfield name="bean.endDateString" readonly="true"
+ theme="simple" cssClass="date-picker form-control" />
+ <label for="bean.endDateString" class="input-group-addon btn">
+ <span class="glyphicon glyphicon-calendar"></span>
+ </label>
+
+ </div>
+ </div>
</div>
- <br />
- <br />
+ <br/>
+
<%-- ========================================================= --%>
<%-- filter by status --%>
- <div class="sideformrow">
- <label for="status" class="sideformrow">
- <s:text name="weblogEntryQuery.label.status" />:
- <br />
- <br />
- <br />
- <br />
- <br />
- <br />
- </label>
- <div>
- <s:radio theme="roller" name="bean.status" list="statusOptions" listKey="key" listValue="value" />
- </div>
- </div>
+ <s:radio name="bean.status"
+ label="%{getText('weblogEntryQuery.label.status')}"
+ list="statusOptions" listKey="key" listValue="value"/>
<%-- ========================================================= --%>
<%-- sort by --%>
- <div class="sideformrow">
- <label for="status" class="sideformrow">
- <s:text name="weblogEntryQuery.label.sortby" />:
- <br />
- <br />
- </label>
- <div>
- <s:radio theme="roller" name="bean.sortBy" list="sortByOptions" listKey="key" listValue="value" />
- </div>
- </div>
+ <s:radio name="bean.sortBy"
+ label="%{getText('weblogEntryQuery.label.sortby')}"
+ list="sortByOptions" listKey="key" listValue="value"/>
<%-- ========================================================= --%>
<%-- search button --%>
- <br />
-
- <s:submit value="%{getText('weblogEntryQuery.button.query')}" />
+ <s:submit cssClass="btn" value="%{getText('weblogEntryQuery.button.query')}"/>
</s:form>
- <br />
- <br />
</div> <!-- sidebarInner -->
</div>
http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
index 1a54a2f..b5ba20b 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
@@ -57,81 +57,92 @@
<%-- Title, category, dates and other metadata --%>
<%-- title --%>
- <s:textfield label="%{getText('weblogEdit.title')}" name="bean.title" maxlength="255" tabindex="1"/>
-
- <%-- status --%>
- <div class="form-group">
- <label class="col-sm-3 control-label" for="weblogEdit.status"><s:text name="weblogEdit.status"/></label>
-
- <div class="col-sm-9 controls">
- <s:if test="bean.published">
- <span class="label label-success">
- <s:text name="weblogEdit.published"/>
- (<s:text name="weblogEdit.updateTime"/>
- <s:date name="entry.updateTime"/>)
- </span>
- </s:if>
- <s:elseif test="bean.draft">
- <span class="label label-info">
- <s:text name="weblogEdit.draft"/>
- (<s:text name="weblogEdit.updateTime"/>
- <s:date name="entry.updateTime"/>)
- </span>
- </s:elseif>
- <s:elseif test="bean.pending">
- <span class="label label-warning">
- <s:text name="weblogEdit.pending"/>
- (<s:text name="weblogEdit.updateTime"/>
- <s:date name="entry.updateTime"/>)
- </span>
- </s:elseif>
- <s:elseif test="bean.scheduled">
- <span class="label label-info">
- <s:text name="weblogEdit.scheduled"/>
- (<s:text name="weblogEdit.updateTime"/>
- <s:date name="entry.updateTime"/>)
- </span>
- </s:elseif>
- <s:else>
- <span class="label label-danger"><s:text name="weblogEdit.unsaved"/></span>
- </s:else>
- </div>
-
- </div>
+ <s:textfield label="%{getText('weblogEdit.title')}" name="bean.title" maxlength="255" tabindex="1" />
<%-- permalink --%>
<s:if test="actionName == 'entryEdit'">
<div class="form-group">
- <label for="entry_bean_permalink"><s:text name="weblogEdit.permaLink"/></label>
- <s:if test="bean.published">
- <a id="entry_bean_permalink" href='<s:property value="entry.permalink" />'>
- <s:property value="entry.permalink"/>
- </a>
- <img src='<s:url value="/images/launch-link.png"/>'/>
- </s:if>
- <s:else>
- <s:property value="entry.permalink"/>
- </s:else>
+
+ <label class="col-sm-3 control-label" for="entry_bean_permalink">
+ <s:text name="weblogEdit.permaLink"/>
+ </label>
+
+ <div class="col-sm-9 controls">
+ <p class="form-control-static">
+ <s:if test="bean.published">
+ <a id="entry_bean_permalink" href='<s:property value="entry.permalink" />'>
+ <s:property value="entry.permalink"/>
+ </a>
+ <img src='<s:url value="/images/launch-link.png"/>'/>
+ </s:if>
+ <s:else>
+ <s:property value="entry.permalink"/>
+ </s:else>
+ </p>
+ </div>
+
</div>
</s:if>
<%-- tags --%>
<s:textfield label="%{getText('weblogEdit.tags')}" id="tagAutoComplete" name="bean.tagsAsString"
- maxlength="255" tabindex="3"/>
+ maxlength="255" tabindex="2"/>
<%-- category --%>
<s:select label="%{getText('weblogEdit.category')}" name="bean.categoryId"
- list="categories" listKey="id" listValue="name"/>
+ list="categories" listKey="id" listValue="name" tabindex="3" />
<s:if test="actionWeblog.enableMultiLang">
+ <%-- locale --%>
<s:select label="%{getText('weblogEdit.locale')}" name="bean.locale" size="1"
- list="localesList" listValue="displayName"/>
+ list="localesList" listValue="displayName" tabindex="4"/>
</s:if>
-
<s:else>
<s:hidden name="bean.locale"/>
</s:else>
+ <%-- status --%>
+ <div class="form-group">
+ <label class="col-sm-3 control-label" for="weblogEdit.status"><s:text name="weblogEdit.status"/></label>
+
+ <div class="col-sm-9 controls">
+ <p class="form-control-static">
+ <s:if test="bean.published">
+ <span class="label label-success">
+ <s:text name="weblogEdit.published"/>
+ (<s:text name="weblogEdit.updateTime"/>
+ <s:date name="entry.updateTime"/>)
+ </span>
+ </s:if>
+ <s:elseif test="bean.draft">
+ <span class="label label-info">
+ <s:text name="weblogEdit.draft"/>
+ (<s:text name="weblogEdit.updateTime"/>
+ <s:date name="entry.updateTime"/>)
+ </span>
+ </s:elseif>
+ <s:elseif test="bean.pending">
+ <span class="label label-warning">
+ <s:text name="weblogEdit.pending"/>
+ (<s:text name="weblogEdit.updateTime"/>
+ <s:date name="entry.updateTime"/>)
+ </span>
+ </s:elseif>
+ <s:elseif test="bean.scheduled">
+ <span class="label label-info">
+ <s:text name="weblogEdit.scheduled"/>
+ (<s:text name="weblogEdit.updateTime"/>
+ <s:date name="entry.updateTime"/>)
+ </span>
+ </s:elseif>
+ <s:else>
+ <span class="label label-danger"><s:text name="weblogEdit.unsaved"/></span>
+ </s:else>
+ </p>
+ </div>
+
+ </div>
+
<div class="panel-group" id="accordion">
@@ -147,13 +158,13 @@
<div class="panel-heading">
<h4 class="panel-title">
- <a aria-expanded="false"
- data-toggle="collapse" data-target="#collapsePlugins" href="#collapsePlugins">
+ <a class="collapsed" data-toggle="collapse" data-target="#collapsePlugins"
+ href="#collapsePlugins">
<s:text name="weblogEdit.pluginsToApply"/> </a>
</h4>
</div>
- <div id="collapsePlugins" class="panel-collapse collapse in">
+ <div id="collapsePlugins" class="panel-collapse collapse">
<div class="panel-body">
<s:checkboxlist name="bean.plugins" list="entryPlugins" listKey="name" listValue="name"/>
@@ -170,13 +181,13 @@
<div class="panel-heading">
<h4 class="panel-title">
- <a class="accordion-toggle" aria-expanded="false"
- data-toggle="collapse" data-parent="#collapseAdvanced" href="#collapseAdvanced">
+ <a class="collapsed" data-toggle="collapse" data-parent="#collapseAdvanced"
+ href="#collapseAdvanced">
<s:text name="weblogEdit.miscSettings"/> </a>
</h4>
</div>
- <div id="collapseAdvanced" class="panel-collapse collapse in">
+ <div id="collapseAdvanced" class="panel-collapse collapse">
<div class="panel-body">
<div class="form-group">
@@ -327,8 +338,7 @@
<%-- ================================================================== --%>
- <%-- Trackback control --%>
-
+ <%-- Trackback control
<s:if test="actionName == 'entryEdit' && userAnAuthor">
<br/>
<h2><s:text name="weblogEdit.trackback"/></h2>
@@ -338,6 +348,7 @@
<s:submit value="%{getText('weblogEdit.sendTrackback')}" action="entryEdit!trackback"/>
</s:if>
+ --%>
</s:form>
http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
index d881f87..110b07f 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
@@ -34,11 +34,13 @@
<div id="collapseContentEditor" class="panel-collapse collapse in">
<div class="panel-body">
- <span style="font-weight:normal;float:right;">
+ <s:textarea id="edit_content" name="bean.text"
+ tabindex="5" rows="18" cssClass="col-sm-12" theme="simple"
+ />
+
+ <span>
<a href="#" onClick="onClickAddImage();"><s:text name="weblogEdit.insertMediaFile"/></a>
</span>
-
- <s:textarea id="edit_content" name="bean.text" cols="75" rows="25" tabindex="5"/>
</div>
</div>
@@ -50,18 +52,18 @@
<div class="panel-heading">
<h4 class="panel-title">
- <a href="#collapseSummaryEditor"
- aria-controls="collapseSummaryEditor" aria-expanded="false"
+ <a href="#collapseSummaryEditor" class="collapsed"
data-toggle="collapse" data-target="#collapseSummaryEditor" >
<s:text name="weblogEdit.summary"/>
</a>
</h4>
</div>
- <div id="collapseSummaryEditor" class="panel-collapse collapse in">
+ <div id="collapseSummaryEditor" class="panel-collapse collapse">
<div class="panel-body">
- <s:textarea id="edit_summary" name="bean.summary" cols="75" rows="10" tabindex="6"/>
+ <s:textarea id="edit_summary" name="bean.summary"
+ tabindex="6" rows="10" cssClass="col-sm-12" theme="simple" />
</div>
</div>
http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp
index 39b7428..8d4b1a2 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp
@@ -22,6 +22,8 @@
<div class="menu-tl">
<div class="sidebarInner">
+
+ <%-- comments on this entry --%>
<h3><s:text name="weblogEdit.comments" /></h3>
@@ -38,7 +40,9 @@
<s:else>
<span><s:text name="generic.none" /></span>
</s:else>
-
+
+ <%-- pending entries --%>
+
<hr size="1" noshade="noshade" />
<h3><s:text name="weblogEdit.pendingEntries" /></h3>
@@ -52,12 +56,13 @@
<s:param name="weblog" value="%{actionWeblog.handle}" />
<s:param name="bean.id" value="#post.id" />
</s:url>
- <img src='<s:url value="/images/table_error.png"/>'
- align="absmiddle" border="0" alt="icon" title="Edit" />
- <s:a href="%{editUrl}"><str:truncateNicely lower="50"><s:property value="#post.title" /></str:truncateNicely></s:a>
+ <span class="glyphicon glyphicon-lock" aria-hidden="true"> </span>
+ <s:a href="%{editUrl}"><str:truncateNicely lower="70">
+ <s:property value="#post.title" /></str:truncateNicely></s:a>
</span><br />
</s:iterator>
-
+
+ <%-- draft entries --%>
<hr size="1" noshade="noshade" />
<h3><s:text name="weblogEdit.draftEntries" /></h3>
@@ -72,15 +77,17 @@
<s:param name="weblog" value="%{actionWeblog.handle}" />
<s:param name="bean.id" value="#post.id" />
</s:url>
- <img src='<s:url value="/images/table_edit.png"/>'
- align="absmiddle" border="0" alt="icon" title="Edit" />
- <s:a href="%{editUrl}"><str:truncateNicely lower="50"><s:property value="#post.title" /></str:truncateNicely></s:a>
+ <span class="glyphicon glyphicon-edit" aria-hidden="true"> </span>
+ <s:a href="%{editUrl}"><str:truncateNicely lower="70">
+ <s:property value="#post.title" /></str:truncateNicely></s:a>
</span><br />
</s:iterator>
<s:if test="userAnAuthor">
-
+
+ <%-- published entries --%>
+
<hr size="1" noshade="noshade" />
<h3><s:text name="weblogEdit.publishedEntries" /></h3>
@@ -94,13 +101,15 @@
<s:param name="weblog" value="%{actionWeblog.handle}" />
<s:param name="bean.id" value="#post.id" />
</s:url>
- <img src='<s:url value="/images/table_edit.png"/>'
- align="absmiddle" border="0" alt="icon" title="Edit" />
- <s:a href="%{editUrl}"><str:truncateNicely lower="50"><s:property value="#post.title" /></str:truncateNicely></s:a>
+ <span class="glyphicon glyphicon-book" aria-hidden="true"> </span>
+ <s:a href="%{editUrl}"><str:truncateNicely lower="70">
+ <s:property value="#post.title" /></str:truncateNicely></s:a>
</span><br />
</s:iterator>
-
-
+
+
+ <%-- scheduled entries --%>
+
<hr size="1" noshade="noshade" />
<h3><s:text name="weblogEdit.scheduledEntries" /></h3>
@@ -114,9 +123,9 @@
<s:param name="weblog" value="%{actionWeblog.handle}" />
<s:param name="bean.id" value="#post.id" />
</s:url>
- <img src='<s:url value="/images/table_edit.png"/>'
- align="absmiddle" border="0" alt="icon" title="Edit" />
- <s:a href="%{editUrl}"><str:truncateNicely lower="50"><s:property value="#post.title" /></str:truncateNicely></s:a>
+ <span class="glyphicon glyphicon-time" aria-hidden="true"> </span>
+ <s:a href="%{editUrl}"><str:truncateNicely lower="70">
+ <s:property value="#post.title" /></str:truncateNicely></s:a>
</span><br />
</s:iterator>
http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp
index 2acbab6..2a978ba 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp
@@ -5,31 +5,21 @@ You can override it with your own file via WEB-INF/tiles-def.xml
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<%--
-<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssreset/cssreset-min.css'/>" />
-<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssfonts/cssfonts-min.css'/>" />
-<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssbase/cssbase-min.css'/>" />
-<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/layout.css"/>' />
-<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' />
-<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/menu.css"/>' />
-<link rel="stylesheet" media="all" href="<s:url value="/roller-ui/theme/"/><s:property value="getProp('editor.theme')" />/colors.css" />
---%>
-
-<%-- jquery and bootstrap --%>
-
+<%-- jquery --%>
<script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script>
+
+<%-- bootstrap --%>
<link rel="stylesheet" media="all"
href='<s:url value="/roller-ui/bootstrap-3.3.6-dist/css/bootstrap.min.css"/>' />
<link rel="stylesheet" media="all"
href='<s:url value="/roller-ui/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css"/>' />
<script src="<s:url value="/roller-ui/bootstrap-3.3.6-dist/js/bootstrap.min.js"/>"></script>
-<%-- the links generated by the Struts-Bootstrap plugin are 404s --%>
-
+<%-- the links generated by the Struts-Bootstrap plugin are 404s
<sb:head includeScripts="false" includeScriptsValidation="false"/>
+--%>
<%-- roller Javascropt and styles --%>
-
<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' />
<script src="<s:url value="/theme/scripts/roller.js"/>"></script>
http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
index 23efc18..7b7291c 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
@@ -5,30 +5,20 @@ You can override it with your own file via WEB-INF/tiles-def.xml
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<%--
-<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssreset/cssreset-min.css'/>" />
-<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssfonts/cssfonts-min.css'/>" />
-<link rel="stylesheet" media="all" href="<s:url value='/roller-ui/yui3/cssbase/cssbase-min.css'/>" />
-<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/layout.css"/>' />
-<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' />
-<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/menu.css"/>' />
-<link rel="stylesheet" media="all" href="<s:url value="/roller-ui/theme/"/><s:property value="getProp('editor.theme')" />/colors.css" />
---%>
-
-<%-- jquery and bootstrap --%>
-
+<%-- jquery --%>
<script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script>
+
+<%-- bootstrap --%>
<link rel="stylesheet" media="all"
href='<s:url value="/roller-ui/bootstrap-3.3.6-dist/css/bootstrap.min.css"/>' />
<link rel="stylesheet" media="all"
href='<s:url value="/roller-ui/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css"/>' />
<script src="<s:url value="/roller-ui/bootstrap-3.3.6-dist/js/bootstrap.min.js"/>"></script>
-<%-- the links generated by the Struts-Bootstrap plugin are 404s --%>
-
-<sb:head includeScripts="false" includeScriptsValidation="false"/>
+<%-- the links generated by the Struts-Bootstrap plugin are 404s
+<sb:head includeScripts="false" includeScriptsValidation="false"></sb:head>
+--%>
<%-- roller Javascropt and styles --%>
-
<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/styles/roller.css"/>' />
<script src="<s:url value="/theme/scripts/roller.js"/>"></script>
http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
index 5e54d5c..164ca5a 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
@@ -19,14 +19,14 @@
<%-- Success Messages --%>
<s:if test="!actionMessages.isEmpty">
- <div id="messages" class="messages">
+ <div id="messages" class="alert alert-success">
<s:actionmessage />
</div>
</s:if>
<%-- Error Messages --%>
<s:if test="!actionErrors.isEmpty || !fieldErrors.isEmpty">
- <div id="errors" class="errors">
+ <div id="errors" class="alert alert-danger">
<ul>
<s:iterator id="actionError" value="actionErrors">
<li><s:property value="#actionError" escape="false" /></li>
http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
index 9f5c3c5..0c89f15 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
@@ -47,7 +47,7 @@
<div class="panel panel-default">
<div class="panel-body">
- <h1><s:property value="pageTitle"/></h1>
+ <h2 class="roller-page-title"><s:property value="pageTitle"/></h2>
<tiles:insertAttribute name="messages"/>
<tiles:insertAttribute name="content"/>
</div>
http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
index acf44be..7a735d1 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
@@ -23,7 +23,6 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="icon" href="<%= request.getContextPath() %>/favicon.ico" type="image/x-icon">
<title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle"/></title>
-
<tiles:insertAttribute name="head"/>
<style> <tiles:insertAttribute name="styles" /> </style>
</head>
@@ -32,16 +31,16 @@
<tiles:insertAttribute name="bannerStatus"/>
<div class="row">
- <div class="col-md-9 roller-column-left">
+ <div class="col-md-8 roller-column-left">
<div class="panel panel-default">
<div class="panel-body">
- <h2><s:property value="pageTitle"/></h2>
<tiles:insertAttribute name="messages"/>
+ <h2 class="roller-page-title"><s:property value="pageTitle"/></h2>
<tiles:insertAttribute name="content"/>
</div>
</div>
</div>
- <div class="col-md-3 roller-column-right">
+ <div class="col-md-4 roller-column-right">
<div class="panel panel-default">
<div class="panel-body">
<s:if test="authenticatedUser != null || actionWeblog != null">
http://git-wip-us.apache.org/repos/asf/roller/blob/bf13e4f3/app/src/main/webapp/roller-ui/styles/roller.css
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/roller-ui/styles/roller.css b/app/src/main/webapp/roller-ui/styles/roller.css
index ca0f28d..4677e46 100644
--- a/app/src/main/webapp/roller-ui/styles/roller.css
+++ b/app/src/main/webapp/roller-ui/styles/roller.css
@@ -23,7 +23,8 @@ table {
}
.roller-page-title {
- text-align: center;
+ margin-top: 0px;
+ margin-bottom: 5px;
}
.roller-column-right {
@@ -36,6 +37,8 @@ table {
padding-right: 1em;
}
+.date-form { margin: 10px; }
+
/* main menu */
.mm_subtable_label {
@@ -78,6 +81,32 @@ table.mm_table_actions td {
z-index: 10000 !important;
}
+/* entries page */
+
+.scheduledEntryBox {
+ background: #EEEEE0;
+ border: 1px gray solid;
+}
+
+.pendingEntryBox {
+ background: #ffcccc;
+ border: 1px gray solid;
+}
+
+.draftEntryBox {
+ background: #ffffcc;
+ border: 1px gray solid;
+}
+
+td.pendingentry, tr.pendingentry {
+ background: #ffcccc;
+}
+td.draftentry, tr.draftentry {
+ background: #ffffcc;
+}
+td.scheduledentry, tr.scheduledentry {
+ background: #EEEEE0;
+}
/* sign-in */
[12/47] roller git commit: Texan will fail if these directories are
not present.
Posted by sn...@apache.org.
Texan will fail if these directories are not present.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/624ad3b2
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/624ad3b2
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/624ad3b2
Branch: refs/heads/bootstrap-ui
Commit: 624ad3b21f1824bbc01bbfa2423e86fe2ca62f44
Parents: 35c2b8d
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Dec 16 10:53:56 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Dec 16 10:53:56 2015 -0500
----------------------------------------------------------------------
app/src/main/resources/sql/db2/.gitkeep | 0
app/src/main/resources/sql/derby/.gitkeep | 0
app/src/main/resources/sql/mssql/.gitkeep | 0
app/src/main/resources/sql/mysql/.gitkeep | 0
app/src/main/resources/sql/oracle/.gitkeep | 0
app/src/main/resources/sql/postgresql/.gitkeep | 0
6 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/624ad3b2/app/src/main/resources/sql/db2/.gitkeep
----------------------------------------------------------------------
diff --git a/app/src/main/resources/sql/db2/.gitkeep b/app/src/main/resources/sql/db2/.gitkeep
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/roller/blob/624ad3b2/app/src/main/resources/sql/derby/.gitkeep
----------------------------------------------------------------------
diff --git a/app/src/main/resources/sql/derby/.gitkeep b/app/src/main/resources/sql/derby/.gitkeep
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/roller/blob/624ad3b2/app/src/main/resources/sql/mssql/.gitkeep
----------------------------------------------------------------------
diff --git a/app/src/main/resources/sql/mssql/.gitkeep b/app/src/main/resources/sql/mssql/.gitkeep
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/roller/blob/624ad3b2/app/src/main/resources/sql/mysql/.gitkeep
----------------------------------------------------------------------
diff --git a/app/src/main/resources/sql/mysql/.gitkeep b/app/src/main/resources/sql/mysql/.gitkeep
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/roller/blob/624ad3b2/app/src/main/resources/sql/oracle/.gitkeep
----------------------------------------------------------------------
diff --git a/app/src/main/resources/sql/oracle/.gitkeep b/app/src/main/resources/sql/oracle/.gitkeep
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/roller/blob/624ad3b2/app/src/main/resources/sql/postgresql/.gitkeep
----------------------------------------------------------------------
diff --git a/app/src/main/resources/sql/postgresql/.gitkeep b/app/src/main/resources/sql/postgresql/.gitkeep
new file mode 100644
index 0000000..e69de29
[29/47] roller git commit: clean-up no longer used code
Posted by sn...@apache.org.
clean-up no longer used code
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/8042fd7b
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/8042fd7b
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/8042fd7b
Branch: refs/heads/bootstrap-ui
Commit: 8042fd7ba439e55ace25e1f3175b2233f177ff40
Parents: 5bd3c53
Author: Dave Johnson <sn...@gmail.com>
Authored: Mon Dec 28 10:10:22 2015 -0500
Committer: Dave Johnson <sn...@gmail.com>
Committed: Mon Dec 28 10:10:22 2015 -0500
----------------------------------------------------------------------
.../WEB-INF/jsps/editor/CategoriesSidebar.jsp | 80 --------------------
1 file changed, 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/8042fd7b/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
index 81a0b7a..e9cb78f 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
@@ -32,46 +32,6 @@
</a>
</p>
-
-<%--
-<div id="category-add-modal" class="modal fade category-add-modal" tabindex="-1" role="dialog">
-
- <div class="modal-dialog modal-lg">
-
- <div class="modal-content">
-
- <div class="modal-header">
- <h3><s:text name="categoryForm.add.title"/></h3>
- </div>
-
- <div class="modal-body">
- <s:form id="categoryAddForm" theme="bootstrap" cssClass="form-horizontal">
- <s:hidden name="salt"/>
- <s:hidden name="weblog"/>
-
- <s:hidden name="action:categoryAdd!save" value="save"/>
-
- <s:textfield name="bean.name" label="%{getText('generic.name')}" maxlength="255"/>
- <s:textfield name="bean.description" label="%{getText('generic.description')}"/>
- <s:textfield name="bean.image" label="%{getText('categoryForm.image')}"/>
- </s:form>
- </div>
-
- <div class="modal-footer">
- <p id="feedback-area"></p>
- <button onclick="submitNewCategory()" class="btn btn-primary">
- <s:text name="generic.save"/>
- </button>
- <button type="button" class="btn" data-dismiss="modal">
- <s:text name="generic.cancel"/>
- </button>
- </div>
-
- </div>
- </div>
-</div>
---%>
-
<script>
var feedbackArea = $("#feedback-area");
@@ -91,43 +51,3 @@
</script>
- <%--
- function submitNewCategory() {
-
- // if name is empty reject and show error message
- if ( $("#categoryAddForm_bean_name").val().trim() == "" ) {
- feedbackArea.html('<s:text name="categoryForm.requiredFields" />');
- feedbackArea.css("color", "red");
- return;
- }
-
-
- // post category via AJAX
- $.ajax({
- method: 'post',
- url: "categoryEdit!save.rol",
- data: $("#categoryAddForm").serialize(),
- context: document.body
-
- }).done(function(data) {
-
- // kludge: scrape response status from HTML returned by Struts
- var alertEnd = data.indexOf("ALERT_END");
- if ( data.indexOf( '<s:text name="categoryForm.error.duplicateName" />' ) < alertEnd ) {
- feedbackArea.css("color", "red");
- feedbackArea.html('<s:text name="categoryForm.error.duplicateName" />');
-
- } else {
- feedbackArea.css("color", "green");
- feedbackArea.html('<s:text name="categoryForm.created" />');
- $('#category-add-modal').modal("hide");
- }
-
- }).error(function(data) {
- feedbackArea.html('<s:text name="generic.error.check.logs" />');
- feedbackArea.css("color", "red");
- });
- }
-
-</script>
---%>
[04/47] roller git commit: Remove unnecessary text.
Posted by sn...@apache.org.
Remove unnecessary text.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/d7eaa93d
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/d7eaa93d
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/d7eaa93d
Branch: refs/heads/bootstrap-ui
Commit: d7eaa93ddc38625e7860b87ce899c3d5d783eb77
Parents: 1cbd3dc
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Jan 2 13:11:02 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Jan 2 13:11:02 2015 -0500
----------------------------------------------------------------------
README.md | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/d7eaa93d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index cc850fd..1dcb1e0 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,4 @@ trunk that has been modified to add a REST API, powered by Apache CXF and Apache
could power a new JavaScript based web interface for Roller.
-That's all
----
-
-Want to contribute? Shoot me a PR.
[46/47] roller git commit: Edit existing bookmark now works
Posted by sn...@apache.org.
Edit existing bookmark now works
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/3d5d89ba
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/3d5d89ba
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/3d5d89ba
Branch: refs/heads/bootstrap-ui
Commit: 3d5d89ba51c9ba147a2dfb9cb863ba8b61be6171
Parents: dec8559
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Apr 3 13:22:34 2016 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Apr 3 13:22:34 2016 -0400
----------------------------------------------------------------------
.../webapp/WEB-INF/jsps/editor/Bookmarks.jsp | 73 ++++++++++++++------
1 file changed, 51 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/3d5d89ba/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
index 89e8b58..1f52b9a 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
@@ -149,12 +149,17 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
</td>
<td align="center">
- <s:url var="editUrl" action="bookmarkEdit">
- <s:param name="weblog" value="%{actionWeblog.handle}" />
- <s:param name="bean.id" value="#bookmark.id" />
- <s:param name="folderId" value="%{folderId}" suppressEmptyParameters="true"/>
- </s:url>
- <s:a href="%{editUrl}"> <span class="glyphicon glyphicon-edit"></span> </s:a>
+
+ <a href="#" onclick="editBookmark(
+ '<s:property value="#bookmark.id" />',
+ '<s:property value="#bookmark.name"/>',
+ '<s:property value="#bookmark.url"/>',
+ '<s:property value="#bookmark.feedUrl"/>',
+ '<s:property value="#bookmark.description"/>',
+ '<s:property value="#bookmark.image" />' )">
+ <span class="glyphicon glyphicon-edit"></span>
+ </a>
+
</td>
</tr>
@@ -292,7 +297,7 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
function nameChanged() {
var newName = $("#bookmarks_folder_name:first").val();
- if ( newName != originalName && newName.trim().length > 0 ) {
+ if ( newName && newName != originalName && newName.trim().length > 0 ) {
renameButton.attr("disabled", false );
renameButton.addClass("btn-success");
@@ -597,22 +602,19 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
</div> <%-- modal header --%>
- <s:form action="bookmark" theme="bootstrap" cssClass="form-horizontal">
- <s:hidden name="salt" />
- <s:hidden name="weblog" />
- <%--
- Edit action uses folderId for redirection back to proper bookmarks folder on cancel
- (as configured in struts.xml); add action also, plus to know which folder to put new
- bookmark in.
- --%>
- <s:hidden name="folderId" />
- <s:if test="actionName == 'bookmarkEdit'">
- <%-- bean for bookmark add does not have a bean id yet --%>
- <s:hidden name="bean.id" />
- </s:if>
-
<div class="modal-body">
+ <s:form action="bookmark" theme="bootstrap" cssClass="form-horizontal">
+ <s:hidden name="salt" />
+ <s:hidden name="weblog" />
+ <%--
+ Edit action uses folderId for redirection back to proper bookmarks folder on cancel
+ (as configured in struts.xml); add action also, plus to know which folder to put new
+ bookmark in.
+ --%>
+ <s:hidden name="folderId" />
+ <s:hidden name="bean.id" />
+
<s:textfield name="bean.name" maxlength="255"
onchange="onBookmarkFormChanged()"
onkeyup ="onBookmarkFormChanged()"
@@ -637,6 +639,8 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
onchange="onBookmarkFormChanged()"
onkeyup ="onBookmarkFormChanged()"
label="%{getText('bookmarkForm.image')}" />
+ </s:form>
+
</div>
<div class="modal-body">
@@ -651,7 +655,6 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
</div>
</div>
- </s:form>
</div> <%-- modal content --%>
@@ -687,6 +690,32 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
$('#addedit-bookmark-modal').modal({show: true});
}
+
+ function editBookmark(id, name, url, feedUrl, description, image) {
+
+ var saveBookmarkButton = $('#save_bookmark:first');
+ saveBookmarkButton.attr("disabled", true );
+
+ var elem = $('#bookmark_required_fields:first');
+ elem.html('<s:text name="bookmarkForm.requiredFields" />');
+ elem.removeClass("alert-success");
+ elem.removeClass("alert-danger");
+ elem.addClass("alert-info");
+
+ $('#bookmark_bean_id:first').val(id);
+ $('#bookmark_folderId').val(id);
+ $('#bookmark_bean_name:first').val(name);
+ $('#bookmark_bean_url:first').val(url);
+ $('#bookmark_bean_feedUrl:first').val(feedUrl);
+ $('#bookmark_bean_description:first').val(description);
+ $('#bookmark_bean_image:first').val(image);
+
+ $('#subtitle_folder_name:first').html(originalName);
+
+ $('#addedit-bookmark-modal').modal({show: true});
+ }
+
+
function onBookmarkFormChanged() {
var saveBookmarkButton = $('#save_bookmark:first');
[25/47] roller git commit: Progress on categories page.
Posted by sn...@apache.org.
Progress on categories page.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/700682ac
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/700682ac
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/700682ac
Branch: refs/heads/bootstrap-ui
Commit: 700682ac120db830925b1ba09fa62e0b2c6cf9f9
Parents: a5ec43b
Author: Dave Johnson <sn...@apache.org>
Authored: Sat Dec 26 14:33:58 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Sat Dec 26 14:33:58 2015 -0500
----------------------------------------------------------------------
.../webapp/WEB-INF/jsps/editor/Categories.jsp | 274 ++++++++++++++-----
.../WEB-INF/jsps/editor/CategoriesSidebar.jsp | 89 ++++--
.../main/webapp/WEB-INF/jsps/editor/Entries.jsp | 12 +-
3 files changed, 284 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/700682ac/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
index 2c56a93..b45ccfd 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
@@ -17,89 +17,237 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<%-- JavaScript for categories table --%>
+<%-- JavaScript for categories table --%>
<script>
-function onMove()
-{
- if ( confirm("<s:text name='categoriesForm.move.confirm' />") )
- {
- document.categories.method.value = "moveSelected";
- document.categories.submit();
+ function onMove() {
+ if (confirm("<s:text name='categoriesForm.move.confirm' />")) {
+ document.categories.method.value = "moveSelected";
+ document.categories.submit();
+ }
}
-}
</script>
<p class="subtitle">
- <s:text name="categoriesForm.subtitle" >
- <s:param value="weblog" />
+ <s:text name="categoriesForm.subtitle">
+ <s:param value="weblog"/>
</s:text>
</p>
<p class="pagetip">
- <s:text name="categoriesForm.rootPrompt" />
+ <s:text name="categoriesForm.rootPrompt"/>
</p>
-
<%-- Form is a table of categories each with checkbox --%>
<s:form action="categories!move">
- <s:hidden name="salt" />
- <s:hidden name="weblog" />
- <s:hidden name="categoryId" />
+ <s:hidden name="salt"/>
+ <s:hidden name="weblog"/>
+ <s:hidden name="categoryId"/>
+
+ <table class="rollertable table table-striped" width="100%">
- <table class="rollertable">
-
<tr class="rollertable">
- <th class="rollertable" width="15%"><s:text name="generic.name" /></th>
- <th class="rollertable" width="40%"><s:text name="generic.description" /></th>
- <th class="rollertable" width="31%"><s:text name="categoriesForm.imageUrl" /></th>
- <th class="rollertable" width="7%"><s:text name="generic.edit" /></th>
- <th class="rollertable" width="7%"><s:text name="categoriesForm.remove" /></th>
+ <th width="30%"><s:text name="generic.name"/></th>
+ <th width="50%"><s:text name="generic.description"/></th>
+ <th width="10%"><s:text name="generic.edit"/></th>
+ <th width="10%"><s:text name="categoriesForm.remove"/></th>
</tr>
-
+
<s:if test="AllCategories != null && !AllCategories.isEmpty">
-
- <%-- Categories --%>
- <s:iterator id="category" value="AllCategories" status="rowstatus">
- <s:if test="#rowstatus.odd == true">
- <tr class="rollertable_odd">
- </s:if>
- <s:else>
- <tr class="rollertable_even">
- </s:else>
-
- <td class="rollertable"><s:property value="#category.name" /></td>
-
- <td class="rollertable"><s:property value="#category.description" /></td>
-
- <td class="rollertable"><s:property value="#category.image" /></td>
-
- <td class="rollertable" align="center">
- <s:url var="editUrl" action="categoryEdit">
- <s:param name="weblog" value="%{actionWeblog.handle}" />
- <s:param name="bean.id" value="#category.id" />
- </s:url>
- <s:a href="%{editUrl}"><img src='<s:url value="/images/page_white_edit.png"/>' border="0" alt="icon" /></s:a>
- </td>
-
- <td class="rollertable" align="center">
- <s:if test="AllCategories.size() > 1">
- <s:url var="removeUrl" action="categoryRemove">
- <s:param name="weblog" value="%{actionWeblog.handle}" />
- <s:param name="removeId" value="#category.id" />
- </s:url>
- <s:a href="%{removeUrl}"><img src='<s:url value="/images/delete.png"/>' border="0" alt="icon" /></s:a>
- </s:if>
- </td>
-
- </tr>
- </s:iterator>
-
+
+ <s:iterator id="category" value="AllCategories" status="rowstatus">
+ <tr>
+ <td><s:property value="#category.name"/></td>
+
+ <td><s:property value="#category.description"/></td>
+
+ <td align="center">
+
+ <s:set name="categoryId" value="#category.id" />
+ <s:set name="categoryName" value="#category.name" />
+ <s:set name="categoryDesc" value="#category.description" />
+ <s:set name="categoryImage" value="#category.image" />
+ <a href="#" onclick="showCategoryEditModal(
+ '<s:property value="categoryId" />',
+ '<s:property value="categoryName"/>',
+ '<s:property value="categoryDesc"/>',
+ '<s:property value="categoryImage"/>' )">
+ <span class="glyphicon glyphicon-edit"></span>
+ </a>
+
+ </td>
+
+ <td class="rollertable" align="center">
+ <s:if test="AllCategories.size() > 1">
+
+ <s:set name="categoryId" value="#category.id" />
+ <s:set name="categoryName" value="#category.name" />
+ <s:set name="categoryInUse" value="#category.inUse.toString()" />
+ <a href="#" onclick="showCategoryDeleteModal(
+ '<s:property value="categoryId" />',
+ '<s:property value="categoryName" />',
+ '<s:property value="categoryInUse"/>' )" >
+ <span class="glyphicon glyphicon-trash"></span>
+ </a>
+
+ </s:if>
+ </td>
+
+ </tr>
+ </s:iterator>
+
</s:if>
+
<s:else>
<tr>
- <td style="vertical-align:middle" colspan="6"><s:text name="categoriesForm.noresults" /></td>
+ <td style="vertical-align:middle" colspan="6"><s:text name="categoriesForm.noresults"/></td>
</tr>
</s:else>
-
+
</table>
-
+
</s:form>
+
+
+<%-- ============================================================= --%>
+<%-- add/edit category modal --%>
+
+<div id="category-edit-modal" class="modal fade category-edit-modal" tabindex="-1" role="dialog">
+
+ <div class="modal-dialog modal-lg">
+
+ <div class="modal-content">
+
+ <s:set var="mainAction">categoryEdit</s:set>
+
+ <div class="modal-header">
+ <h3><s:text name="categoryForm.edit.title" /></h3>
+ <p class="pagetip">
+ <s:text name="categoryForm.requiredFields">
+ <s:param><s:text name="generic.name"/></s:param>
+ </s:text>
+ </p>
+ </div>
+
+ <s:form action="categoryEdit!save" theme="bootstrap" cssClass="form-horizontal">
+ <s:hidden name="salt"/>
+ <s:hidden name="weblog"/>
+ <s:hidden name="bean.id"/>
+
+ <div class="modal-body">
+ <s:textfield name="bean.name" label="%{getText('generic.name')}" maxlength="255"/>
+ <s:textfield name="bean.description" label="%{getText('generic.description')}"/>
+ <s:textfield name="bean.image" label="%{getText('categoryForm.image')}"/>
+ </div>
+
+ <div class="modal-footer">
+ <s:submit cssClass="btn btn-primary"
+ value="%{getText('generic.save')}" action="%{#mainAction}!save"/>
+ <button type="button" class="btn" data-dismiss="modal">
+ <s:text name="generic.cancel" />
+ </button>
+ </div>
+ </s:form>
+
+ </div>
+ </div>
+</div>
+
+<script>
+ function showCategoryEditModal( id, name, desc, image ) {
+ $('#categoryEdit_bean_id').val(id);
+ $('#categoryEdit_bean_name').val(name);
+ $('#categoryEdit_bean_description').val(desc);
+ $('#categoryEdit_bean_image').val(image);
+ $('#category-edit-modal').modal({show: true});
+ }
+
+ <%--
+ (function() {
+ $('form > input').keyup(function() {
+
+ var empty = false;
+ $('form > input').each(function() {
+ if ($(this).val() == '') {
+ empty = true;
+ }
+ });
+
+ if (empty) {
+ $('#register').attr('disabled', 'disabled');
+ } else {
+ $('#register').removeAttr('disabled');
+ }
+ });
+ })()
+ --%>
+
+</script>
+
+
+<%-- ============================================================= --%>
+<%-- delete confirmation modal --%>
+
+<div id="delete-category-modal" class="modal fade delete-category-modal" tabindex="-1" role="dialog">
+
+ <div class="modal-dialog modal-lg">
+
+ <div class="modal-content">
+
+ <div class="modal-header">
+ <h3>
+ <s:text name="categoryDeleteOK.removeCategory"/>:
+ <span id="category-name"></span>
+ </h3>
+ </div>
+
+ <s:form action="categoryRemove!remove" theme="bootstrap" cssClass="form-horizontal">
+ <s:hidden name="salt"/>
+ <s:hidden name="weblog"/>
+ <s:hidden name="removeId"/>
+
+ <div class="modal-body">
+
+ <div id="category-in-use" class="alert alert-danger" role="alert" style="display:none">
+ <p>
+ <s:text name="categoryDeleteOK.warningCatInUse"/>
+ <s:text name="categoryDeleteOK.youMustMoveEntries"/>
+ </p>
+ <s:text name="categoryDeleteOK.moveToWhere"/>
+ <s:select name="targetCategoryId" list="allCategories" listKey="id" listValue="name"/>
+ </div>
+
+ <div id="category-empty" style="display:none">
+ <p><s:text name="categoryDeleteOK.noEntriesInCat"/></p>
+ </div>
+
+ <p> <strong><s:text name="categoryDeleteOK.areYouSure"/></strong> </p>
+ </div>
+
+ <div class="modal-footer">
+ <s:submit cssClass="btn"
+ value="%{getText('generic.yes')}"/>
+ <button type="button" class="btn btn-default btn-primary" data-dismiss="modal">
+ <s:text name="generic.no" />
+ </button>
+ </div>
+
+ </s:form>
+
+ </div>
+ </div>
+</div>
+
+<script>
+ function showCategoryDeleteModal( id, name, inUse ) {
+ $('#categoryRemove_removeId').val(id);
+ $('#categoryEdit_bean_name').val(name);
+ $('#category-name').html(name);
+ if ( inUse ) {
+ $('#category-in-use').css('display','block');
+ $('#category-emtpy').css('display', 'none');
+ } else {
+ $('#category-in-use').css('display', 'none');
+ $('#category-emtpy').css('display', 'block');
+ }
+ $('#delete-category-modal').modal({show: true});
+ }
+</script>
http://git-wip-us.apache.org/repos/asf/roller/blob/700682ac/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
index 261e89c..2aa0d4e 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
@@ -17,26 +17,77 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<div class="sidebarFade">
- <div class="menu-tr">
- <div class="menu-tl">
-
- <div class="sidebarInner">
- <h3><s:text name="mainPage.actions" /></h3>
- <hr size="1" noshade="noshade" />
-
- <p>
- <%-- Add Category link --%>
- <img src='<s:url value="/images/folder_add.png"/>' border="0"alt="icon" />
- <s:url var="addCategory" action="categoryAdd">
- <s:param name="weblog" value="%{actionWeblog.handle}" />
- </s:url>
- <s:a href="%{addCategory}"><s:text name="categoriesForm.addCategory" /></s:a>
- </p>
-
- <br />
+<h3><s:text name="mainPage.actions"/></h3>
+<hr size="1" noshade="noshade"/>
+
+<p>
+ <s:set name="categoryId" value="#bean.id"/>
+ <s:set name="categoryName" value="#post.name"/>
+ <s:set name="categoryDesc" value="#post.description"/>
+ <s:set name="categoryImage" value="#post.image"/>
+ <a href="#" onclick="showCategoryAddModal()">
+ <span class="glyphicon glyphicon-plus"></span>
+ <s:text name="categoriesForm.addCategory"/>
+ </a>
+</p>
+
+
+<div id="category-add-modal" class="modal fade category-add-modal" tabindex="-1" role="dialog">
+
+ <div class="modal-dialog modal-lg">
+
+ <div class="modal-content">
+
+ <div class="modal-header">
+ <h3> <s:text name="categoryForm.add.title"/> </h3>
</div>
-
+
+ <div class="modal-body">
+ <s:form id="categoryAddForm" theme="bootstrap" cssClass="form-horizontal">
+ <s:hidden name="salt"/>
+ <s:hidden name="weblog"/>
+ <s:textfield name="bean.name" label="%{getText('generic.name')}" maxlength="255"/>
+ <s:textfield name="bean.description" label="%{getText('generic.description')}"/>
+ <s:textfield name="bean.image" label="%{getText('categoryForm.image')}"/>
+ </s:form>
+ </div>
+
+ <div class="modal-footer">
+ <button onclick="submitNewCategory()" class="btn btn-primary">
+ <s:text name="generic.save" />
+ </button>
+ <button type="button" class="btn" data-dismiss="modal">
+ <s:text name="generic.cancel" />
+ </button>
+ </div>
+
</div>
</div>
</div>
+
+<script>
+ function showCategoryAddModal( postId, postTitle ) {
+ $('#category-add-modal').modal({show: true});
+ }
+ function submitNewCategory() {
+
+ // if name is empty reject and show error message
+ if ( $("#categoryAdd_bean_name").val().trim() == "" ) {
+ alert("Name is required");
+ return;
+ }
+
+ // post category via Ajax
+ $.ajax({
+ url: "categoryAdd!save",
+ data: $("#categoryAddForm").serialize(),
+ context: document.body
+ }).done(function(data) {
+ alert("Done");
+ });
+
+ // if post failed, then show error messages
+
+ // else dismiss modal
+ }
+</script>
http://git-wip-us.apache.org/repos/asf/roller/blob/700682ac/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
index 682964a..3dbc294 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
@@ -46,7 +46,7 @@
</s:if>
</ul>
</nav>
-
+
<%-- ============================================================= --%>
<%-- Entry table--%>
@@ -103,10 +103,6 @@
</td>
<td>
- <s:url var="deleteUrl" action="entryRemoveViaList">
- <s:param name="weblog" value="%{actionWeblog.handle}" />
- <s:param name="removeId" value="#post.id" />
- </s:url>
<s:set name="postId" value="#post.id" />
<s:set name="postTitle" value="#post.title" />
<a href="#"
@@ -184,7 +180,7 @@
<s:set var="deleteAction">entryRemoveViaList!remove</s:set>
- <s:form action="%{#deleteAction}" theme="bootstrap">
+ <s:form action="%{#deleteAction}" theme="bootstrap" cssClass="form-horizontal">
<s:hidden name="salt"/>
<s:hidden name="weblog"/>
<s:hidden name="removeId" id="removeId"/>
@@ -196,7 +192,7 @@
</div>
</div>
- <div class="modal-header">
+ <div class="modal-body">
<div class="form-group">
<label class="col-sm-3 control-label">
@@ -241,5 +237,3 @@
$('#delete-entry-modal').modal({show: true});
}
</script>
-
-
[30/47] roller git commit: Fix: "javax.servlet.ServletException: File
[/WEB-INF/jsps/core/Login-css.jsp] not found"
Posted by sn...@apache.org.
Fix: "javax.servlet.ServletException: File [/WEB-INF/jsps/core/Login-css.jsp] not found"
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/c5e84753
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/c5e84753
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/c5e84753
Branch: refs/heads/bootstrap-ui
Commit: c5e84753c768e6e79336f2989900e8798d11b677
Parents: 8042fd7
Author: Kohei Nozaki <ky...@bridge9.sakura.ne.jp>
Authored: Wed Jan 6 12:15:30 2016 +0900
Committer: Kohei Nozaki <ky...@bridge9.sakura.ne.jp>
Committed: Wed Jan 6 12:15:30 2016 +0900
----------------------------------------------------------------------
.../main/webapp/WEB-INF/jsps/core/Login-css.jsp | 23 ++++++++++++++++++++
.../main/webapp/WEB-INF/jsps/core/login-css.jsp | 23 --------------------
2 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/c5e84753/app/src/main/webapp/WEB-INF/jsps/core/Login-css.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/Login-css.jsp b/app/src/main/webapp/WEB-INF/jsps/core/Login-css.jsp
new file mode 100644
index 0000000..1cd65ea
--- /dev/null
+++ b/app/src/main/webapp/WEB-INF/jsps/core/Login-css.jsp
@@ -0,0 +1,23 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. The ASF licenses this file to You
+ under the Apache License, Version 2.0 (the "License"); you may not
+ use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. For additional information regarding
+ copyright in this work, please see the NOTICE file in the top level
+ directory of this distribution.
+--%>
+
+.roller-page-title {
+ margin-top: 0px;
+ margin-bottom: 5px;
+ text-align: center;
+}
http://git-wip-us.apache.org/repos/asf/roller/blob/c5e84753/app/src/main/webapp/WEB-INF/jsps/core/login-css.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/login-css.jsp b/app/src/main/webapp/WEB-INF/jsps/core/login-css.jsp
deleted file mode 100644
index 1cd65ea..0000000
--- a/app/src/main/webapp/WEB-INF/jsps/core/login-css.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. The ASF licenses this file to You
- under the Apache License, Version 2.0 (the "License"); you may not
- use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. For additional information regarding
- copyright in this work, please see the NOTICE file in the top level
- directory of this distribution.
---%>
-
-.roller-page-title {
- margin-top: 0px;
- margin-bottom: 5px;
- text-align: center;
-}
[43/47] roller git commit: progress towards modal confirmation
dialogs on bookmarks page.
Posted by sn...@apache.org.
progress towards modal confirmation dialogs on bookmarks page.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/f76eb9d9
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/f76eb9d9
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/f76eb9d9
Branch: refs/heads/bootstrap-ui
Commit: f76eb9d9f55501679b1b39e56545652bf716a51f
Parents: 0f5c869
Author: Dave Johnson <sn...@gmail.com>
Authored: Mon Mar 28 08:25:21 2016 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Mon Mar 28 08:25:21 2016 -0400
----------------------------------------------------------------------
.../resources/ApplicationResources.properties | 4 +-
.../webapp/WEB-INF/jsps/editor/Bookmarks.jsp | 62 +++++++++++++++++++-
.../webapp/WEB-INF/jsps/editor/Categories.jsp | 3 +-
3 files changed, 65 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/f76eb9d9/app/src/main/resources/ApplicationResources.properties
----------------------------------------------------------------------
diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties
index ac0f1a8..45b1e2c 100644
--- a/app/src/main/resources/ApplicationResources.properties
+++ b/app/src/main/resources/ApplicationResources.properties
@@ -110,7 +110,9 @@ bookmarksForm.noresults=There are currently no Blogroll links
bookmarksForm.addBlogroll.title=Add New Blogroll
bookmarksForm.editBlogroll.title=Edit Blogroll
bookmarksForm.blogroll.requiredFields=You must specify a blogroll name
-bookmarkForm.error.duplicateName=No duplicate blogroll names
+
+blogrollDeleteOK.removeBlogroll=Confirm Blogroll Delete
+blogrollDeleteOK.areYouSure=Are you sure you want to delete blogroll
# --------------------------------------------------------- Bookmarks import.jsp
http://git-wip-us.apache.org/repos/asf/roller/blob/f76eb9d9/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
index ee4eb61..0ed4f00 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
@@ -321,11 +321,19 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
}
function deleteFolder() {
- // TODO: do not use plain old DHTML confirm here
+
+ $('#boomarks_delete_folder_folderId').val('<s:text name="%{folder.id}"/>');
+
+ $('#deleteBlogrollName').html('<s:text name="%{folder.name}"/>');
+
+ $('#delete-blogroll-modal').modal({show: true});
+
+ <%--
if (confirm("<s:text name='bookmarksForm.deleteFolder.confirm' />")) {
document.bookmarks.action = '<s:url action="bookmarks!deleteFolder" />';
document.bookmarks.submit();
}
+ --%>
}
function onMoveToFolder() {
@@ -452,6 +460,58 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
</script>
+
+<%-- ========================================================================================== --%>
+
+<%-- delete blogroll confirmation modal --%>
+
+<div id="delete-blogroll-modal" class="modal fade delete-blogroll-modal" tabindex="-1" role="dialog">
+
+ <div class="modal-dialog modal-lg">
+
+ <div class="modal-content">
+
+ <div class="modal-header">
+ <h3>
+ <s:text name="blogrollDeleteOK.removeBlogroll"/>:
+ <span id="blogroll-name"></span>
+ </h3>
+ </div>
+
+ <s:form id="boomarks_delete_folder" action="bookmarks!deleteFolder" theme="bootstrap" cssClass="form-horizontal">
+ <s:hidden name="salt"/>
+ <s:hidden name="weblog"/>
+ <s:hidden name="folderId"/>
+
+ <div class="modal-body">
+ <s:text name="blogrollDeleteOK.areYouSure"></s:text>
+ <span id="deleteBlogrollName"></span>?
+ </div>
+
+ <div class="modal-footer">
+ <s:submit cssClass="btn" value="%{getText('generic.yes')}"/>
+ <button type="button" class="btn btn-default btn-primary" data-dismiss="modal">
+ <s:text name="generic.no" />
+ </button>
+ </div>
+
+ </s:form>
+
+ </div>
+ </div>
+</div>
+
+<script>
+
+ function showBlogrollDeleteModal( id, name ) {
+ $('#blogrollRemove_removeId').val(id);
+ $('#blogroll-name').html(name);
+ $('#delete-remove-modal').modal({show: true});
+ }
+
+</script>
+
+
<%-- ================================================================================================ --%>
<%-- add/edit link form: a modal --%>
http://git-wip-us.apache.org/repos/asf/roller/blob/f76eb9d9/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
index ad6fb62..0f159ff 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
@@ -235,8 +235,7 @@
</div>
<div class="modal-footer">
- <s:submit cssClass="btn"
- value="%{getText('generic.yes')}"/>
+ <s:submit cssClass="btn" value="%{getText('generic.yes')}"/>
<button type="button" class="btn btn-default btn-primary" data-dismiss="modal">
<s:text name="generic.no" />
</button>
[13/47] roller git commit: Beginnings of a Bootstrap rewrite of the
Roller editor/admin UI,
using Struts-Bootstrap plugin. The main menu and edit weblog page are
essentially complete.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/js/bootstrap.min.js
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/js/bootstrap.min.js b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/js/bootstrap.min.js
new file mode 100644
index 0000000..e79c065
--- /dev/null
+++ b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/js/bootstrap.min.js
@@ -0,0 +1,7 @@
+/*!
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under the MIT license
+ */
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1||b[0]>2)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 3")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return
a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.6",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prot
otype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.6",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.ad
dClass("active")):"checkbox"==c.prop("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),a(c.target).is('input[type="radio"]')||a(c.target).is('input[type="checkbox"]')||c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=
a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.6",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=functio
n(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.supp
ort.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass(
[b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.att
r("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.6",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel")
.children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimensio
n();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn
.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger(a.Event("hidden.bs.dropdown",f)))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data(
"bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.6",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger(a.Event("shown.bs.dropdown",h))}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&
&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&j<i.length-1&&j++,~j||(j=0),i.eq(j).trigger("focus")}}}};var h=a.fn.dropdown;a.fn.dropdown=d,a.fn.dropdown.Constructor=g,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=h,this},a(document).on("click.bs.dropdown.data-api",c).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",f,g.prototype.toggle).on("keydown.bs.dropdown.data-api",f,g.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",g.prototype.keydown)}(jQuery),+function(a){"use strict";function b(b,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},c.DEFAULTS,e.data(),"object"==typeof b&&b);f||e.data("bs.modal",f=new c(this,g)),"string"==typeof b?f[b](d):g.show&&f.show(d)})}var c=function(b,c){this.options=c,this.$body=a(document.
body),this.$element=a(b),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};c.VERSION="3.3.6",c.TRANSITION_DURATION=300,c.BACKDROP_TRANSITION_DURATION=150,c.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},c.prototype.toggle=function(a){return this.isShown?this.hide():this.show(a)},c.prototype.show=function(b){var d=this,e=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){d.$element.one("mouseup.dismiss.bs.moda
l",function(b){a(b.target).is(d.$element)&&(d.ignoreBackdropClick=!0)})}),this.backdrop(function(){var e=a.support.transition&&d.$element.hasClass("fade");d.$element.parent().length||d.$element.appendTo(d.$body),d.$element.show().scrollTop(0),d.adjustDialog(),e&&d.$element[0].offsetWidth,d.$element.addClass("in"),d.enforceFocus();var f=a.Event("shown.bs.modal",{relatedTarget:b});e?d.$dialog.one("bsTransitionEnd",function(){d.$element.trigger("focus").trigger(f)}).emulateTransitionEnd(c.TRANSITION_DURATION):d.$element.trigger("focus").trigger(f)}))},c.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTran
sitionEnd",a.proxy(this.hideModal,this)).emulateTransitionEnd(c.TRANSITION_DURATION):this.hideModal())},c.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.trigger("focus")},this))},c.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},c.prototype.resize=function(){this.isShown?a(window).on("resize.bs.modal",a.proxy(this.handleUpdate,this)):a(window).off("resize.bs.modal")},c.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.$body.removeClass("modal-open"),a.resetAdjustments(),a.resetScrollbar(),a.$element.trigger("hidden.bs.modal")})},c.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},c.pro
totype.backdrop=function(b){var d=this,e=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var f=a.support.transition&&e;if(this.$backdrop=a(document.createElement("div")).addClass("modal-backdrop "+e).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.adjustDial
og()},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth<a,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"",this.bodyIsOverflowing&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad)},c.prototype.measureScrollbar=function(){var a=document.createElement("div")
;a.className="modal-scrollbar-measure",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=null,this.options=null,this.enabled=null,this
.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init("tooltip",a,b)};c.VERSION="3.3.6",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){
var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.cons
tructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusin"==b.type?"focus":"hover"]=!0),c.tip().hasClass("in")||"in"==c.hoverState?void(c.hoverState="in"):(clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusout"==b.type?"focus":"hover"]=!1),c.isInStateTrue()?void 0:(clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.
options.delay.hide)):c.hide())},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h="bottom"==h&&k.bottom+m>o.bottom?
"top":"top"==h&&k.top-m<o.top?"bottom":"right"==h&&k.right+l>o.width?"left":"left"==h&&k.left-l<o.left?"right":h,f.removeClass(n).addClass(h)}var p=this.getCalculatedOffset(h,k,l,m);this.applyPlacement(p,h);var q=function(){var a=e.hoverState;e.$element.trigger("shown.bs."+e.type),e.hoverState=null,"out"==a&&e.leave(e)};a.support.transition&&this.$tip.hasClass("fade")?f.one("bsTransitionEnd",q).emulateTransitionEnd(c.TRANSITION_DURATION):q()}},c.prototype.applyPlacement=function(b,c){var d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),b.top+=g,b.left+=h,a.offset.setOffset(d[0],a.extend({using:function(a){d.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),d.addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;"top"==c&&j!=f&&(b.top=b.top+f-j);var k=this.getViewportAdjustedDelta(c,b,i,j);k.left?b.left+=k.left:b.top+=k.top;var l=/top|bottom/.test(c),m=l?2*k.left-e
+i:2*k.top-f+j,n=l?"offsetWidth":"offsetHeight";d.offset(b),this.replaceArrow(m,d[0][n],l)},c.prototype.replaceArrow=function(a,b,c){this.arrow().css(c?"left":"top",50*(1-a/b)+"%").css(c?"top":"left","")},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},c.prototype.hide=function(b){function d(){"in"!=e.hoverState&&f.detach(),e.$element.removeAttr("aria-describedby").trigger("hidden.bs."+e.type),b&&b()}var e=this,f=a(this.$tip),g=a.Event("hide.bs."+this.type);return this.$element.trigger(g),g.isDefaultPrevented()?void 0:(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one("bsTransitionEnd",d).emulateTransitionEnd(c.TRANSITION_DURATION):d(),this.hoverState=null,this)},c.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("tit
le","")},c.prototype.hasContent=function(){return this.getTitle()},c.prototype.getPosition=function(b){b=b||this.$element;var c=b[0],d="BODY"==c.tagName,e=c.getBoundingClientRect();null==e.width&&(e=a.extend({},e,{width:e.right-e.left,height:e.bottom-e.top}));var f=d?{top:0,left:0}:b.offset(),g={scroll:d?document.documentElement.scrollTop||document.body.scrollTop:b.scrollTop()},h=d?{width:a(window).width(),height:a(window).height()}:null;return a.extend({},e,g,h,f)},c.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},c.prototype.getViewportAdjustedDelta=function(a,b,c,d){var e={top:0,left:0};if(!this.$viewport)return e;var f=this.options.viewport&&this.options.viewport.padding||0,g=this.getPosition(this.$viewport);if(/right|left/.test(a)){var h=b.top-f-g.scroll,i=b.top+f-g.sc
roll+d;h<g.top?e.top=g.top-h:i>g.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;j<g.left?e.left=g.left-j:k>g.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.ty
pe),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.6",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFA
ULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return thi
s.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.6",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,
c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b<e[0])return this.activeTarget=null,this.clear();for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(void 0===e[a+1]||b<e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,this.clear();var c=this.select
or+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");
+d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.6",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a"),f=a.Event("hid
e.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANS
ITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.6",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=
this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,
e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/js/npm.js
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/js/npm.js b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/js/npm.js
new file mode 100644
index 0000000..bf6aa80
--- /dev/null
+++ b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/js/npm.js
@@ -0,0 +1,13 @@
+// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
+require('../../js/transition.js')
+require('../../js/alert.js')
+require('../../js/button.js')
+require('../../js/carousel.js')
+require('../../js/collapse.js')
+require('../../js/dropdown.js')
+require('../../js/modal.js')
+require('../../js/tooltip.js')
+require('../../js/popover.js')
+require('../../js/scrollspy.js')
+require('../../js/tab.js')
+require('../../js/affix.js')
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/roller-ui/styles/roller.css
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/roller-ui/styles/roller.css b/app/src/main/webapp/roller-ui/styles/roller.css
index 397c1cd..ca0f28d 100644
--- a/app/src/main/webapp/roller-ui/styles/roller.css
+++ b/app/src/main/webapp/roller-ui/styles/roller.css
@@ -16,792 +16,125 @@
* directory of this distribution.
*/
-/*
-roller.css: Base CSS styles for Roller web UI
-
-CUSTOMIZABLE color and background image settings have been separated out
-and placed in separate colors.css files for different color schemes.
-*/
+/* roller.css: Base CSS styles for Roller web UI */
-body {
- background: white;
- margin: 0px;
- padding: 0px;
- text-align: left;
+table {
+ border:0;
}
-th, td {
- border: none;
- vertical-align: top;
- padding: 2px;
+.roller-page-title {
+ text-align: center;
}
-a {
- text-decoration: none;
-}
-a:link {
- text-decoration: none;
-}
-a:visited {
- text-decoration: none;
-}
-a:hover {
- text-decoration: underline;
-}
-a:active {
- text-decoration: underline;
+.roller-column-right {
+ padding-left: 1em;
+ padding-right: 2em;
}
-p.subtitle {
- margin: 5px 0px 15px;
- font-size: 1em;
- font-weight: bold;
- font-size: 120%;
-}
-p.pagetip {
- margin: 0px 0px 15px 0px;
-}
-img {
- border: 0px;
- overflow: auto;
-}
-img.w3c {
- border: 0px;
- height: 31px;
- width: 88px;
- margin-right: 5px;
-}
-label {
- line-height: 1.5em;
+.roller-column-left{
+ padding-left: 2em;
+ padding-right: 1em;
}
-/* ----------------------------------------------------------------------
-Page element styles: boxes and borders, etc.
----------------------------------------------------------------------- */
+/* main menu */
-div.bannerStatusBox {
- height: 2em;
+.mm_subtable_label {
+ width: 8em;
+ font-weight: bold;
}
-.bannerStatusBox a, .bannerStatusBox a {
- font-weight: bold;
-}
-.bannerLeft {
- padding: 4px 15px 4px 10px;
-}
-.bannerRight {
- padding: 4px 10px 4px 15px;
- text-align: right;
-}
-.bannerBox {
- width: 100%;
- background: #f00;
-}
-.sidebarBodyHead h3, .searchSidebarBody h3 {
- padding: 5px;
-}
-.sidebarInner {
- padding: 0.5em 0.5em 0.5em 1em;
-}
-.sidebarBody ul {
- margin: 0px;
- padding-left: 5px;
-}
-.sidebarBody li {
- list-style-position: inside;
- list-style-image: url(../images/dash.gif);
- margin-left: 0em;
- padding-left: 0.5em;
- padding-top: 3px;
-}
-div.entriesBoxInner {
- padding: 5px;
-}
-div.entryTitleBox {
- padding: 4px;
- margin: 4px 0px 4px 0px;
- font-size: medium;
-}
-div.entryBox, div.entryBoxPinned {
- font-family: Arial, Helvetica, sans-serif;
- border-bottom-width: thin;
- border-bottom-style: solid;
- padding: 3px 0px 3px 0px;
-}
-div.entryBoxPinned {
-}
-.entryTitle {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 12px;
- font-weight: bold;
- text-decoration: none;
-}
-.entryDetails {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- text-decoration: none;
-}
-.entryDescription {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 11px;
- text-decoration: none;
-}
-span.hotBlogs, a.hotBlogs, a:active.hotBlogs, a:visited.hotBlogs, ul.hotBlogs {
- font-size: small;
- padding-left: 0px;
- list-style-type: none
-}
-input.searchButton {
- cursor: pointer;
- font-family: lucida,arial,sans-serif;
- height: 1.4em;
- font-weight: bold;
- font-size: 11px;
- padding: 0px 0px 2px 0px;
- margin: 5px;
- border: 0px none #000;
+.yourWeblogBox {
+ background: white;
+ padding: 1em;
}
-
-/* ----------------------------------------------------------------------
-form layout styles
----------------------------------------------------------------------- */
-
-input, select, option {
- font: small Verdana,Arial,Sans-serif;
- color: black;
- font: small/1.5em Verdana, Arial, Helvetica, sans-serif;
- font-size: 100%;
-}
-textarea {
- margin: 3px 0px 0px 0px;
-}
-div.buttonBox {
- width: 98%;
- border: 1px solid black;
- background-color: #f3f3f3;
- padding: 3px;
- margin-top: 5em;
- clear: both;
-}
-.left {
- font-size: small;
- width: 136px;
-}
-.leftTitle {
- font-size: small;
- font-weight: bold;
+table.mm_table td {
+ padding: 0.3em;
}
-.formtable, .formtableNoDesc {
- width: 100%;
- border-collapse: collapse;
-}
-.formtable td.label, .formtable td.field, .formtable td.description,
-.formtableNoDesc td.label, .formtableNoDesc td.field, .formtableNoDesc {
- vertical-align: top;
- border-style: solid;
- border-width: 0px 0px 1px 0px;
- border-color: #e3e3e3;
- padding: 4px 10px 4px 10px;
-}
-.formtable td.label {
- text-align: right;
- width: 20%;
-}
-.formtable td.field {
- width: 30%;
-}
-.formtable td.description {
- width: 50%;
- line-height: 140%;
-}
-.formtableNoDesc td.label {
- text-align: right;
- width: 40%;
-}
-.formtableNoDesc td.field {
- width: 40%;
-}
-.formtableNoDesc td.description {
- width: 0%;
+table.mm_table_actions td {
+ padding: 0.1em;
}
-div.row {
- padding: 2px;
-}
-div.formrow {
- float: left;
- width: 80%;
-}
-label.formrow {
- float: left;
- text-align: right;
- width: 20%;
- padding-right: 1em;
-}
-div.sideformrow {
- float: left;
- width: 100%;
-}
-label.sideformrow {
- float: left;
- text-align: left;
- width: 30%;
- padding-right: 1em;
- padding-top: 1em;
- font-size: smaller;
-}
+/* edit entry page */
-div.yourWeblogBox {
- padding: 8px 0px 10px 0px;
+.panel-heading a:after {
+ font-family:'Glyphicons Halflings';
+ content:"\e114";
+ float: right;
+ color: grey;
}
-
-input#f_openid_identifier {
- background: url(../../images/openid-logo-small.gif) no-repeat scroll 0 50%;
- padding-left:18px;
+.panel-heading a.collapsed:after {
+ content:"\e080";
}
-input.f_openid_identifier {
- background: url(../../images/openid-logo-small.gif) no-repeat scroll 0 50%;
- padding-left:18px;
+#panel-plugins { /* Kludge for EntryEditor.jsp */
+ margin-top: 6px; /* Without this there no space between Summary and Plugins to Apply panels */
}
-/* ----------------------------------------------------------------------
-Table styles
----------------------------------------------------------------------- */
-
-div.tablenav {
- font-size: 110%
-}
-table.rollertable {
- border-collapse: collapse;
- width: 100%;
-}
-table.innertable {
- border-collapse: collapse;
- width: 100%;
- margin-bottom: 0;
-}
-table.rollertable th {
- border: 1px solid #ccc;
- font-size: 110%;
- padding: 3px;
-}
-table.rollertable th {
- color: white;
-}
-table.rollertable td, table.rollertable tbody td {
- vertical-align: top;
-}
-table.rollertable tbody td {
- padding: 3px;
-}
-table.innertable tbody td {
- padding: 0;
-}
-table.rollertable td.center {
- text-align: center;
-}
-table.rollertable .innertable td {
- border: none;
-}
-table.innertable td.viewbody {
- padding: 5px;
-}
-table.innertable tr .bot {
- margin-bottom: 5px;
-}
-table.innertable tr .viewbody .bot {
- padding-bottom: 10px;
-}
-td.field span.fixedAttr {
- font-style: italic;
- font-weight: bold;
- color: red;
-}
-.rollertable_even td {
- border: 1px solid #ccc;
- background: #EEEEEE;
- color: black;
- vertical-align: top;
-}
-.rollertable_odd td{
- border: 1px solid #ccc;
- background: inherit;
- vertical-align: top;
- color: black;
-}
-.rollertable_pending td {
- border: 1px solid #ccc;
- background: #ffffcc;
- color: black;
- vertical-align: top;
-}
-td.rollertable_entry, div.rollertable_entry {
- border: 1px solid #ccc;
- background: inherit;
- padding: 5px;
- vertical-align: top;
-}
-td.propname {
- padding: 0px 0px 0px 3em;
- vertical-align: top;
-}
-table.edit th {
- text-align: right;
- padding-right: 5px;
-}
-tr.actionrow {
- background: #e5e5e5;
-}
-td.spamcomment {
- background: #ffcccc;
-}
-td.pendingcomment {
- background: #ffffcc;
-}
-.approvedCommentBox {
- background: #ffffff;
- border: 1px gray solid;
-}
-.pendingCommentBox {
- background: #ffffcc;
- border: 1px gray solid;
-}
-.spamCommentBox {
- background: #ffcccc;
- border: 1px gray solid;
-}
-td.pendingentry, tr.pendingentry {
- background: #ffcccc;
-}
-td.draftentry, tr.draftentry {
- background: #ffffcc;
-}
-td.scheduledentry, tr.scheduledentry {
- background: #EEEEE0;
-}
-.draftEntryBox {
- background: #ffffcc;
- border: 1px gray solid;
-}
-.pendingEntryBox {
- background: #ffcccc;
- border: 1px gray solid;
-}
-.scheduledEntryBox {
- background: #EEEEE0;
- border: 1px gray solid;
+/* keep jQuery UI datepicker in front of other elements */
+.ui-datepicker {
+ position: relative;
+ z-index: 10000 !important;
}
-/* ----------------------------------------------------------------------
-Calendar styles
----------------------------------------------------------------------- */
-
-div.archiveCalendar {
- position: absolute;
- top: 80px;
- right: 20px;
- font-size: 11px;
-}
-.hCalendarDay {
- border-width: thin;
- font-size: .9em;
- text-align: center;
-}
-.hCalendarDayCurrent {
- border-style: dotted;
- border-width: thin;
- font-size: .9em;
- font-weight: bolder;
- text-align: center;
-}
-.hCalendarDayLinked {
- border-width: thin;
- font-size: .9em;
- font-weight: bolder;
- text-align: center;
-}
-.hCalendarDayNameRow {
- font-size: .9em;
- background-color: #eee;
- border-bottom: 1px solid #ccc;
- text-align: center;
-}
-.hCalendarDayNotInMonth {
- background: transparent;
- color: #AAAAAA;
- font-size: .9em;
- text-align: center;
-}
-.hCalendarNextPrev {
- text-align: center;
-}
-.hCalendarMonthYearRow {
- font-weight: bold;
- text-align: center;
-}
-/* ----------------------------------------------------------------------
-Error and status message styles
----------------------------------------------------------------------- */
+/* sign-in */
-.statusMsg {
- background: #CCFFCC;
- border: 1px solid #008000;
- color: #000000;
- display: block;
- font-size: .9em;
- margin: 0px 0px 10px 0px;
- padding: 3px;
- width: 98%;
-}
-.error {
- background: transparent;
- color: #FF0000;
-}
-.warning {
- color: #f00;
- font-size: larger;
-}
-.errors, .messages, .warnings {
- padding: 5px;
- margin: 10px 0px 10px 0px;
-}
-.errors {
- background-color: #fcc;
- border: 1px solid red;
-}
-.messages {
- background-color: #cfc;
- border: 1px solid green;
-}
-.warnings {
- background-color: #ffffce;
- border: 1px solid #f0c000;
+body {
+ background-color: white;
}
-div.notification {
- padding: 10px;
- background-color: #ffffce;
- border: 1px solid #f0c000;
+
+.form-signin {
+ max-width: 330px;
+ padding: 15px;
+ margin: 0 auto;
}
-div.error {
- background-color: #ffcccc;
- border: 1px solid #000000;
- color: #aa0000;
- font-size: 0.9em;
- font-weight: normal;
- margin: 5px 10px 5px 0px;
- padding: 3px;
- text-align: left;
- vertical-align: bottom;
+.form-signin .form-signin-heading,
+.form-signin .checkbox {
+ margin-bottom: 10px;
}
-div.output {
- background-color: #e0e0e0;
- border: 1px solid #CCCC99;
- color: #000000;
- font-size: 0.9em;
+.form-signin .checkbox {
font-weight: normal;
- margin: 5px 10px 5px 0px;
- padding: 3px;
- text-align: left;
- vertical-align: bottom;
}
-
-/* ----------------------------------------------------------------------
-weblog editor styles
----------------------------------------------------------------------- */
-
-div.previewEntrySummary {
- border: 1px solid gray;
- clear: both;
- height: 12em;
- width: 98%;
+.form-signin .form-control {
+ position: relative;
+ height: auto;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
padding: 10px;
- overflow: auto;
+ font-size: 16px;
}
-div.previewEntryContent {
- border: 1px solid gray;
- clear: both;
- height: 22em;
- width: 98%;
- padding: 10px;
- overflow: auto;
+.form-signin .form-control:focus {
+ z-index: 2;
}
-div.centerTitle {
- border: 1px solid #ccc;
- color: black;
- font-weight: bolder;
- font-size: large;
- text-align: center;
-}
-div.control {
- width: 100%;
- /*height: 2.5em; Buttons don't line up */
-}
-div.controlToggle {
- width: 100%;
- height: 25px;
-}
-div.viewdetails {
- border: 1px dotted #CCCCCC;
- color: #000000;
- margin-left: 5px;
- margin-right: 5px;
- padding: 5px 5px 5px 7px;
+.form-signin input[type="email"] {
+ margin-bottom: -1px;
+ border-bottom-right-radius: 0;
+ border-bottom-left-radius: 0;
}
-.control input {
- margin: 0.3em;
-}
-.control select {
- margin: 0.5em;
-}
-a.controlToggle {
- margin: 5px;
- padding: 5px;
- color: black;
- background: transparent;
- text-decoration: none;
-}
-a.controlToggle:link {
- margin: 5px;
- padding: 5px;
- color: black;
- background: transparent;
- text-decoration: none;
-}
-a.controlToggle:visited {
- margin: 5px;
- padding: 5px;
- color: black;
- background: transparent;
- text-decoration: none;
-}
-a.controlToggle:hover {
- margin: 5px;
- padding: 5px;
- color: black;
- background: transparent;
- text-decoration: underline;
- font-weight: bold;
+.form-signin input[type="password"] {
+ margin-bottom: 10px;
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
}
-/* ----------------------------------------------------------------------
-Misc styles
----------------------------------------------------------------------- */
+/* Sticky footer styles */
-div.NN4 {
- display: none;
-}
-div.rNavigationBar {
- margin-bottom: 20px;
- margin-right: 10px;
+html {
+ position: relative;
+ min-height: 100%;
}
-.entryDate {
- background: transparent;
- color: #989898;
- font-style: italic;
-}
-.commentTitle {
- background: #FFFFDD;
- border: 1px solid #000;
- padding: 3px;
- margin: 0px 5px 10px 0px;
- color: #000000;
- font-size: .9em;
- width: 98%;
-}
-.version {
- font-size: x-small;
- color: #808080;
+body {
+ margin-bottom: 60px;
}
-.page {
- visibility: hidden;
+.footer {
position: absolute;
- float: left;
- background-color: white;
- border: 1px gray solid;
- padding: 10px;
- width: 80%;
- height: 40em;
-}
-.tab {
- background-color: white;
- border-top: 1px gray solid;
- border-left: 1px gray solid;
- border-right: 1px gray solid;
- font-family: verdana;
- padding: 5px;
- margin: 2px;
-}
-
-p.websiteDescription {
- font-style: italic;
- font-size: 11px;
-}
-.version {
- font-size: small;
- color: gray;
+ bottom: 0;
+ width: 100%;
+ height: 60px;
+ background-color: #f5f5f5;
+ padding: 1.5em;
text-align: center;
}
-span .details {
- font-size: inherit;
-}
-div.helptext {
- background: #f0f0f0;
- border: 1px #c0c0c0 solid;
- padding: 2px;
- margin: 30px 10px 10px 0px;
- width: 75%;
-}
-.padleft {
- padding-left: 8px;
-}
-#logo {
- padding: 15px 0px 10px 15px;
-}
-/* Transparent PNG fix for IE, thanks to Kenneth M. Kolano */
-#logoshadow {
- top: 15px;
- left: 15px;
- width: 165px;
- height: 50px;
- _background: transparent !important;
- background-image: url(../images/logo-shadow.png);
-}
-#logobackground {
- width: 159px;
- height: 44px;
-}
-#logoimage {
- width: 159px;
- height: 44px;
- display: block;
- cursor: pointer; /* Make IE show correct cursor for link */
- background-image: url(../images/transparent-logo.png);
-}
-
-/* main menu page */
-
-span.mm_weblog_name {
- font-size: large;
- font-weight: bold;
-}
-table.mm_table {
- margin-top: 8px;
-}
-td.mm_table_actions {
- padding-left: 4px;
-}
-td.mm_subtable_label {
- width: 105px;
- vertical-align: top;
- font-weight: bold;
-}
-
-
-/* media file pages */
-
-.mediaFileSearchResult {
- float: left;
- margin: 10px 10px 10px 10px;
-}
-
-div.mediaFileThumbnail {
- float:right;
- width:120px;
- height:120px;
- border:1px solid grey;
- margin: 10px
-}
-
-
-/* weblog entry form page */
-
-span.entryEditSidebarLink {
- font-size: smaller;
-}
-.entryEditTable td {
- padding: 0px 0px 8px 0px;
-}
-td.entryEditFormLabel {
- padding-right: 15px;
- padding-left: 2px;
- font-weight: bold;
-}
-
-pre {
- padding: 5px 5px 5px 7px;
- background: #f5f5f5;
- color: #000;
- border: 1px dotted #ccc;
- margin-left: 5px;
- margin-right: 5px;
- overflow: auto;
-}
-
-.toplabel {
- font-weight: bold;
- margin: 10px 0px 0px 0px;
-}
-.miscControl {
- margin-bottom: 5px;
-}
-
-.chooser {
- margin: 10px;
- padding: 10px 20px 20px 20px;
- background: #eee;
- border: 1px solid #gray;
- height: 8em;
-}
-
-div.selectedChooser {
- background: #CCFFCC;
- border: 1px solid #008000;
-}
-
-div.chooser h2 {
- letter-spacing: 0.0em;
-}
-
-div.optioner {
- margin: 0px 30px 30px 30px;
-}
-
-
-/* ---------------------------------------------------------------------- */
-/* Media File styles */
-
-.align-images {
- display:inline;
- float:left;
- margin:5px;
- list-style-type:none;
- width:140px;
- height:140px;
- border: 1px solid #ccc;
-}
-
-.dir-image {
- cursor:pointer;
- width:25px;
- height:25px;
- padding:40px 45px;
-}
-
-/*** For context menu ***/
-
-#menu h1 {
- line-height:120%;
- margin:15px 0px;
- padding-left: 0.5em;
-}
-
-/*** Right control floats aka clearfix ***/
-.clearfix:after {
- content: "";
- display: table;
- clear: both;
-}
[35/47] roller git commit: Merge pull request #1 from
lbtc-xxx/fix_login_css_jsp_not_found
Posted by sn...@apache.org.
Merge pull request #1 from lbtc-xxx/fix_login_css_jsp_not_found
Fix: "javax.servlet.ServletException: File [/WEB-INF/jsps/core/Login-\u2026
Thanks Kohei!
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/80765a0d
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/80765a0d
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/80765a0d
Branch: refs/heads/bootstrap-ui
Commit: 80765a0d64bdc70b9d5bee17ff31919e03cc79f9
Parents: 8042fd7 c5e8475
Author: David M. Johnson <sn...@apache.org>
Authored: Sat Jan 9 09:58:35 2016 -0500
Committer: David M. Johnson <sn...@apache.org>
Committed: Sat Jan 9 09:58:35 2016 -0500
----------------------------------------------------------------------
.../main/webapp/WEB-INF/jsps/core/Login-css.jsp | 23 ++++++++++++++++++++
.../main/webapp/WEB-INF/jsps/core/login-css.jsp | 23 --------------------
2 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
[44/47] roller git commit: When new blogroll created, switch to it.
Posted by sn...@apache.org.
When new blogroll created, switch to it.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/8553cb55
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/8553cb55
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/8553cb55
Branch: refs/heads/bootstrap-ui
Commit: 8553cb5555474af199bd69b7036f28fa4f0ae655
Parents: f76eb9d
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Apr 3 11:40:50 2016 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Apr 3 11:40:50 2016 -0400
----------------------------------------------------------------------
.../weblogger/ui/struts2/editor/BookmarkEdit.java | 4 ++++
.../weblogger/ui/struts2/editor/Bookmarks.java | 10 ++++++++++
.../weblogger/ui/struts2/editor/FolderEdit.java | 15 ++++++++++++++-
.../main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp | 15 ++++++++++++---
4 files changed, 40 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/8553cb55/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
index 725dcfd..461aec9 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
@@ -27,8 +27,11 @@ import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
+import org.apache.struts2.interceptor.ServletResponseAware;
import org.apache.struts2.interceptor.validation.SkipValidation;
+import javax.servlet.http.HttpServletResponse;
+
/**
* Edit a new or existing bookmark (blogroll item).
@@ -147,4 +150,5 @@ public class BookmarkEdit extends UIAction {
public WeblogBookmark getBookmark() {
return bookmark;
}
+
}
http://git-wip-us.apache.org/repos/asf/roller/blob/8553cb55/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
index 3b91677..6893915 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
@@ -157,7 +157,13 @@ public class Bookmarks extends UIAction {
try {
BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
WeblogBookmarkFolder fd = bmgr.getFolder(getFolderId());
+
if (fd != null) {
+
+ if ( "default".equals( fd.getName() ) ) {
+ addError("Cannot delete default bookmark");
+ return execute();
+ }
bmgr.removeFolder(fd);
// flush changes
@@ -170,6 +176,7 @@ public class Bookmarks extends UIAction {
setFolder(bmgr.getDefaultFolder(getActionWeblog()));
setFolderId(getFolder().getId());
}
+
} catch (WebloggerException ex) {
log.error("Error deleting folder", ex);
}
@@ -280,6 +287,9 @@ public class Bookmarks extends UIAction {
public void setFolder(WeblogBookmarkFolder folder) {
this.folder = folder;
+ if ( folder != null ) {
+ this.folderId = folder.getId();
+ }
}
public String getViewFolderId() {
http://git-wip-us.apache.org/repos/asf/roller/blob/8553cb55/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
index 10a7201..bbecdfa 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
@@ -27,13 +27,16 @@ import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
import org.apache.roller.weblogger.util.cache.CacheManager;
+import org.apache.struts2.interceptor.ServletResponseAware;
import org.apache.struts2.interceptor.validation.SkipValidation;
+import javax.servlet.http.HttpServletResponse;
+
/**
* Edit a new or existing folder.
*/
-public class FolderEdit extends UIAction {
+public class FolderEdit extends UIAction implements ServletResponseAware {
private static Log log = LogFactory.getLog(FolderEdit.class);
@@ -46,6 +49,9 @@ public class FolderEdit extends UIAction {
// the folder we are adding or editing
private WeblogBookmarkFolder folder = null;
+ private HttpServletResponse httpServletResponse;
+
+
public FolderEdit() {
this.desiredMenu = "editor";
}
@@ -72,6 +78,11 @@ public class FolderEdit extends UIAction {
}
}
+ @Override
+ public void setServletResponse(HttpServletResponse httpServletResponse) {
+ this.httpServletResponse = httpServletResponse;
+ }
+
/**
* Show folder edit page.
*/
@@ -112,6 +123,8 @@ public class FolderEdit extends UIAction {
addMessage("folderForm.updated");
}
+ httpServletResponse.addHeader("folderId", folderId );
+
return SUCCESS;
} catch(Exception ex) {
http://git-wip-us.apache.org/repos/asf/roller/blob/8553cb55/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
index 0ed4f00..d211877 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
@@ -322,7 +322,7 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
function deleteFolder() {
- $('#boomarks_delete_folder_folderId').val('<s:text name="%{folder.id}"/>');
+ $('#boomarks_delete_folder_folderId').val( $('#bookmarks_folderId:first').val() );
$('#deleteBlogrollName').html('<s:text name="%{folder.name}"/>');
@@ -437,7 +437,7 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
data: $("#folderEditForm").serialize(),
context: document.body
- }).done(function (data) {
+ }).done(function (data, status, response) {
// kludge: scrape response status from HTML returned by Struts
var alertEnd = data.indexOf("ALERT_END");
@@ -449,7 +449,15 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
feedbackAreaBlogrollEdit.css("color", "green");
feedbackAreaBlogrollEdit.html('<s:text name="generic.success" />');
$('#blogroll-edit-modal').modal("hide");
- location.reload(true);
+
+ // kludge get folderId from response header send back by Struts action
+ var newFolderId = response.getResponseHeader('folderId');
+ viewSelector.append( new Option('', newFolderId ));
+ $("#bookmarks_viewFolderId").val( newFolderId );
+
+ var bookmarksForm = $("#bookmarks")[0];
+ bookmarksForm.action = "bookmarks!view.rol";
+ bookmarksForm.submit();
}
}).error(function (data) {
@@ -727,6 +735,7 @@ We used to call them Bookmarks and Folders, now we call them Blogroll links and
feedbackAreaEdit.css("color", "green");
feedbackAreaEdit.html('<s:text name="generic.success" />');
$('#category-edit-modal').modal("hide");
+
location.reload(true);
}
[10/47] roller git commit: Merge branch 'trunk' of
https://github.com/apache/roller into trunk
Posted by sn...@apache.org.
Merge branch 'trunk' of https://github.com/apache/roller into trunk
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/f6e3764e
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/f6e3764e
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/f6e3764e
Branch: refs/heads/bootstrap-ui
Commit: f6e3764e7fd1d311da6af98e982a9ac002152d3b
Parents: 00bfff9 3a3c969
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Nov 24 17:17:26 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Nov 24 17:17:26 2015 -0500
----------------------------------------------------------------------
.../org/apache/roller/util/RollerConstants.java | 3 +++
.../roller/weblogger/business/HitCountQueue.java | 5 ++---
.../business/runnable/TaskScheduler.java | 18 ++++++++++++++----
.../business/runnable/ThreadManagerImpl.java | 17 ++++++++++++++++-
4 files changed, 35 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[28/47] roller git commit: Categories page is complete with add,
edit and delete category in place.
Posted by sn...@apache.org.
Categories page is complete with add, edit and delete category in place.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/5bd3c532
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/5bd3c532
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/5bd3c532
Branch: refs/heads/bootstrap-ui
Commit: 5bd3c5329dfb3293c375c05f41096bbf00508e53
Parents: 53ae365
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Dec 27 15:20:44 2015 -0500
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Dec 27 15:20:44 2015 -0500
----------------------------------------------------------------------
.../ui/struts2/editor/CategoryEdit.java | 20 +++-
.../resources/ApplicationResources.properties | 9 +-
.../main/webapp/WEB-INF/jsps/core/login-css.jsp | 23 ++++
.../webapp/WEB-INF/jsps/editor/Categories.jsp | 112 +++++++++++--------
.../WEB-INF/jsps/editor/CategoriesSidebar.jsp | 74 +++++++++---
.../main/webapp/WEB-INF/jsps/tiles/messages.jsp | 2 +
.../WEB-INF/jsps/tiles/tiles-simplepage.jsp | 1 -
app/src/main/webapp/WEB-INF/tiles.xml | 1 +
app/src/main/webapp/roller-ui/styles/roller.css | 18 ++-
9 files changed, 186 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/5bd3c532/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
index 99fbc9f..a146196 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
@@ -62,10 +62,12 @@ public class CategoryEdit extends UIAction {
public void myPrepare() {
- if (StringUtils.isEmpty(bean.getId())) {
+
+ if ( isAdd() ) {
// Create and initialize new, not-yet-saved category
category = new WeblogCategory();
category.setWeblog(getActionWeblog());
+
} else {
try {
WeblogEntryManager wmgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
@@ -90,7 +92,7 @@ public class CategoryEdit extends UIAction {
}
private boolean isAdd() {
- return actionName.equals("categoryAdd");
+ return StringUtils.isEmpty( bean.getId() );
}
/**
@@ -132,10 +134,16 @@ public class CategoryEdit extends UIAction {
}
public void myValidate() {
- // make sure new name is not a duplicate of an existing category
- if ((isAdd() || !category.getName().equals(bean.getName())) &&
- category.getWeblog().hasCategory(bean.getName())) {
- addError("categoryForm.error.duplicateName", bean.getName());
+
+ if ( isAdd() ) {
+ if ( getActionWeblog().hasCategory( bean.getName() ) ) {
+ addError("categoryForm.error.duplicateName", bean.getName());
+ }
+ } else {
+ WeblogCategory wc = getActionWeblog().getWeblogCategory(bean.getName());
+ if ( wc != null && !wc.getId().equals( bean.getId() )) {
+ addError("categoryForm.error.duplicateName", bean.getName());
+ }
}
}
http://git-wip-us.apache.org/repos/asf/roller/blob/5bd3c532/app/src/main/resources/ApplicationResources.properties
----------------------------------------------------------------------
diff --git a/app/src/main/resources/ApplicationResources.properties b/app/src/main/resources/ApplicationResources.properties
index 2b753ce..250fe3e 100644
--- a/app/src/main/resources/ApplicationResources.properties
+++ b/app/src/main/resources/ApplicationResources.properties
@@ -33,9 +33,10 @@ generic.save=Save
generic.edit=Edit
generic.delete=Delete
generic.tagline=Tagline
-generic.error.check.logs=Roller system error - Have administrator check Roller logs for more information.
+generic.error.check.logs=System error - check logs for more information.
generic.changes.saved=Changes saved
generic.toggle=Toggle
+generic.success=Success
# ------------------------------------------------------------- BookmarkForm.jsp
@@ -135,11 +136,11 @@ categoryForm.edit.subtitle=Editing category
categoryForm.add.title=Add Category
categoryForm.add.subtitle=Adding category
categoryForm.image=Image URL
-categoryForm.created=Category "{0}" created
+categoryForm.created=Category created
categoryForm.changesSaved=Category "{0}" updated
-categoryForm.error.duplicateName=Category name "{0}" already in use, please choose another
+categoryForm.error.duplicateName=Category name already in use
categoryForm.removed=Category "{0}" deleted
-categoryForm.requiredFields={0} is required.
+categoryForm.requiredFields=Name is required.
# errors from validation
Category.error.nameNull=Name is a required field
http://git-wip-us.apache.org/repos/asf/roller/blob/5bd3c532/app/src/main/webapp/WEB-INF/jsps/core/login-css.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/core/login-css.jsp b/app/src/main/webapp/WEB-INF/jsps/core/login-css.jsp
new file mode 100644
index 0000000..1cd65ea
--- /dev/null
+++ b/app/src/main/webapp/WEB-INF/jsps/core/login-css.jsp
@@ -0,0 +1,23 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. The ASF licenses this file to You
+ under the Apache License, Version 2.0 (the "License"); you may not
+ use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. For additional information regarding
+ copyright in this work, please see the NOTICE file in the top level
+ directory of this distribution.
+--%>
+
+.roller-page-title {
+ margin-top: 0px;
+ margin-bottom: 5px;
+ text-align: center;
+}
http://git-wip-us.apache.org/repos/asf/roller/blob/5bd3c532/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
index b45ccfd..03d6f4e 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
@@ -84,7 +84,7 @@
<a href="#" onclick="showCategoryDeleteModal(
'<s:property value="categoryId" />',
'<s:property value="categoryName" />',
- '<s:property value="categoryInUse"/>' )" >
+ <s:property value="categoryInUse"/> )" >
<span class="glyphicon glyphicon-trash"></span>
</a>
@@ -116,70 +116,92 @@
<div class="modal-content">
- <s:set var="mainAction">categoryEdit</s:set>
-
<div class="modal-header">
- <h3><s:text name="categoryForm.edit.title" /></h3>
- <p class="pagetip">
- <s:text name="categoryForm.requiredFields">
- <s:param><s:text name="generic.name"/></s:param>
- </s:text>
- </p>
+ <h3 id="category-edit-title"></h3>
</div>
-
- <s:form action="categoryEdit!save" theme="bootstrap" cssClass="form-horizontal">
- <s:hidden name="salt"/>
- <s:hidden name="weblog"/>
- <s:hidden name="bean.id"/>
- <div class="modal-body">
- <s:textfield name="bean.name" label="%{getText('generic.name')}" maxlength="255"/>
+ <div class="modal-body">
+ <s:form action="#" id="categoryEditForm" theme="bootstrap" cssClass="form-horizontal">
+ <s:hidden name="salt"/>
+ <s:hidden name="weblog"/>
+ <s:hidden name="bean.id"/>
+
+ <%-- action needed here because we are using AJAX to post this form --%>
+ <s:hidden name="action:categoryEdit!save" value="save"/>
+
+ <s:textfield name="bean.name" label="%{getText('generic.name')}" maxlength="255"/>
<s:textfield name="bean.description" label="%{getText('generic.description')}"/>
- <s:textfield name="bean.image" label="%{getText('categoryForm.image')}"/>
- </div>
+ <s:textfield name="bean.image" label="%{getText('categoryForm.image')}"/>
+ </s:form>
+ </div>
- <div class="modal-footer">
- <s:submit cssClass="btn btn-primary"
- value="%{getText('generic.save')}" action="%{#mainAction}!save"/>
- <button type="button" class="btn" data-dismiss="modal">
- <s:text name="generic.cancel" />
- </button>
- </div>
- </s:form>
+ <div class="modal-footer">
+ <p id="feedback-area-edit"></p>
+ <button onclick="submitEditedCategory()" class="btn btn-primary">
+ <s:text name="generic.save"/>
+ </button>
+ <button type="button" class="btn" data-dismiss="modal">
+ <s:text name="generic.cancel"/>
+ </button>
+ </div>
</div>
</div>
</div>
<script>
+
+ var feedbackAreaEdit = $("#feedback-area-edit");
+
function showCategoryEditModal( id, name, desc, image ) {
- $('#categoryEdit_bean_id').val(id);
- $('#categoryEdit_bean_name').val(name);
- $('#categoryEdit_bean_description').val(desc);
- $('#categoryEdit_bean_image').val(image);
+ feedbackAreaEdit.html("");
+ $('#category-edit-title').html('<s:text name="categoryForm.edit.title" />');
+
+ $('#categoryEditForm_bean_id').val(id);
+ $('#categoryEditForm_bean_name').val(name);
+ $('#categoryEditForm_bean_description').val(desc);
+ $('#categoryEditForm_bean_image').val(image);
+
$('#category-edit-modal').modal({show: true});
}
- <%--
- (function() {
- $('form > input').keyup(function() {
+ function submitEditedCategory() {
+
+ // if name is empty reject and show error message
+ if ($("#categoryEditForm_bean_name").val().trim() == "") {
+ feedbackAreaEdit.html('<s:text name="categoryForm.requiredFields" />');
+ feedbackAreaEdit.css("color", "red");
+ return;
+ }
+
+ // post category via AJAX
+ $.ajax({
+ method: 'post',
+ url: "categoryEdit!save.rol",
+ data: $("#categoryEditForm").serialize(),
+ context: document.body
+
+ }).done(function (data) {
- var empty = false;
- $('form > input').each(function() {
- if ($(this).val() == '') {
- empty = true;
- }
- });
+ // kludge: scrape response status from HTML returned by Struts
+ var alertEnd = data.indexOf("ALERT_END");
+ if (data.indexOf('<s:text name="categoryForm.error.duplicateName" />') < alertEnd) {
+ feedbackAreaEdit.css("color", "red");
+ feedbackAreaEdit.html('<s:text name="categoryForm.error.duplicateName" />');
- if (empty) {
- $('#register').attr('disabled', 'disabled');
} else {
- $('#register').removeAttr('disabled');
+ feedbackAreaEdit.css("color", "green");
+ feedbackAreaEdit.html('<s:text name="generic.success" />');
+ $('#category-edit-modal').modal("hide");
+ location.reload(true);
}
+
+ }).error(function (data) {
+ feedbackAreaEdit.html('<s:text name="generic.error.check.logs" />');
+ feedbackAreaEdit.css("color", "red");
});
- })()
- --%>
-
+ }
+
</script>
http://git-wip-us.apache.org/repos/asf/roller/blob/5bd3c532/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
index 2aa0d4e..81a0b7a 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
@@ -25,6 +25,7 @@
<s:set name="categoryName" value="#post.name"/>
<s:set name="categoryDesc" value="#post.description"/>
<s:set name="categoryImage" value="#post.image"/>
+
<a href="#" onclick="showCategoryAddModal()">
<span class="glyphicon glyphicon-plus"></span>
<s:text name="categoriesForm.addCategory"/>
@@ -32,6 +33,7 @@
</p>
+<%--
<div id="category-add-modal" class="modal fade category-add-modal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg">
@@ -39,55 +41,93 @@
<div class="modal-content">
<div class="modal-header">
- <h3> <s:text name="categoryForm.add.title"/> </h3>
+ <h3><s:text name="categoryForm.add.title"/></h3>
</div>
<div class="modal-body">
<s:form id="categoryAddForm" theme="bootstrap" cssClass="form-horizontal">
<s:hidden name="salt"/>
<s:hidden name="weblog"/>
- <s:textfield name="bean.name" label="%{getText('generic.name')}" maxlength="255"/>
+
+ <s:hidden name="action:categoryAdd!save" value="save"/>
+
+ <s:textfield name="bean.name" label="%{getText('generic.name')}" maxlength="255"/>
<s:textfield name="bean.description" label="%{getText('generic.description')}"/>
- <s:textfield name="bean.image" label="%{getText('categoryForm.image')}"/>
+ <s:textfield name="bean.image" label="%{getText('categoryForm.image')}"/>
</s:form>
</div>
<div class="modal-footer">
+ <p id="feedback-area"></p>
<button onclick="submitNewCategory()" class="btn btn-primary">
- <s:text name="generic.save" />
+ <s:text name="generic.save"/>
</button>
<button type="button" class="btn" data-dismiss="modal">
- <s:text name="generic.cancel" />
+ <s:text name="generic.cancel"/>
</button>
</div>
</div>
</div>
</div>
+--%>
<script>
- function showCategoryAddModal( postId, postTitle ) {
- $('#category-add-modal').modal({show: true});
+
+ var feedbackArea = $("#feedback-area");
+
+ function showCategoryAddModal() {
+
+ feedbackAreaEdit.html("");
+ $('#category-edit-title').html('<s:text name="categoryForm.add.title" />');
+
+ $('#categoryEditForm_bean_id').val("");
+ $('#categoryEditForm_bean_name').val("");
+ $('#categoryEditForm_bean_description').val("");
+ $('#categoryEditForm_bean_image').val("");
+
+ $('#category-edit-modal').modal({show: true});
}
+
+</script>
+
+ <%--
function submitNewCategory() {
// if name is empty reject and show error message
- if ( $("#categoryAdd_bean_name").val().trim() == "" ) {
- alert("Name is required");
+ if ( $("#categoryAddForm_bean_name").val().trim() == "" ) {
+ feedbackArea.html('<s:text name="categoryForm.requiredFields" />');
+ feedbackArea.css("color", "red");
return;
}
-
- // post category via Ajax
+
+
+ // post category via AJAX
$.ajax({
- url: "categoryAdd!save",
+ method: 'post',
+ url: "categoryEdit!save.rol",
data: $("#categoryAddForm").serialize(),
context: document.body
+
}).done(function(data) {
- alert("Done");
+
+ // kludge: scrape response status from HTML returned by Struts
+ var alertEnd = data.indexOf("ALERT_END");
+ if ( data.indexOf( '<s:text name="categoryForm.error.duplicateName" />' ) < alertEnd ) {
+ feedbackArea.css("color", "red");
+ feedbackArea.html('<s:text name="categoryForm.error.duplicateName" />');
+
+ } else {
+ feedbackArea.css("color", "green");
+ feedbackArea.html('<s:text name="categoryForm.created" />');
+ $('#category-add-modal').modal("hide");
+ }
+
+ }).error(function(data) {
+ feedbackArea.html('<s:text name="generic.error.check.logs" />');
+ feedbackArea.css("color", "red");
});
-
- // if post failed, then show error messages
-
- // else dismiss modal
}
+
</script>
+--%>
http://git-wip-us.apache.org/repos/asf/roller/blob/5bd3c532/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
index 164ca5a..ad2e9c6 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/messages.jsp
@@ -39,3 +39,5 @@
</ul>
</div>
</s:if>
+
+<!-- ALERT_END: this comment needed for CategoriesSidebar.jsp -->
http://git-wip-us.apache.org/repos/asf/roller/blob/5bd3c532/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
index 2a0fa41..bbbcc09 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp
@@ -34,7 +34,6 @@
<h1 class="roller-page-title"><s:property value="pageTitle"/></h1>
<tiles:insertAttribute name="messages"/>
-
<tiles:insertAttribute name="content"/>
</body>
http://git-wip-us.apache.org/repos/asf/roller/blob/5bd3c532/app/src/main/webapp/WEB-INF/tiles.xml
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/tiles.xml b/app/src/main/webapp/WEB-INF/tiles.xml
index 5168c0e..ea7877d 100644
--- a/app/src/main/webapp/WEB-INF/tiles.xml
+++ b/app/src/main/webapp/WEB-INF/tiles.xml
@@ -90,6 +90,7 @@
<!-- core pages (and associates) -->
<definition name=".Login" extends=".tiles-simplepage" >
<put-attribute name="content" value="/WEB-INF/jsps/core/Login.jsp" />
+ <put-attribute name="styles" value="/WEB-INF/jsps/core/Login-css.jsp" />
</definition>
<definition name=".Register" extends=".tiles-simplepage" >
http://git-wip-us.apache.org/repos/asf/roller/blob/5bd3c532/app/src/main/webapp/roller-ui/styles/roller.css
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/roller-ui/styles/roller.css b/app/src/main/webapp/roller-ui/styles/roller.css
index bd7b185..a828574 100644
--- a/app/src/main/webapp/roller-ui/styles/roller.css
+++ b/app/src/main/webapp/roller-ui/styles/roller.css
@@ -37,7 +37,18 @@ table {
padding-right: 1em;
}
-.date-form { margin: 10px; }
+.date-form {
+ margin: 10px;
+}
+
+.fade {
+ opacity: 0;
+ -webkit-transition: opacity 1.25s linear;
+ -moz-transition: opacity 1.25s linear;
+ -ms-transition: opacity 1.25s linear;
+ -o-transition: opacity 1.25s linear;
+ transition: opacity 1.25s linear;
+}
/* main menu */
@@ -152,6 +163,11 @@ table.innertable tr .viewbody .bot {
padding-bottom: 10px;
}
+/* categories */
+
+#feedback-area {
+ float: left;
+}
/* sign-in */
[24/47] roller git commit: Comment management page done.
Posted by sn...@apache.org.
Comment management page done.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/a5ec43be
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/a5ec43be
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/a5ec43be
Branch: refs/heads/bootstrap-ui
Commit: a5ec43bea47baf3fe4f179644f1b0ca83ec3ed45
Parents: f73f35a
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Dec 23 11:27:14 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Dec 23 11:27:14 2015 -0500
----------------------------------------------------------------------
.../webapp/WEB-INF/jsps/editor/Comments.jsp | 484 ++++++++++---------
.../WEB-INF/jsps/editor/CommentsSidebar.jsp | 153 +++---
.../main/webapp/WEB-INF/jsps/editor/Entries.jsp | 3 -
.../WEB-INF/jsps/editor/EntriesSidebar.jsp | 207 ++++----
app/src/main/webapp/roller-ui/styles/roller.css | 45 ++
5 files changed, 479 insertions(+), 413 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/a5ec43be/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
index 41543cb..e950843 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
@@ -19,6 +19,7 @@
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script>
+<%-- are we on a blog's comment management page or the global admin's comment management page? --%>
<s:if test="actionName == 'comments'">
<s:set var="mainAction">comments</s:set>
</s:if>
@@ -26,36 +27,6 @@
<s:set var="mainAction">globalCommentManagement</s:set>
</s:else>
-<script>
-<s:if test="pager.items != null">
- $(document).ready(function(){
- $('#checkallapproved').click(function() {
- toggleFunction(true,"bean.approvedComments");
- });
- $('#clearallapproved').click(function() {
- toggleFunction(false,"bean.approvedComments");
- });
- $('#checkallspam').click(function() {
- toggleFunction(true,"bean.spamComments");
- });
- $('#clearallspam').click(function() {
- toggleFunction(false,"bean.spamComments");
- });
- $('#checkalldelete').click(function() {
- toggleFunction(true,"bean.deleteComments");
- });
- $('#clearalldelete').click(function() {
- toggleFunction(false,"bean.deleteComments");
- });
- });
-</s:if>
- function bulkDelete() {
- if (window.confirm('<s:text name="commentManagement.confirmBulkDelete"><s:param value="bulkDeleteCount" /></s:text>')) {
- document.commentQueryForm.method.value = "bulkDelete";
- document.commentQueryForm.submit();
- }
- }
-</script>
<p class="subtitle">
<s:if test="actionName == 'comments'">
@@ -71,306 +42,372 @@
</s:else>
</s:if>
<s:else>
- <s:text name="commentManagement.subtitle" />
+ <s:text name="commentManagement.subtitle"/>
</s:else>
</p>
<s:if test="pager.items.isEmpty">
- <s:text name="commentManagement.noCommentsFound" />
+ <s:text name="commentManagement.noCommentsFound"/>
</s:if>
<s:else>
<p class="pagetip">
<s:if test="actionName == 'comments'">
- <s:text name="commentManagement.tip" />
+ <s:text name="commentManagement.tip"/>
</s:if>
<s:else>
- <s:text name="commentManagement.globalTip" />
+ <s:text name="commentManagement.globalTip"/>
</s:else>
</p>
-<%-- ============================================================= --%>
-<%-- Comment table / form with checkboxes --%>
-<%-- ============================================================= --%>
+ <%-- ============================================================= --%>
+ <%-- Comment table / form with checkboxes --%>
-<s:form action="%{#mainAction}!update">
- <s:hidden name="salt" />
- <s:hidden name="bean.ids" />
- <s:hidden name="bean.startDateString" />
- <s:hidden name="bean.endDateString" />
- <s:if test="actionName == 'comments'">
- <s:hidden name="bean.entryId" />
- <s:hidden name="bean.searchString" />
- <s:hidden name="bean.approvedString" />
- <s:hidden name="weblog" />
- </s:if>
- <s:else>
- <s:hidden name="bean.offset" />
- <s:hidden name="bean.count" />
- <s:hidden name="bean.pendingString" />
- </s:else>
+ <s:form action="%{#mainAction}!update">
+ <s:hidden name="salt"/>
+ <s:hidden name="bean.ids"/>
+ <s:hidden name="bean.startDateString"/>
+ <s:hidden name="bean.endDateString"/>
+ <s:if test="actionName == 'comments'">
+ <s:hidden name="bean.entryId"/>
+ <s:hidden name="bean.searchString"/>
+ <s:hidden name="bean.approvedString"/>
+ <s:hidden name="weblog"/>
+ </s:if>
+ <s:else>
+ <s:hidden name="bean.offset"/>
+ <s:hidden name="bean.count"/>
+ <s:hidden name="bean.pendingString"/>
+ </s:else>
-<%-- ============================================================= --%>
-<%-- Number of comments and date message --%>
-<%-- ============================================================= --%>
+ <%-- ============================================================= --%>
+ <%-- Number of comments and date message --%>
<div class="tablenav">
<div style="float:left;">
<s:text name="commentManagement.nowShowing">
- <s:param value="pager.items.size()" />
+ <s:param value="pager.items.size()"/>
</s:text>
</div>
<div style="float:right;">
<s:if test="firstComment.postTime != null">
<s:text name="commentManagement.date.toStringFormat">
- <s:param value="firstComment.postTime" />
+ <s:param value="firstComment.postTime"/>
</s:text>
</s:if>
---
<s:if test="lastComment.postTime != null">
<s:text name="commentManagement.date.toStringFormat">
- <s:param value="lastComment.postTime" />
+ <s:param value="lastComment.postTime"/>
</s:text>
</s:if>
</div>
- <br />
+ <br/>
- <%-- ============================================================= --%>
- <%-- Next / previous links --%>
- <%-- ============================================================= --%>
+ <%-- ============================================================= --%>
+ <%-- Next / previous links --%>
- <s:if test="pager.prevLink != null && pager.nextLink != null">
- <br /><center>
- «
- <a href='<s:property value="pager.prevLink" />'>
- <s:text name="commentManagement.prev" /></a>
- | <a href='<s:property value="pager.nextLink" />'>
- <s:text name="commentManagement.next" /></a>
- »
- </center><br />
- </s:if>
- <s:elseif test="pager.prevLink != null">
- <br /><center>
- «
- <a href='<s:property value="pager.prevLink" />'>
- <s:text name="commentManagement.prev" /></a>
- | <s:text name="commentManagement.next" />
- »
- </center><br />
- </s:elseif>
- <s:elseif test="pager.nextLink != null">
- <br /><center>
- «
- <s:text name="commentManagement.prev" />
- | <a class="" href='<s:property value="pager.nextLink" />'>
- <s:text name="commentManagement.next" /></a>
- »
- </center><br />
- </s:elseif>
- <s:else><br /></s:else>
+ <nav>
+ <ul class="pager">
+ <s:if test="pager.prevLink != null">
+ <li class="previous">
+ <a href='<s:property value="pager.prevLink" />'>
+ <span aria-hidden="true">←</span>Newer</a>
+ </li>
+ </s:if>
+ <s:if test="pager.nextLink != null">
+ <li class="next">
+ <a href='<s:property value="pager.nextLink"/>'>Older
+ <span aria-hidden="true">→</span></a>
+ </li>
+ </s:if>
+ </ul>
+ </nav>
</div> <%-- class="tablenav" --%>
-<%-- ============================================================= --%>
-<%-- Bulk comment delete link --%>
-<%-- ============================================================= --%>
+ <%-- ============================================================= --%>
+ <%-- Bulk comment delete link --%>
+ <%-- ============================================================= --%>
<s:if test="bulkDeleteCount > 0">
<p>
<s:text name="commentManagement.bulkDeletePrompt1">
- <s:param value="bulkDeleteCount" />
+ <s:param value="bulkDeleteCount"/>
</s:text>
<a href="#" onclick="bulkDelete()">
- <s:text name="commentManagement.bulkDeletePrompt2" />
+ <s:text name="commentManagement.bulkDeletePrompt2"/>
</a>
</p>
</s:if>
+ <table class="rollertable table table-striped" width="100%">
- <table class="rollertable" width="100%">
-
- <%-- ======================================================== --%>
- <%-- Comment table header --%>
+ <%-- ======================================================== --%>
+ <%-- Comment table header --%>
<tr>
<s:if test="actionName == 'comments'">
<th class="rollertable" width="5%">
- <s:text name="commentManagement.columnApproved" />
+ <s:text name="commentManagement.columnApproved"/>
</th>
</s:if>
<th class="rollertable" width="5%">
- <s:text name="commentManagement.columnSpam" />
+ <s:text name="commentManagement.columnSpam"/>
</th>
- <th class="rollertable" width="5%" >
- <s:text name="generic.delete" />
+ <th class="rollertable" width="5%">
+ <s:text name="generic.delete"/>
</th>
<th class="rollertable">
- <s:text name="commentManagement.columnComment" />
+ <s:text name="commentManagement.columnComment"/>
</th>
</tr>
- <%-- ======================================================== --%>
- <%-- Select ALL and NONE buttons --%>
+ <%-- ======================================================== --%>
+ <%-- Select ALL and NONE buttons --%>
<tr class="actionrow">
<s:if test="actionName == 'comments'">
<td align="center">
- <s:text name="commentManagement.select" /><br/>
+ <s:text name="commentManagement.select"/><br/>
- <span id="checkallapproved"><a href="#"><s:text name="generic.all" /></a></span><br />
- <span id="clearallapproved"><a href="#"><s:text name="generic.none" /></a></span>
+ <span id="checkallapproved"><a href="#"><s:text name="generic.all"/></a></span><br/>
+ <span id="clearallapproved"><a href="#"><s:text name="generic.none"/></a></span>
</td>
</s:if>
<td align="center">
- <s:text name="commentManagement.select" /><br/>
+ <s:text name="commentManagement.select"/><br/>
- <span id="checkallspam"><a href="#"><s:text name="generic.all" /></a></span><br />
- <span id="clearallspam"><a href="#"><s:text name="generic.none" /></a></span>
+ <span id="checkallspam"><a href="#"><s:text name="generic.all"/></a></span><br/>
+ <span id="clearallspam"><a href="#"><s:text name="generic.none"/></a></span>
</td>
<td align="center">
- <s:text name="commentManagement.select" /><br/>
+ <s:text name="commentManagement.select"/><br/>
- <span id="checkalldelete"><a href="#"><s:text name="generic.all" /></a></span><br />
- <span id="clearalldelete"><a href="#"><s:text name="generic.none" /></a></span>
+ <span id="checkalldelete"><a href="#"><s:text name="generic.all"/></a></span><br/>
+ <span id="clearalldelete"><a href="#"><s:text name="generic.none"/></a></span>
</td>
<td align="right">
- <br />
+ <br/>
<span class="pendingCommentBox"> </span>
- <s:text name="commentManagement.pending" />
+ <s:text name="commentManagement.pending"/>
<span class="spamCommentBox"> </span>
- <s:text name="commentManagement.spam" />
+ <s:text name="commentManagement.spam"/>
</td>
</tr>
- <%-- ========================================================= --%>
-<%-- Loop through comments --%>
-<%-- ========================================================= --%>
+ <%-- ========================================================= --%>
+ <%-- Loop through comments --%>
+
+ <%-- it is a bit funky to use checkbox list here, but using checkbox didn't work for me :(
+ we are effectively just creating a checkbox list of 1 item for each iteration of our collection. --%>
<s:iterator id="comment" value="pager.items" status="rowstatus">
<tr>
<s:if test="actionName == 'comments'">
+ <%-- only blog admins (not the global admin) can approve blog comments --%>
<td>
- <%-- a bit funky to use checkbox list here, but using checkbox didn't work for me :(
- we are effectively just creating a checkbox list of 1 item for each iteration of our collection --%>
- <s:checkboxlist name="bean.approvedComments" list="{#comment}" listKey="id" listValue="name" />
+ <s:checkboxlist name="bean.approvedComments" theme="simple" cssClass="comment-select"
+ list="{#comment}" listKey="id" listValue="name"/>
</td>
</s:if>
<td>
- <%-- a bit funky to use checkbox list here, but using checkbox didn't work for me :(
- we are effectively just creating a checkbox list of 1 item for each iteration of our collection --%>
- <s:checkboxlist name="bean.spamComments" list="{#comment}" listKey="id" listValue="name" />
+ <s:checkboxlist name="bean.spamComments" label="" theme="simple" cssClass="comment-select"
+ list="{#comment}" listKey="id" listValue="name"/>
</td>
<td>
- <%-- a bit funky to use checkbox list here, but using checkbox didn't work for me :(
- we are effectively just creating a checkbox list of 1 item for each iteration of our collection --%>
- <s:checkboxlist name="bean.deleteComments" list="{#comment}" listKey="id" listValue="name" />
+ <s:checkboxlist name="bean.deleteComments" label="" theme="simple" cssClass="comment-select"
+ list="{#comment}" listKey="id" listValue="name"/>
</td>
- <%-- ======================================================== --%>
- <%-- Display comment details and text --%>
+ <%-- ======================================================== --%>
+ <%-- Display comment details and text --%>
- <%-- <td> with style if comment is spam or pending --%>
+ <%-- <td> with style if comment is spam or pending --%>
<s:if test="#comment.status.name() == 'SPAM'">
- <td class="spamcomment">
- </s:if>
- <s:elseif test="#comment.status.name() == 'PENDING'">
- <td class="pendingcomment">
- </s:elseif>
- <s:else>
- <td>
- </s:else>
+ <td class="spamcomment">
+ </s:if>
+ <s:elseif test="#comment.status.name() == 'PENDING'">
+ <td class="pendingcomment">
+ </s:elseif>
+ <s:else>
+ <td>
+ </s:else>
- <%-- comment details table in table --%>
- <table class="innertable" >
+ <%-- comment details table in table --%>
+ <table class="innertable">
<tr>
<td class="viewbody">
- <div class="viewdetails bot">
- <div class="details">
- <s:text name="commentManagement.entryTitled" /> :
- <a href='<s:property value="#comment.weblogEntry.permalink" />'>
- <s:property value="#comment.weblogEntry.title" /></a>
- </div>
- <div class="details">
- <s:text name="commentManagement.commentBy" /> :
- <s:if test="#comment.email != null && #comment.name != null">
- <s:text name="commentManagement.commentByBoth" >
- <s:param><s:property value="#comment.name" /></s:param>
- <s:param><s:property value="#comment.email" /></s:param>
- <s:param><s:property value="#comment.email" /></s:param>
- <s:param><s:property value="#comment.remoteHost" /></s:param>
- </s:text>
+
+ <div class="viewdetails bot">
+
+ <div class="details">
+ <s:text name="commentManagement.entryTitled"/> :
+ <a href='<s:property value="#comment.weblogEntry.permalink" />'>
+ <s:property value="#comment.weblogEntry.title"/></a>
+ </div>
+
+ <div class="details">
+ <s:text name="commentManagement.commentBy"/> :
+ <s:if test="#comment.email != null && #comment.name != null">
+ <s:text name="commentManagement.commentByBoth">
+ <s:param><s:property value="#comment.name"/></s:param>
+ <s:param><s:property value="#comment.email"/></s:param>
+ <s:param><s:property value="#comment.email"/></s:param>
+ <s:param><s:property value="#comment.remoteHost"/></s:param>
+ </s:text>
+ </s:if>
+ <s:elseif test="#comment.email == null && #comment.name == null">
+ <s:text name="commentManagement.commentByIP">
+ <s:param><s:property value="#comment.remoteHost"/></s:param>
+ </s:text>
+ </s:elseif>
+ <s:else>
+ <s:text name="commentManagement.commentByName">
+ <s:param><s:property value="#comment.name"/></s:param>
+ <s:param><s:property value="#comment.remoteHost"/></s:param>
+ </s:text>
+ </s:else>
+ </div>
+
+ <s:if test="#comment.url != null && !#comment.url.equals('')">
+ <div class="details">
+ <s:text name="commentManagement.commentByURL"/> :
+ <a href='<s:property value="#comment.url" />'>
+ <str:truncateNicely upper="60" appendToEnd="..."><s:property
+ value="#comment.url"/></str:truncateNicely></a>
+ </div>
</s:if>
- <s:elseif test="#comment.email == null && #comment.name == null">
- <s:text name="commentManagement.commentByIP" >
- <s:param><s:property value="#comment.remoteHost" /></s:param>
- </s:text>
- </s:elseif>
- <s:else>
- <s:text name="commentManagement.commentByName" >
- <s:param><s:property value="#comment.name" /></s:param>
- <s:param><s:property value="#comment.remoteHost" /></s:param>
- </s:text>
- </s:else>
- </div>
- <s:if test="#comment.url != null && !#comment.url.equals('')">
+
<div class="details">
- <s:text name="commentManagement.commentByURL" /> :
- <a href='<s:property value="#comment.url" />'>
- <str:truncateNicely upper="60" appendToEnd="..."><s:property value="#comment.url" /></str:truncateNicely></a>
+ <s:text name="commentManagement.postTime"/> :
+ <s:date name="#comment.postTime"/>
</div>
- </s:if>
- <div class="details">
- <s:text name="commentManagement.postTime" /> :
- <s:date name="#comment.postTime"/>
+
</div>
- </div>
- <div class="viewdetails bot">
- <div class="details bot">
- <s:if test="#comment.content.length() > 1000">
- <div class="bot" id="comment-<s:property value="#comment.id"/>">
- <str:truncateNicely upper="1000" appendToEnd="...">
- <s:property value="#comment.content" escape="true" />
- </str:truncateNicely>
- </div>
- <div id="link-<s:property value="#comment.id"/>">
- <a onclick='readMoreComment("<s:property value="#comment.id"/>")'><s:text name="commentManagement.readmore" /></a>
- </div>
- </s:if>
- <s:else>
- <span width="200px" id="comment-<s:property value="#comment.id"/>"><s:property value="#comment.content" escape="true" /></span>
- </s:else>
- </div>
- <s:if test="actionName == 'comments'">
- <div class="details">
- <a id="editlink-<s:property value="#comment.id"/>" onclick='editComment("<s:property value="#comment.id"/>")'>
- <s:text name="generic.edit" />
- </a>
- </div>
- <div class="details">
- <span id="savelink-<s:property value="#comment.id"/>" style="display: none">
- <a onclick='saveComment("<s:property value="#comment.id"/>")'><s:text name="generic.save" /></a> |
+
+ <div class="viewdetails bot">
+
+ <div class="details bot">
+
+ <s:if test="#comment.content.length() > 1000">
+ <div class="bot" id="comment-<s:property value="#comment.id"/>">
+ <str:truncateNicely upper="1000" appendToEnd="...">
+ <s:property value="#comment.content" escape="true"/>
+ </str:truncateNicely>
+ </div>
+ <div id="link-<s:property value="#comment.id"/>">
+ <a onclick='readMoreComment("<s:property
+ value="#comment.id"/>")'><s:text
+ name="commentManagement.readmore"/></a>
+ </div>
+ </s:if>
+ <s:else>
+ <span width="200px"
+ id="comment-<s:property value="#comment.id"/>"><s:property
+ value="#comment.content" escape="true"/></span>
+ </s:else>
+ </div>
+
+ <s:if test="actionName == 'comments'">
+ <div class="details">
+ <a id="editlink-<s:property value="#comment.id"/>"
+ onclick='editComment("<s:property value="#comment.id"/>")'>
+ <s:text name="generic.edit"/>
+ </a>
+ </div>
+ <div class="details">
+ <span id="savelink-<s:property value="#comment.id"/>"
+ style="display: none">
+ <a onclick='saveComment("<s:property value="#comment.id"/>")'><s:text
+ name="generic.save"/></a> |
</span>
- <span id="cancellink-<s:property value="#comment.id"/>" style="display: none">
- <a onclick='editCommentCancel("<s:property value="#comment.id"/>")'><s:text name="generic.cancel" /></a>
+ <span id="cancellink-<s:property value="#comment.id"/>"
+ style="display: none">
+ <a onclick='editCommentCancel("<s:property
+ value="#comment.id"/>")'><s:text name="generic.cancel"/></a>
</span>
- </div>
- </s:if>
- </div>
+ </div>
+ </s:if>
+
+ </div>
</tr>
- </table> <%-- end comment details table in table --%>
+ </table>
+ <%-- end comment details table in table --%>
</td>
</tr>
</s:iterator>
</table>
- <br />
+ <%-- ============================================================= --%>
+ <%-- Next / previous links --%>
+
+ <nav>
+ <ul class="pager">
+ <s:if test="pager.prevLink != null">
+ <li class="previous">
+ <a href='<s:property value="pager.prevLink" />'>
+ <span aria-hidden="true">←</span>Newer</a>
+ </li>
+ </s:if>
+ <s:if test="pager.nextLink != null">
+ <li class="next">
+ <a href='<s:property value="pager.nextLink"/>'>Older
+ <span aria-hidden="true">→</span></a>
+ </li>
+ </s:if>
+ </ul>
+ </nav>
+
+ <%-- ========================================================= --%>
+ <%-- Save changes and cancel buttons --%>
+
+ <hr size="1" noshade="noshade"/>
+ <s:submit cssClass="btn btn-primary" value="%{getText('commentManagement.update')}"/>
+
+ </s:form>
+
+</s:else>
+
+
+<script>
+
+ <%-- setup check all/none checkbox controls --%>
+ <s:if test="pager.items != null">
+ $(document).ready(function () {
+ $('#checkallapproved').click(function () {
+ toggleFunction(true, "bean.approvedComments");
+ });
+ $('#clearallapproved').click(function () {
+ toggleFunction(false, "bean.approvedComments");
+ });
+ $('#checkallspam').click(function () {
+ toggleFunction(true, "bean.spamComments");
+ });
+ $('#clearallspam').click(function () {
+ toggleFunction(false, "bean.spamComments");
+ });
+ $('#checkalldelete').click(function () {
+ toggleFunction(true, "bean.deleteComments");
+ });
+ $('#clearalldelete').click(function () {
+ toggleFunction(false, "bean.deleteComments");
+ });
+ });
+ </s:if>
- <script>
- <!--
+ <%-- TODO: hook this up; it is currently not working in Roller trunk either --%>
+ function bulkDelete() {
+ if (window.confirm('<s:text name="commentManagement.confirmBulkDelete"><s:param value="bulkDeleteCount" /></s:text>')) {
+ document.commentQueryForm.method.value = "bulkDelete";
+ document.commentQueryForm.submit();
+ }
+ }
+
var comments = {};
function editComment(id) {
@@ -393,7 +430,7 @@
var salt = $("#comments_salt").val();
$.ajax({
type: "POST",
- url: '<%= request.getContextPath()%>/roller-ui/authoring/commentdata?id=' + id +'&salt='+salt,
+ url: '<%= request.getContextPath()%>/roller-ui/authoring/commentdata?id=' + id + '&salt=' + salt,
data: content,
dataType: "text",
processData: "false",
@@ -426,7 +463,7 @@
$.ajax({
type: "GET",
url: '<%= request.getContextPath()%>/roller-ui/authoring/commentdata?id=' + id,
- success: function(data) {
+ success: function (data) {
var cdata = eval("(" + data + ")");
$("#comment-" + cdata.id).html(cdata.content);
$("#link-" + id).detach();
@@ -434,16 +471,5 @@
}
});
}
- -->
+
</script>
-
-
-<%-- ========================================================= --%>
-<%-- Save changes and cancel buttons --%>
-<%-- ========================================================= --%>
-
- <s:submit value="%{getText('commentManagement.update')}" />
-
- </s:form>
-
-</s:else>
http://git-wip-us.apache.org/repos/asf/roller/blob/a5ec43be/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
index fe145d7..ff6603c 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
@@ -17,7 +17,7 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css"/>' />
+<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css"/>'/>
<script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script>
<script src='<s:url value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js"/>'></script>
@@ -28,85 +28,92 @@
<s:set var="mainAction">globalCommentManagement</s:set>
</s:else>
-<div class="sidebarFade">
- <div class="menu-tr">
- <div class="menu-tl">
+<h3><s:text name="commentManagement.sidebarTitle"/></h3>
+<hr size="1" noshade="noshade"/>
-<div class="sidebarInner">
+<p><s:text name="commentManagement.sidebarDescription"/></p>
-<h3><s:text name="commentManagement.sidebarTitle" /></h3>
-<hr size="1" noshade="noshade" />
+<s:form action="%{#mainAction}!query" id="commentsQuery" theme="bootstrap" cssClass="form-vertical">
-<p><s:text name="commentManagement.sidebarDescription" /></p>
-
- <s:form action="%{#mainAction}!query" id="commentsQuery">
- <s:hidden name="salt" />
- <s:hidden name="weblog" />
-
- <div class="sideformrow">
- <label for="searchString" class="sideformrow"><s:text name="commentManagement.searchString" />:</label>
- <s:textfield name="bean.searchString" size="15" />
- </div>
- <br />
- <br />
+ <s:hidden name="salt"/>
+ <s:hidden name="weblog"/>
+
+ <%-- ========================================================= --%>
+ <%-- filter by search string --%>
+
+ <s:textfield name="bean.searchString" label="%{getText('commentManagement.searchString')}" size="15"/>
+
+ <script>
+ $(function () {
+ $("#entries_bean_startDateString").datepicker();
+ });
+ </script>
+
+ <%-- ========================================================= --%>
+ <%-- filter by date --%>
+
+ <script>
+ // jQuery UI Date Picker
+ $(function () {
+ $("#commentsQuery_bean_startDateString").datepicker();
+ });
+ </script>
- <div class="sideformrow">
- <label for="startDateString" class="sideformrow"><s:text name="commentManagement.startDate" />:</label>
- <script>
- $(function() {
- $( "#commentsQuery_bean_startDateString" ).datepicker({
- showOn: "button",
- buttonImage: "../../images/calendar.png",
- buttonImageOnly: true,
- changeMonth: true,
- changeYear: true
- });
- });
- </script>
- <s:textfield name="bean.startDateString" size="12" readonly="true"/>
- </div>
-
- <div class="sideformrow">
- <label for="endDateString" class="sideformrow"><s:text name="commentManagement.endDate" />:</label>
- <script>
- $(function() {
- $( "#commentsQuery_bean_endDateString" ).datepicker({
- showOn: "button",
- buttonImage: "../../images/calendar.png",
- buttonImageOnly: true,
- changeMonth: true,
- changeYear: true
- });
- });
- </script>
- <s:textfield name="bean.endDateString" size="12" readonly="true"/>
- </div>
- <br />
- <br />
-
- <div class="sideformrow">
- <label for="approvedString" class="sideformrow">
- <s:text name="commentManagement.pendingStatus" />
- <br />
- <br />
- <br />
- <br />
- <br />
- </label>
- <div>
- <s:radio theme="roller" name="bean.approvedString" list="commentStatusOptions" listKey="key" listValue="value" />
+ <div class="control-group">
+ <label for="bean.startDateString" class="control-label">
+ <s:text name="commentManagement.startDate"/>
+ </label>
+ <div class="controls">
+ <div class="input-group">
+
+ <s:textfield name="bean.startDateString" readonly="true"
+ theme="simple" cssClass="date-picker form-control"/>
+ <label for="bean.startDateString" class="input-group-addon btn">
+ <span class="glyphicon glyphicon-calendar"></span>
+ </label>
+
+ </div>
</div>
- </div>
- <br />
+ </div>
- <s:submit value="%{getText('commentManagement.query')}" />
-
-</s:form>
+ <script>
+ // jQuery UI Date Picker
+ $(function () {
+ $("#commentsQuery_bean_endDateString").datepicker();
+ });
+ </script>
+
+ <div class="control-group">
+ <label for="bean.endDateString" class="control-label">
+ <s:text name="commentManagement.endDate"/>
+ </label>
+ <div class="controls">
+ <div class="input-group">
-<br />
-<br />
-</div> <!-- sidebarInner -->
+ <s:textfield name="bean.endDateString" readonly="true"
+ theme="simple" cssClass="date-picker form-control"/>
+ <label for="bean.endDateString" class="input-group-addon btn">
+ <span class="glyphicon glyphicon-calendar"></span>
+ </label>
+ </div>
</div>
</div>
-</div>
+
+ <br/>
+
+ <%-- ========================================================= --%>
+ <%-- filter by status--%>
+
+ <s:radio name="bean.approvedString"
+ label="%{getText('commentManagement.pendingStatus')}"
+ list="commentStatusOptions" listKey="key" listValue="value"/>
+
+
+ <%-- ========================================================= --%>
+ <%-- filter button --%>
+
+ <s:submit value="%{getText('commentManagement.query')}"/>
+
+</s:form>
+
http://git-wip-us.apache.org/repos/asf/roller/blob/a5ec43be/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
index 27b4aa6..682964a 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
@@ -29,7 +29,6 @@
<%-- ============================================================= --%>
<%-- Next / previous links --%>
-<%-- ============================================================= --%>
<nav>
<ul class="pager">
@@ -51,7 +50,6 @@
<%-- ============================================================= --%>
<%-- Entry table--%>
-<%-- ============================================================= --%>
<p style="text-align: center">
<span class="draftEntryBox"> </span>
@@ -155,7 +153,6 @@
<%-- ============================================================= --%>
<%-- Next / previous links --%>
-<%-- ============================================================= --%>
<nav>
<ul class="pager">
http://git-wip-us.apache.org/repos/asf/roller/blob/a5ec43be/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
index 8d9f376..f330a8c 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
@@ -20,114 +20,105 @@
<link rel="stylesheet" media="all" href='<s:url value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css"/>'/>
<script src='<s:url value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js"/>'></script>
-<div class="sidebarFade">
- <div class="menu-tr">
- <div class="menu-tl">
-
- <div class="sidebarInner">
-
- <h3><s:text name="weblogEntryQuery.sidebarTitle"/></h3>
- <hr size="1" noshade="noshade"/>
-
- <p><s:text name="weblogEntryQuery.sidebarDescription"/></p>
-
- <s:form action="entries" theme="bootstrap" cssClass="form-vertical">
- <s:hidden name="salt"/>
- <s:hidden name="weblog"/>
-
- <%-- ========================================================= --%>
- <%-- filter by category --%>
-
- <s:select name="bean.categoryName"
- label="%{getText('weblogEntryQuery.label.category')}"
- list="categories" listKey="name" listValue="name" size="1"/>
-
- <%-- ========================================================= --%>
- <%-- filter by tag --%>
-
- <s:textfield name="bean.tagsAsString" size="14"
- label="%{getText('weblogEntryQuery.label.tags')}"/>
-
- <%-- ========================================================= --%>
- <%-- filter by text --%>
-
- <s:textfield name="bean.text" size="14"
- label="%{getText('weblogEntryQuery.label.text')}"/>
-
- <%-- ========================================================= --%>
- <%-- filter by date --%>
-
- <script>
- $(function () {
- $("#entries_bean_startDateString").datepicker();
- });
- </script>
-
- <div class="control-group">
- <label for="bean.startDateString" class="control-label">
- <s:text name="weblogEntryQuery.label.startDate" />
- </label>
- <div class="controls">
- <div class="input-group">
-
- <s:textfield name="bean.startDateString" readonly="true"
- theme="simple" cssClass="date-picker form-control" />
- <label for="bean.startDateString" class="input-group-addon btn">
- <span class="glyphicon glyphicon-calendar"></span>
- </label>
-
- </div>
- </div>
- </div>
-
- <script>
- $(function () {
- $("#entries_bean_endDateString").datepicker();
- });
- </script>
-
- <div class="control-group">
- <label for="bean.endDateString" class="control-label">
- <s:text name="weblogEntryQuery.label.endDate" />
- </label>
- <div class="controls">
- <div class="input-group">
-
- <s:textfield name="bean.endDateString" readonly="true"
- theme="simple" cssClass="date-picker form-control" />
- <label for="bean.endDateString" class="input-group-addon btn">
- <span class="glyphicon glyphicon-calendar"></span>
- </label>
-
- </div>
- </div>
- </div>
-
- <br/>
-
- <%-- ========================================================= --%>
- <%-- filter by status --%>
-
- <s:radio name="bean.status"
- label="%{getText('weblogEntryQuery.label.status')}"
- list="statusOptions" listKey="key" listValue="value"/>
-
- <%-- ========================================================= --%>
- <%-- sort by --%>
-
- <s:radio name="bean.sortBy"
- label="%{getText('weblogEntryQuery.label.sortby')}"
- list="sortByOptions" listKey="key" listValue="value"/>
-
- <%-- ========================================================= --%>
- <%-- search button --%>
-
- <s:submit cssClass="btn" value="%{getText('weblogEntryQuery.button.query')}"/>
-
- </s:form>
-
- </div> <!-- sidebarInner -->
+<h3><s:text name="weblogEntryQuery.sidebarTitle"/></h3>
+<hr size="1" noshade="noshade"/>
+
+<p><s:text name="weblogEntryQuery.sidebarDescription"/></p>
+
+<s:form action="entries" theme="bootstrap" cssClass="form-vertical">
+ <s:hidden name="salt"/>
+ <s:hidden name="weblog"/>
+
+ <%-- ========================================================= --%>
+ <%-- filter by category --%>
+
+ <s:select name="bean.categoryName"
+ label="%{getText('weblogEntryQuery.label.category')}"
+ list="categories" listKey="name" listValue="name" size="1"/>
+
+ <%-- ========================================================= --%>
+ <%-- filter by tag --%>
+
+ <s:textfield name="bean.tagsAsString" size="14"
+ label="%{getText('weblogEntryQuery.label.tags')}"/>
+
+ <%-- ========================================================= --%>
+ <%-- filter by text --%>
+
+ <s:textfield name="bean.text" size="14"
+ label="%{getText('weblogEntryQuery.label.text')}"/>
+
+ <%-- ========================================================= --%>
+ <%-- filter by date --%>
+
+ <script>
+ $(function () {
+ $("#entries_bean_startDateString").datepicker();
+ });
+ </script>
+
+ <div class="control-group">
+ <label for="bean.startDateString" class="control-label">
+ <s:text name="weblogEntryQuery.label.startDate"/>
+ </label>
+ <div class="controls">
+ <div class="input-group">
+
+ <s:textfield name="bean.startDateString" readonly="true"
+ theme="simple" cssClass="date-picker form-control"/>
+ <label for="bean.startDateString" class="input-group-addon btn">
+ <span class="glyphicon glyphicon-calendar"></span>
+ </label>
+
+ </div>
</div>
</div>
-</div>
+
+ <script>
+ $(function () {
+ $("#entries_bean_endDateString").datepicker();
+ });
+ </script>
+
+ <div class="control-group">
+ <label for="bean.endDateString" class="control-label">
+ <s:text name="weblogEntryQuery.label.endDate"/>
+ </label>
+ <div class="controls">
+ <div class="input-group">
+
+ <s:textfield name="bean.endDateString" readonly="true"
+ theme="simple" cssClass="date-picker form-control"/>
+ <label for="bean.endDateString" class="input-group-addon btn">
+ <span class="glyphicon glyphicon-calendar"></span>
+ </label>
+
+ </div>
+ </div>
+ </div>
+
+ <br/>
+
+ <%-- ========================================================= --%>
+ <%-- filter by status --%>
+
+ <s:radio name="bean.status"
+ label="%{getText('weblogEntryQuery.label.status')}"
+ list="statusOptions" listKey="key" listValue="value"/>
+
+ <%-- ========================================================= --%>
+ <%-- sort by --%>
+
+ <s:radio name="bean.sortBy"
+ label="%{getText('weblogEntryQuery.label.sortby')}"
+ list="sortByOptions" listKey="key" listValue="value"/>
+
+
+ <%-- ========================================================= --%>
+ <%-- filter button --%>
+
+ <s:submit cssClass="btn" value="%{getText('weblogEntryQuery.button.query')}"/>
+
+</s:form>
+
http://git-wip-us.apache.org/repos/asf/roller/blob/a5ec43be/app/src/main/webapp/roller-ui/styles/roller.css
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/roller-ui/styles/roller.css b/app/src/main/webapp/roller-ui/styles/roller.css
index 4677e46..bd7b185 100644
--- a/app/src/main/webapp/roller-ui/styles/roller.css
+++ b/app/src/main/webapp/roller-ui/styles/roller.css
@@ -108,6 +108,51 @@ td.scheduledentry, tr.scheduledentry {
background: #EEEEE0;
}
+/* comments */
+
+td.spamcomment {
+ background: #ffcccc;
+}
+td.pendingcomment {
+ background: #ffffcc;
+}
+.approvedCommentBox {
+ background: #ffffff;
+ border: 1px gray solid;
+}
+.pendingCommentBox {
+ background: #ffffcc;
+ border: 1px gray solid;
+}
+.spamCommentBox {
+ background: #ffcccc;
+ border: 1px gray solid;
+}
+.rollertable label.checkboxLabel {
+ display: none;
+}
+table.innertable {
+ border-collapse: collapse;
+ width: 100%;
+ margin-bottom: 0;
+}
+table.innertable tbody td {
+ padding: 0;
+}
+table.rollertable .innertable td {
+ border: none;
+}
+table.innertable td.viewbody {
+ padding: 5px;
+}
+table.innertable tr .bot {
+ margin-bottom: 5px;
+}
+table.innertable tr .viewbody .bot {
+ padding-bottom: 10px;
+}
+
+
/* sign-in */
body {
[36/47] roller git commit: Merge pull request #4 from
lbtc-xxx/apply_style_to_buttons_in_editpage
Posted by sn...@apache.org.
Merge pull request #4 from lbtc-xxx/apply_style_to_buttons_in_editpage
Apply style to buttons in EditPage
Nice! Thanks Kohei.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/a0254031
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/a0254031
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/a0254031
Branch: refs/heads/bootstrap-ui
Commit: a0254031a4cd5d68a9a75554ecbb9cb27073d5f1
Parents: 80765a0 122eac4
Author: David M. Johnson <sn...@apache.org>
Authored: Sat Jan 9 11:32:21 2016 -0500
Committer: David M. Johnson <sn...@apache.org>
Committed: Sat Jan 9 11:32:21 2016 -0500
----------------------------------------------------------------------
app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[27/47] roller git commit: Also need hsqldb for texen.
Posted by sn...@apache.org.
Also need hsqldb for texen.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/53ae365c
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/53ae365c
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/53ae365c
Branch: refs/heads/bootstrap-ui
Commit: 53ae365cdd80a8248c215b4f26f4fcda9e9ec217
Parents: 8925b14
Author: Dave Johnson <sn...@gmail.com>
Authored: Sat Dec 26 15:48:59 2015 -0500
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sat Dec 26 15:49:14 2015 -0500
----------------------------------------------------------------------
app/src/main/resources/sql/hsqldb/.gitkeep | 0
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/53ae365c/app/src/main/resources/sql/hsqldb/.gitkeep
----------------------------------------------------------------------
diff --git a/app/src/main/resources/sql/hsqldb/.gitkeep b/app/src/main/resources/sql/hsqldb/.gitkeep
new file mode 100644
index 0000000..e69de29
[08/47] roller git commit: Merge branch 'trunk' of
https://github.com/apache/roller into trunk
Posted by sn...@apache.org.
Merge branch 'trunk' of https://github.com/apache/roller into trunk
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/d3ffb063
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/d3ffb063
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/d3ffb063
Branch: refs/heads/bootstrap-ui
Commit: d3ffb0633096584d85f86bf485a3668ffcb6c06a
Parents: 0364bc9 15214dc
Author: Dave Johnson <sn...@apache.org>
Authored: Sat Oct 17 18:01:33 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Sat Oct 17 18:01:33 2015 -0400
----------------------------------------------------------------------
NOTICE.txt | 6 +-
app/pom.xml | 32 +-
.../java/org/apache/roller/util/DateUtil.java | 20 +-
.../org/apache/roller/weblogger/TestUtils.java | 26 +-
.../business/FileContentManagerImpl.java | 263 ++--
.../weblogger/business/HitCountQueue.java | 6 +
.../weblogger/business/WeblogEntryManager.java | 2 +-
.../business/jpa/JPAPersistenceStrategy.java | 34 +-
.../business/jpa/JPAWeblogEntryManagerImpl.java | 8 +-
.../business/jpa/JPAWebloggerImpl.java | 2 +
.../runnable/ContinuousWorkerThread.java | 8 +-
.../search/operations/IndexOperation.java | 6 +-
.../business/startup/DatabaseInstaller.java | 33 +-
.../business/startup/WebloggerStartup.java | 1 +
.../roller/weblogger/pojos/MediaFile.java | 2 +-
.../roller/weblogger/ui/core/RollerContext.java | 11 +-
.../weblogger/ui/core/filters/InitFilter.java | 43 +-
.../tags/calendar/BigWeblogCalendarModel.java | 13 +-
.../ui/core/tags/calendar/CalendarTag.java | 11 +-
.../core/tags/calendar/WeblogCalendarModel.java | 2 +-
.../weblogger/ui/rendering/model/URLModel.java | 2 +-
.../rendering/pagers/WeblogEntriesDayPager.java | 14 +-
.../pagers/WeblogEntriesMonthPager.java | 20 +-
.../comments/CommentAuthenticatorUtils.java | 43 +
.../comments/LdapCommentAuthenticator.java | 11 +-
.../comments/MathCommentAuthenticator.java | 12 +-
.../ui/rendering/servlets/PageServlet.java | 17 +-
.../ui/struts2/editor/MediaFileBean.java | 2 +-
.../weblogger/ui/struts2/util/UIAction.java | 13 +-
.../resources/ApplicationResources.properties | 7 +
.../ApplicationResources_ja.properties | 1455 ++++++++++++++++++
.../ApplicationResources_ja_JP.properties | 1069 -------------
.../main/resources/sql/510-to-520-migration.vm | 54 +
app/src/main/resources/sql/dbscripts.properties | 2 +-
app/src/main/resources/sql/macros.vm | 11 +
app/src/main/resources/sql/mysql.properties | 4 +-
app/src/main/resources/sql/oracle.properties | 4 +-
.../main/resources/sql/postgresql.properties | 4 +-
.../webapp/WEB-INF/jsps/admin/PingTargets.jsp | 2 +-
.../webapp/WEB-INF/jsps/editor/Comments.jsp | 16 +-
.../main/webapp/WEB-INF/jsps/editor/Entries.jsp | 26 +-
.../webapp/WEB-INF/jsps/editor/EntryEdit.jsp | 2 +-
app/src/main/webapp/WEB-INF/velocity.properties | 3 +
app/src/main/webapp/themes/basic/_day.vm | 4 +-
.../webapp/themes/basicmobile/_day-mobile.vm | 4 +-
app/src/main/webapp/themes/basicmobile/_day.vm | 4 +-
.../webapp/themes/basicmobile/weblog-mobile.vm | 2 +-
app/src/main/webapp/themes/fauxcoly/day.vm | 4 +-
app/src/main/webapp/themes/gaurav/day.vm | 4 +-
app/src/main/webapp/themes/gaurav/entry.vm | 21 +-
app/src/main/webapp/themes/gaurav/std_head.vm | 1 +
app/src/main/webapp/themes/gaurav/tags_index.vm | 1 +
.../weblogger/business/MediaFileTest.java | 8 +-
.../ui/core/filters/InitFilterTest.java | 75 +
assembly-release/pom.xml | 2 +-
assembly-release/sign-release.sh | 2 +-
docs/roller-install-guide.odt | Bin 1622922 -> 1623069 bytes
docs/testing/junit-cleartables-mysql.sql | 22 +-
docs/testing/roller-junit.properties | 72 +
it-selenium/pom.xml | 10 +-
.../roller/selenium/AbstractRollerPage.java | 6 +
.../roller/selenium/InitialLoginTestIT.java | 5 +-
.../roller/selenium/core/CreateWeblogPage.java | 5 +
.../selenium/editor/AbstractEntryPage.java | 4 +-
.../test/resources/roller-jettyrun.properties | 2 +-
pom.xml | 7 +-
66 files changed, 2187 insertions(+), 1400 deletions(-)
----------------------------------------------------------------------
[09/47] roller git commit: Merge branch 'trunk' of
https://github.com/snoopdave/rollarcus into trunk
Posted by sn...@apache.org.
Merge branch 'trunk' of https://github.com/snoopdave/rollarcus into trunk
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/00bfff90
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/00bfff90
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/00bfff90
Branch: refs/heads/bootstrap-ui
Commit: 00bfff906f736c8f502364ca3200ca9cb09b6e73
Parents: d3ffb06 8f9d134
Author: Dave Johnson <sn...@apache.org>
Authored: Sun Oct 18 11:09:03 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Sun Oct 18 11:09:03 2015 -0400
----------------------------------------------------------------------
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[15/47] roller git commit: Beginnings of a Bootstrap rewrite of the
Roller editor/admin UI,
using Struts-Bootstrap plugin. The main menu and edit weblog page are
essentially complete.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.svg
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.svg b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.svg
new file mode 100644
index 0000000..94fb549
--- /dev/null
+++ b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.svg
@@ -0,0 +1,288 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
+<font-face units-per-em="1200" ascent="960" descent="-240" />
+<missing-glyph horiz-adv-x="500" />
+<glyph horiz-adv-x="0" />
+<glyph horiz-adv-x="400" />
+<glyph unicode=" " />
+<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" />
+<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode=" " />
+<glyph unicode="¥" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z" />
+<glyph unicode=" " horiz-adv-x="650" />
+<glyph unicode=" " horiz-adv-x="1300" />
+<glyph unicode=" " horiz-adv-x="650" />
+<glyph unicode=" " horiz-adv-x="1300" />
+<glyph unicode=" " horiz-adv-x="433" />
+<glyph unicode=" " horiz-adv-x="325" />
+<glyph unicode=" " horiz-adv-x="216" />
+<glyph unicode=" " horiz-adv-x="216" />
+<glyph unicode=" " horiz-adv-x="162" />
+<glyph unicode=" " horiz-adv-x="260" />
+<glyph unicode=" " horiz-adv-x="72" />
+<glyph unicode=" " horiz-adv-x="260" />
+<glyph unicode=" " horiz-adv-x="325" />
+<glyph unicode="€" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" />
+<glyph unicode="₽" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z" />
+<glyph unicode="−" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="⌛" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z" />
+<glyph unicode="◼" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="☁" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z" />
+<glyph unicode="⛺" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
+<glyph unicode="✉" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
+<glyph unicode="✏" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z" />
+<glyph unicode="" d="M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
+<glyph unicode="" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
+<glyph unicode="" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
+<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z" />
+<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z" />
+<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z" />
+<glyph unicode="" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z" />
+<glyph unicode="" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" />
+<glyph unicode="" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 3
00h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z" />
+<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
+<glyph unicode="" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z" />
+<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z" />
+<glyph unicode="" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z" />
+<glyph unicode="" d="M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
+<glyph unicode="" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
+<glyph unicode="" d="M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
+<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z " />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z" />
+<glyph unicode="" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
+<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z" />
+<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z" />
+<glyph unicode="" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-
450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z" />
+<glyph unicode="" d="M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z" />
+<glyph unicode="" d="M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z" />
+<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
+<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
+<glyph unicode="" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z" />
+<glyph unicode="" d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" />
+<glyph unicode="" d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" />
+<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
+<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
+<glyph unicode="" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z" />
+<glyph unicode="" d="M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z" />
+<glyph unicode="" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z" />
+<glyph unicode="" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
+<glyph unicode="" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z" />
+<glyph unicode="" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
+<glyph unicode="" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
+<glyph unicode="" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
+<glyph unicode="" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200
h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z" />
+<glyph unicode="" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
+<glyph unicode="" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z" />
+<glyph unicode="" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z" />
+<glyph unicode="" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z" />
+<glyph unicode="" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z" />
+<glyph unicode="" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z" />
+<glyph unicode="" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
+<glyph unicode="" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
+<glyph unicode="" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
+<glyph unicode="" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z" />
+<glyph unicode="" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
+<glyph unicode="" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z" />
+<glyph unicode="" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z" />
+<glyph unicode="" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
+<glyph unicode="" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
+<glyph unicode="" d="M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
+<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z" />
+<glyph unicode="" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
+<glyph unicode="" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z" />
+<glyph unicode="" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z" />
+<glyph unicode="" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z" />
+<glyph unicode="" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
+<glyph unicode="" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
+<glyph unicode="" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
+<glyph unicode="" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" />
+<glyph unicode="" d="M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" />
+<glyph unicode="" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z" />
+<glyph unicode="" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" />
+<glyph unicode="" d="M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
+<glyph unicode="" d="M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z" />
+<glyph unicode="" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z" />
+<glyph unicode="" d="M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z" />
+<glyph unicode="" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
+<glyph unicode="" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z" />
+<glyph unicode="" d="M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
+<glyph unicode="" d="M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z" />
+<glyph unicode="" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z" />
+<glyph unicode="" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z" />
+<glyph unicode="" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
+<glyph unicode="" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z" />
+<glyph unicode="" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" />
+<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z" />
+<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
+<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
+<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-
3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z" />
+<glyph unicode="" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" />
+<glyph unicode="" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z " />
+<glyph unicode="" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z" />
+<glyph unicode="" d="M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z" />
+<glyph unicode="" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z" />
+<glyph unicode="" d="M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z" />
+<glyph unicode="" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z" />
+<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z" />
+<glyph unicode="" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z" />
+<glyph unicode="" d="M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z" />
+<glyph unicode="" d="M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z" />
+<glyph unicode="" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z" />
+<glyph unicode="" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z" />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="" d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z " />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
+<glyph unicode="" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z" />
+<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
+<glyph unicode="" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z" />
+<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
+<glyph unicode="" d="M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
+<glyph unicode="" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z" />
+<glyph unicode="" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
+<glyph unicode="" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" />
+<glyph unicode="" d="M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
+<glyph unicode="" d="M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
+<glyph unicode="" d="M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
+<glyph unicode="" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
+<glyph unicode="" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
+<glyph unicode="" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
+<glyph unicode="" d="M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z" />
+<glyph unicode="" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
+<glyph unicode="" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z" />
+<glyph unicode="" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
+<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" />
+<glyph unicode="" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
+<glyph unicode="" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z" />
+<glyph unicode="" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
+<glyph unicode="" d="M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
+<glyph unicode="" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
+<glyph unicode="" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z" />
+<glyph unicode="" d="M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z" />
+<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
+<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" />
+<glyph unicode="" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z" />
+<glyph unicode="" d="M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
+<glyph unicode="" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" />
+<glyph unicode="" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.
5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z" />
+<glyph unicode="" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z" />
+<glyph unicode="" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
+<glyph unicode="" d="M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z" />
+<glyph unico
<TRUNCATED>
[14/47] roller git commit: Beginnings of a Bootstrap rewrite of the
Roller editor/admin UI,
using Struts-Bootstrap plugin. The main menu and edit weblog page are
essentially complete.
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.ttf
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.ttf b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.ttf
new file mode 100644
index 0000000..1413fc6
Binary files /dev/null and b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.ttf differ
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.woff
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.woff b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.woff
new file mode 100644
index 0000000..9e61285
Binary files /dev/null and b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.woff differ
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.woff2
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.woff2 b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.woff2
new file mode 100644
index 0000000..64539b5
Binary files /dev/null and b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.woff2 differ
http://git-wip-us.apache.org/repos/asf/roller/blob/2da6c3c2/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/js/bootstrap.js
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/js/bootstrap.js b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/js/bootstrap.js
new file mode 100644
index 0000000..01fbbcb
--- /dev/null
+++ b/app/src/main/webapp/roller-ui/bootstrap-3.3.6-dist/js/bootstrap.js
@@ -0,0 +1,2363 @@
+/*!
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under the MIT license
+ */
+
+if (typeof jQuery === 'undefined') {
+ throw new Error('Bootstrap\'s JavaScript requires jQuery')
+}
+
++function ($) {
+ 'use strict';
+ var version = $.fn.jquery.split(' ')[0].split('.')
+ if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] > 2)) {
+ throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 3')
+ }
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: transition.js v3.3.6
+ * http://getbootstrap.com/javascript/#transitions
+ * ========================================================================
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+ 'use strict';
+
+ // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
+ // ============================================================
+
+ function transitionEnd() {
+ var el = document.createElement('bootstrap')
+
+ var transEndEventNames = {
+ WebkitTransition : 'webkitTransitionEnd',
+ MozTransition : 'transitionend',
+ OTransition : 'oTransitionEnd otransitionend',
+ transition : 'transitionend'
+ }
+
+ for (var name in transEndEventNames) {
+ if (el.style[name] !== undefined) {
+ return { end: transEndEventNames[name] }
+ }
+ }
+
+ return false // explicit for ie8 ( ._.)
+ }
+
+ // http://blog.alexmaccaw.com/css-transitions
+ $.fn.emulateTransitionEnd = function (duration) {
+ var called = false
+ var $el = this
+ $(this).one('bsTransitionEnd', function () { called = true })
+ var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
+ setTimeout(callback, duration)
+ return this
+ }
+
+ $(function () {
+ $.support.transition = transitionEnd()
+
+ if (!$.support.transition) return
+
+ $.event.special.bsTransitionEnd = {
+ bindType: $.support.transition.end,
+ delegateType: $.support.transition.end,
+ handle: function (e) {
+ if ($(e.target).is(this)) return e.handleObj.handler.apply(this, arguments)
+ }
+ }
+ })
+
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: alert.js v3.3.6
+ * http://getbootstrap.com/javascript/#alerts
+ * ========================================================================
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+ 'use strict';
+
+ // ALERT CLASS DEFINITION
+ // ======================
+
+ var dismiss = '[data-dismiss="alert"]'
+ var Alert = function (el) {
+ $(el).on('click', dismiss, this.close)
+ }
+
+ Alert.VERSION = '3.3.6'
+
+ Alert.TRANSITION_DURATION = 150
+
+ Alert.prototype.close = function (e) {
+ var $this = $(this)
+ var selector = $this.attr('data-target')
+
+ if (!selector) {
+ selector = $this.attr('href')
+ selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
+ }
+
+ var $parent = $(selector)
+
+ if (e) e.preventDefault()
+
+ if (!$parent.length) {
+ $parent = $this.closest('.alert')
+ }
+
+ $parent.trigger(e = $.Event('close.bs.alert'))
+
+ if (e.isDefaultPrevented()) return
+
+ $parent.removeClass('in')
+
+ function removeElement() {
+ // detach from parent, fire event then clean up data
+ $parent.detach().trigger('closed.bs.alert').remove()
+ }
+
+ $.support.transition && $parent.hasClass('fade') ?
+ $parent
+ .one('bsTransitionEnd', removeElement)
+ .emulateTransitionEnd(Alert.TRANSITION_DURATION) :
+ removeElement()
+ }
+
+
+ // ALERT PLUGIN DEFINITION
+ // =======================
+
+ function Plugin(option) {
+ return this.each(function () {
+ var $this = $(this)
+ var data = $this.data('bs.alert')
+
+ if (!data) $this.data('bs.alert', (data = new Alert(this)))
+ if (typeof option == 'string') data[option].call($this)
+ })
+ }
+
+ var old = $.fn.alert
+
+ $.fn.alert = Plugin
+ $.fn.alert.Constructor = Alert
+
+
+ // ALERT NO CONFLICT
+ // =================
+
+ $.fn.alert.noConflict = function () {
+ $.fn.alert = old
+ return this
+ }
+
+
+ // ALERT DATA-API
+ // ==============
+
+ $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
+
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: button.js v3.3.6
+ * http://getbootstrap.com/javascript/#buttons
+ * ========================================================================
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+ 'use strict';
+
+ // BUTTON PUBLIC CLASS DEFINITION
+ // ==============================
+
+ var Button = function (element, options) {
+ this.$element = $(element)
+ this.options = $.extend({}, Button.DEFAULTS, options)
+ this.isLoading = false
+ }
+
+ Button.VERSION = '3.3.6'
+
+ Button.DEFAULTS = {
+ loadingText: 'loading...'
+ }
+
+ Button.prototype.setState = function (state) {
+ var d = 'disabled'
+ var $el = this.$element
+ var val = $el.is('input') ? 'val' : 'html'
+ var data = $el.data()
+
+ state += 'Text'
+
+ if (data.resetText == null) $el.data('resetText', $el[val]())
+
+ // push to event loop to allow forms to submit
+ setTimeout($.proxy(function () {
+ $el[val](data[state] == null ? this.options[state] : data[state])
+
+ if (state == 'loadingText') {
+ this.isLoading = true
+ $el.addClass(d).attr(d, d)
+ } else if (this.isLoading) {
+ this.isLoading = false
+ $el.removeClass(d).removeAttr(d)
+ }
+ }, this), 0)
+ }
+
+ Button.prototype.toggle = function () {
+ var changed = true
+ var $parent = this.$element.closest('[data-toggle="buttons"]')
+
+ if ($parent.length) {
+ var $input = this.$element.find('input')
+ if ($input.prop('type') == 'radio') {
+ if ($input.prop('checked')) changed = false
+ $parent.find('.active').removeClass('active')
+ this.$element.addClass('active')
+ } else if ($input.prop('type') == 'checkbox') {
+ if (($input.prop('checked')) !== this.$element.hasClass('active')) changed = false
+ this.$element.toggleClass('active')
+ }
+ $input.prop('checked', this.$element.hasClass('active'))
+ if (changed) $input.trigger('change')
+ } else {
+ this.$element.attr('aria-pressed', !this.$element.hasClass('active'))
+ this.$element.toggleClass('active')
+ }
+ }
+
+
+ // BUTTON PLUGIN DEFINITION
+ // ========================
+
+ function Plugin(option) {
+ return this.each(function () {
+ var $this = $(this)
+ var data = $this.data('bs.button')
+ var options = typeof option == 'object' && option
+
+ if (!data) $this.data('bs.button', (data = new Button(this, options)))
+
+ if (option == 'toggle') data.toggle()
+ else if (option) data.setState(option)
+ })
+ }
+
+ var old = $.fn.button
+
+ $.fn.button = Plugin
+ $.fn.button.Constructor = Button
+
+
+ // BUTTON NO CONFLICT
+ // ==================
+
+ $.fn.button.noConflict = function () {
+ $.fn.button = old
+ return this
+ }
+
+
+ // BUTTON DATA-API
+ // ===============
+
+ $(document)
+ .on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
+ var $btn = $(e.target)
+ if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+ Plugin.call($btn, 'toggle')
+ if (!($(e.target).is('input[type="radio"]') || $(e.target).is('input[type="checkbox"]'))) e.preventDefault()
+ })
+ .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
+ $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))
+ })
+
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: carousel.js v3.3.6
+ * http://getbootstrap.com/javascript/#carousel
+ * ========================================================================
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+ 'use strict';
+
+ // CAROUSEL CLASS DEFINITION
+ // =========================
+
+ var Carousel = function (element, options) {
+ this.$element = $(element)
+ this.$indicators = this.$element.find('.carousel-indicators')
+ this.options = options
+ this.paused = null
+ this.sliding = null
+ this.interval = null
+ this.$active = null
+ this.$items = null
+
+ this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this))
+
+ this.options.pause == 'hover' && !('ontouchstart' in document.documentElement) && this.$element
+ .on('mouseenter.bs.carousel', $.proxy(this.pause, this))
+ .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
+ }
+
+ Carousel.VERSION = '3.3.6'
+
+ Carousel.TRANSITION_DURATION = 600
+
+ Carousel.DEFAULTS = {
+ interval: 5000,
+ pause: 'hover',
+ wrap: true,
+ keyboard: true
+ }
+
+ Carousel.prototype.keydown = function (e) {
+ if (/input|textarea/i.test(e.target.tagName)) return
+ switch (e.which) {
+ case 37: this.prev(); break
+ case 39: this.next(); break
+ default: return
+ }
+
+ e.preventDefault()
+ }
+
+ Carousel.prototype.cycle = function (e) {
+ e || (this.paused = false)
+
+ this.interval && clearInterval(this.interval)
+
+ this.options.interval
+ && !this.paused
+ && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
+
+ return this
+ }
+
+ Carousel.prototype.getItemIndex = function (item) {
+ this.$items = item.parent().children('.item')
+ return this.$items.index(item || this.$active)
+ }
+
+ Carousel.prototype.getItemForDirection = function (direction, active) {
+ var activeIndex = this.getItemIndex(active)
+ var willWrap = (direction == 'prev' && activeIndex === 0)
+ || (direction == 'next' && activeIndex == (this.$items.length - 1))
+ if (willWrap && !this.options.wrap) return active
+ var delta = direction == 'prev' ? -1 : 1
+ var itemIndex = (activeIndex + delta) % this.$items.length
+ return this.$items.eq(itemIndex)
+ }
+
+ Carousel.prototype.to = function (pos) {
+ var that = this
+ var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active'))
+
+ if (pos > (this.$items.length - 1) || pos < 0) return
+
+ if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) // yes, "slid"
+ if (activeIndex == pos) return this.pause().cycle()
+
+ return this.slide(pos > activeIndex ? 'next' : 'prev', this.$items.eq(pos))
+ }
+
+ Carousel.prototype.pause = function (e) {
+ e || (this.paused = true)
+
+ if (this.$element.find('.next, .prev').length && $.support.transition) {
+ this.$element.trigger($.support.transition.end)
+ this.cycle(true)
+ }
+
+ this.interval = clearInterval(this.interval)
+
+ return this
+ }
+
+ Carousel.prototype.next = function () {
+ if (this.sliding) return
+ return this.slide('next')
+ }
+
+ Carousel.prototype.prev = function () {
+ if (this.sliding) return
+ return this.slide('prev')
+ }
+
+ Carousel.prototype.slide = function (type, next) {
+ var $active = this.$element.find('.item.active')
+ var $next = next || this.getItemForDirection(type, $active)
+ var isCycling = this.interval
+ var direction = type == 'next' ? 'left' : 'right'
+ var that = this
+
+ if ($next.hasClass('active')) return (this.sliding = false)
+
+ var relatedTarget = $next[0]
+ var slideEvent = $.Event('slide.bs.carousel', {
+ relatedTarget: relatedTarget,
+ direction: direction
+ })
+ this.$element.trigger(slideEvent)
+ if (slideEvent.isDefaultPrevented()) return
+
+ this.sliding = true
+
+ isCycling && this.pause()
+
+ if (this.$indicators.length) {
+ this.$indicators.find('.active').removeClass('active')
+ var $nextIndicator = $(this.$indicators.children()[this.getItemIndex($next)])
+ $nextIndicator && $nextIndicator.addClass('active')
+ }
+
+ var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) // yes, "slid"
+ if ($.support.transition && this.$element.hasClass('slide')) {
+ $next.addClass(type)
+ $next[0].offsetWidth // force reflow
+ $active.addClass(direction)
+ $next.addClass(direction)
+ $active
+ .one('bsTransitionEnd', function () {
+ $next.removeClass([type, direction].join(' ')).addClass('active')
+ $active.removeClass(['active', direction].join(' '))
+ that.sliding = false
+ setTimeout(function () {
+ that.$element.trigger(slidEvent)
+ }, 0)
+ })
+ .emulateTransitionEnd(Carousel.TRANSITION_DURATION)
+ } else {
+ $active.removeClass('active')
+ $next.addClass('active')
+ this.sliding = false
+ this.$element.trigger(slidEvent)
+ }
+
+ isCycling && this.cycle()
+
+ return this
+ }
+
+
+ // CAROUSEL PLUGIN DEFINITION
+ // ==========================
+
+ function Plugin(option) {
+ return this.each(function () {
+ var $this = $(this)
+ var data = $this.data('bs.carousel')
+ var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
+ var action = typeof option == 'string' ? option : options.slide
+
+ if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
+ if (typeof option == 'number') data.to(option)
+ else if (action) data[action]()
+ else if (options.interval) data.pause().cycle()
+ })
+ }
+
+ var old = $.fn.carousel
+
+ $.fn.carousel = Plugin
+ $.fn.carousel.Constructor = Carousel
+
+
+ // CAROUSEL NO CONFLICT
+ // ====================
+
+ $.fn.carousel.noConflict = function () {
+ $.fn.carousel = old
+ return this
+ }
+
+
+ // CAROUSEL DATA-API
+ // =================
+
+ var clickHandler = function (e) {
+ var href
+ var $this = $(this)
+ var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
+ if (!$target.hasClass('carousel')) return
+ var options = $.extend({}, $target.data(), $this.data())
+ var slideIndex = $this.attr('data-slide-to')
+ if (slideIndex) options.interval = false
+
+ Plugin.call($target, options)
+
+ if (slideIndex) {
+ $target.data('bs.carousel').to(slideIndex)
+ }
+
+ e.preventDefault()
+ }
+
+ $(document)
+ .on('click.bs.carousel.data-api', '[data-slide]', clickHandler)
+ .on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler)
+
+ $(window).on('load', function () {
+ $('[data-ride="carousel"]').each(function () {
+ var $carousel = $(this)
+ Plugin.call($carousel, $carousel.data())
+ })
+ })
+
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: collapse.js v3.3.6
+ * http://getbootstrap.com/javascript/#collapse
+ * ========================================================================
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+ 'use strict';
+
+ // COLLAPSE PUBLIC CLASS DEFINITION
+ // ================================
+
+ var Collapse = function (element, options) {
+ this.$element = $(element)
+ this.options = $.extend({}, Collapse.DEFAULTS, options)
+ this.$trigger = $('[data-toggle="collapse"][href="#' + element.id + '"],' +
+ '[data-toggle="collapse"][data-target="#' + element.id + '"]')
+ this.transitioning = null
+
+ if (this.options.parent) {
+ this.$parent = this.getParent()
+ } else {
+ this.addAriaAndCollapsedClass(this.$element, this.$trigger)
+ }
+
+ if (this.options.toggle) this.toggle()
+ }
+
+ Collapse.VERSION = '3.3.6'
+
+ Collapse.TRANSITION_DURATION = 350
+
+ Collapse.DEFAULTS = {
+ toggle: true
+ }
+
+ Collapse.prototype.dimension = function () {
+ var hasWidth = this.$element.hasClass('width')
+ return hasWidth ? 'width' : 'height'
+ }
+
+ Collapse.prototype.show = function () {
+ if (this.transitioning || this.$element.hasClass('in')) return
+
+ var activesData
+ var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing')
+
+ if (actives && actives.length) {
+ activesData = actives.data('bs.collapse')
+ if (activesData && activesData.transitioning) return
+ }
+
+ var startEvent = $.Event('show.bs.collapse')
+ this.$element.trigger(startEvent)
+ if (startEvent.isDefaultPrevented()) return
+
+ if (actives && actives.length) {
+ Plugin.call(actives, 'hide')
+ activesData || actives.data('bs.collapse', null)
+ }
+
+ var dimension = this.dimension()
+
+ this.$element
+ .removeClass('collapse')
+ .addClass('collapsing')[dimension](0)
+ .attr('aria-expanded', true)
+
+ this.$trigger
+ .removeClass('collapsed')
+ .attr('aria-expanded', true)
+
+ this.transitioning = 1
+
+ var complete = function () {
+ this.$element
+ .removeClass('collapsing')
+ .addClass('collapse in')[dimension]('')
+ this.transitioning = 0
+ this.$element
+ .trigger('shown.bs.collapse')
+ }
+
+ if (!$.support.transition) return complete.call(this)
+
+ var scrollSize = $.camelCase(['scroll', dimension].join('-'))
+
+ this.$element
+ .one('bsTransitionEnd', $.proxy(complete, this))
+ .emulateTransitionEnd(Collapse.TRANSITION_DURATION)[dimension](this.$element[0][scrollSize])
+ }
+
+ Collapse.prototype.hide = function () {
+ if (this.transitioning || !this.$element.hasClass('in')) return
+
+ var startEvent = $.Event('hide.bs.collapse')
+ this.$element.trigger(startEvent)
+ if (startEvent.isDefaultPrevented()) return
+
+ var dimension = this.dimension()
+
+ this.$element[dimension](this.$element[dimension]())[0].offsetHeight
+
+ this.$element
+ .addClass('collapsing')
+ .removeClass('collapse in')
+ .attr('aria-expanded', false)
+
+ this.$trigger
+ .addClass('collapsed')
+ .attr('aria-expanded', false)
+
+ this.transitioning = 1
+
+ var complete = function () {
+ this.transitioning = 0
+ this.$element
+ .removeClass('collapsing')
+ .addClass('collapse')
+ .trigger('hidden.bs.collapse')
+ }
+
+ if (!$.support.transition) return complete.call(this)
+
+ this.$element
+ [dimension](0)
+ .one('bsTransitionEnd', $.proxy(complete, this))
+ .emulateTransitionEnd(Collapse.TRANSITION_DURATION)
+ }
+
+ Collapse.prototype.toggle = function () {
+ this[this.$element.hasClass('in') ? 'hide' : 'show']()
+ }
+
+ Collapse.prototype.getParent = function () {
+ return $(this.options.parent)
+ .find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]')
+ .each($.proxy(function (i, element) {
+ var $element = $(element)
+ this.addAriaAndCollapsedClass(getTargetFromTrigger($element), $element)
+ }, this))
+ .end()
+ }
+
+ Collapse.prototype.addAriaAndCollapsedClass = function ($element, $trigger) {
+ var isOpen = $element.hasClass('in')
+
+ $element.attr('aria-expanded', isOpen)
+ $trigger
+ .toggleClass('collapsed', !isOpen)
+ .attr('aria-expanded', isOpen)
+ }
+
+ function getTargetFromTrigger($trigger) {
+ var href
+ var target = $trigger.attr('data-target')
+ || (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
+
+ return $(target)
+ }
+
+
+ // COLLAPSE PLUGIN DEFINITION
+ // ==========================
+
+ function Plugin(option) {
+ return this.each(function () {
+ var $this = $(this)
+ var data = $this.data('bs.collapse')
+ var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
+
+ if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false
+ if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
+ if (typeof option == 'string') data[option]()
+ })
+ }
+
+ var old = $.fn.collapse
+
+ $.fn.collapse = Plugin
+ $.fn.collapse.Constructor = Collapse
+
+
+ // COLLAPSE NO CONFLICT
+ // ====================
+
+ $.fn.collapse.noConflict = function () {
+ $.fn.collapse = old
+ return this
+ }
+
+
+ // COLLAPSE DATA-API
+ // =================
+
+ $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) {
+ var $this = $(this)
+
+ if (!$this.attr('data-target')) e.preventDefault()
+
+ var $target = getTargetFromTrigger($this)
+ var data = $target.data('bs.collapse')
+ var option = data ? 'toggle' : $this.data()
+
+ Plugin.call($target, option)
+ })
+
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: dropdown.js v3.3.6
+ * http://getbootstrap.com/javascript/#dropdowns
+ * ========================================================================
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+ 'use strict';
+
+ // DROPDOWN CLASS DEFINITION
+ // =========================
+
+ var backdrop = '.dropdown-backdrop'
+ var toggle = '[data-toggle="dropdown"]'
+ var Dropdown = function (element) {
+ $(element).on('click.bs.dropdown', this.toggle)
+ }
+
+ Dropdown.VERSION = '3.3.6'
+
+ function getParent($this) {
+ var selector = $this.attr('data-target')
+
+ if (!selector) {
+ selector = $this.attr('href')
+ selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
+ }
+
+ var $parent = selector && $(selector)
+
+ return $parent && $parent.length ? $parent : $this.parent()
+ }
+
+ function clearMenus(e) {
+ if (e && e.which === 3) return
+ $(backdrop).remove()
+ $(toggle).each(function () {
+ var $this = $(this)
+ var $parent = getParent($this)
+ var relatedTarget = { relatedTarget: this }
+
+ if (!$parent.hasClass('open')) return
+
+ if (e && e.type == 'click' && /input|textarea/i.test(e.target.tagName) && $.contains($parent[0], e.target)) return
+
+ $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
+
+ if (e.isDefaultPrevented()) return
+
+ $this.attr('aria-expanded', 'false')
+ $parent.removeClass('open').trigger($.Event('hidden.bs.dropdown', relatedTarget))
+ })
+ }
+
+ Dropdown.prototype.toggle = function (e) {
+ var $this = $(this)
+
+ if ($this.is('.disabled, :disabled')) return
+
+ var $parent = getParent($this)
+ var isActive = $parent.hasClass('open')
+
+ clearMenus()
+
+ if (!isActive) {
+ if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
+ // if mobile we use a backdrop because click events don't delegate
+ $(document.createElement('div'))
+ .addClass('dropdown-backdrop')
+ .insertAfter($(this))
+ .on('click', clearMenus)
+ }
+
+ var relatedTarget = { relatedTarget: this }
+ $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
+
+ if (e.isDefaultPrevented()) return
+
+ $this
+ .trigger('focus')
+ .attr('aria-expanded', 'true')
+
+ $parent
+ .toggleClass('open')
+ .trigger($.Event('shown.bs.dropdown', relatedTarget))
+ }
+
+ return false
+ }
+
+ Dropdown.prototype.keydown = function (e) {
+ if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return
+
+ var $this = $(this)
+
+ e.preventDefault()
+ e.stopPropagation()
+
+ if ($this.is('.disabled, :disabled')) return
+
+ var $parent = getParent($this)
+ var isActive = $parent.hasClass('open')
+
+ if (!isActive && e.which != 27 || isActive && e.which == 27) {
+ if (e.which == 27) $parent.find(toggle).trigger('focus')
+ return $this.trigger('click')
+ }
+
+ var desc = ' li:not(.disabled):visible a'
+ var $items = $parent.find('.dropdown-menu' + desc)
+
+ if (!$items.length) return
+
+ var index = $items.index(e.target)
+
+ if (e.which == 38 && index > 0) index-- // up
+ if (e.which == 40 && index < $items.length - 1) index++ // down
+ if (!~index) index = 0
+
+ $items.eq(index).trigger('focus')
+ }
+
+
+ // DROPDOWN PLUGIN DEFINITION
+ // ==========================
+
+ function Plugin(option) {
+ return this.each(function () {
+ var $this = $(this)
+ var data = $this.data('bs.dropdown')
+
+ if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
+ if (typeof option == 'string') data[option].call($this)
+ })
+ }
+
+ var old = $.fn.dropdown
+
+ $.fn.dropdown = Plugin
+ $.fn.dropdown.Constructor = Dropdown
+
+
+ // DROPDOWN NO CONFLICT
+ // ====================
+
+ $.fn.dropdown.noConflict = function () {
+ $.fn.dropdown = old
+ return this
+ }
+
+
+ // APPLY TO STANDARD DROPDOWN ELEMENTS
+ // ===================================
+
+ $(document)
+ .on('click.bs.dropdown.data-api', clearMenus)
+ .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
+ .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+ .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
+ .on('keydown.bs.dropdown.data-api', '.dropdown-menu', Dropdown.prototype.keydown)
+
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: modal.js v3.3.6
+ * http://getbootstrap.com/javascript/#modals
+ * ========================================================================
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+ 'use strict';
+
+ // MODAL CLASS DEFINITION
+ // ======================
+
+ var Modal = function (element, options) {
+ this.options = options
+ this.$body = $(document.body)
+ this.$element = $(element)
+ this.$dialog = this.$element.find('.modal-dialog')
+ this.$backdrop = null
+ this.isShown = null
+ this.originalBodyPad = null
+ this.scrollbarWidth = 0
+ this.ignoreBackdropClick = false
+
+ if (this.options.remote) {
+ this.$element
+ .find('.modal-content')
+ .load(this.options.remote, $.proxy(function () {
+ this.$element.trigger('loaded.bs.modal')
+ }, this))
+ }
+ }
+
+ Modal.VERSION = '3.3.6'
+
+ Modal.TRANSITION_DURATION = 300
+ Modal.BACKDROP_TRANSITION_DURATION = 150
+
+ Modal.DEFAULTS = {
+ backdrop: true,
+ keyboard: true,
+ show: true
+ }
+
+ Modal.prototype.toggle = function (_relatedTarget) {
+ return this.isShown ? this.hide() : this.show(_relatedTarget)
+ }
+
+ Modal.prototype.show = function (_relatedTarget) {
+ var that = this
+ var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
+
+ this.$element.trigger(e)
+
+ if (this.isShown || e.isDefaultPrevented()) return
+
+ this.isShown = true
+
+ this.checkScrollbar()
+ this.setScrollbar()
+ this.$body.addClass('modal-open')
+
+ this.escape()
+ this.resize()
+
+ this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
+
+ this.$dialog.on('mousedown.dismiss.bs.modal', function () {
+ that.$element.one('mouseup.dismiss.bs.modal', function (e) {
+ if ($(e.target).is(that.$element)) that.ignoreBackdropClick = true
+ })
+ })
+
+ this.backdrop(function () {
+ var transition = $.support.transition && that.$element.hasClass('fade')
+
+ if (!that.$element.parent().length) {
+ that.$element.appendTo(that.$body) // don't move modals dom position
+ }
+
+ that.$element
+ .show()
+ .scrollTop(0)
+
+ that.adjustDialog()
+
+ if (transition) {
+ that.$element[0].offsetWidth // force reflow
+ }
+
+ that.$element.addClass('in')
+
+ that.enforceFocus()
+
+ var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
+
+ transition ?
+ that.$dialog // wait for modal to slide in
+ .one('bsTransitionEnd', function () {
+ that.$element.trigger('focus').trigger(e)
+ })
+ .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
+ that.$element.trigger('focus').trigger(e)
+ })
+ }
+
+ Modal.prototype.hide = function (e) {
+ if (e) e.preventDefault()
+
+ e = $.Event('hide.bs.modal')
+
+ this.$element.trigger(e)
+
+ if (!this.isShown || e.isDefaultPrevented()) return
+
+ this.isShown = false
+
+ this.escape()
+ this.resize()
+
+ $(document).off('focusin.bs.modal')
+
+ this.$element
+ .removeClass('in')
+ .off('click.dismiss.bs.modal')
+ .off('mouseup.dismiss.bs.modal')
+
+ this.$dialog.off('mousedown.dismiss.bs.modal')
+
+ $.support.transition && this.$element.hasClass('fade') ?
+ this.$element
+ .one('bsTransitionEnd', $.proxy(this.hideModal, this))
+ .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
+ this.hideModal()
+ }
+
+ Modal.prototype.enforceFocus = function () {
+ $(document)
+ .off('focusin.bs.modal') // guard against infinite focus loop
+ .on('focusin.bs.modal', $.proxy(function (e) {
+ if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
+ this.$element.trigger('focus')
+ }
+ }, this))
+ }
+
+ Modal.prototype.escape = function () {
+ if (this.isShown && this.options.keyboard) {
+ this.$element.on('keydown.dismiss.bs.modal', $.proxy(function (e) {
+ e.which == 27 && this.hide()
+ }, this))
+ } else if (!this.isShown) {
+ this.$element.off('keydown.dismiss.bs.modal')
+ }
+ }
+
+ Modal.prototype.resize = function () {
+ if (this.isShown) {
+ $(window).on('resize.bs.modal', $.proxy(this.handleUpdate, this))
+ } else {
+ $(window).off('resize.bs.modal')
+ }
+ }
+
+ Modal.prototype.hideModal = function () {
+ var that = this
+ this.$element.hide()
+ this.backdrop(function () {
+ that.$body.removeClass('modal-open')
+ that.resetAdjustments()
+ that.resetScrollbar()
+ that.$element.trigger('hidden.bs.modal')
+ })
+ }
+
+ Modal.prototype.removeBackdrop = function () {
+ this.$backdrop && this.$backdrop.remove()
+ this.$backdrop = null
+ }
+
+ Modal.prototype.backdrop = function (callback) {
+ var that = this
+ var animate = this.$element.hasClass('fade') ? 'fade' : ''
+
+ if (this.isShown && this.options.backdrop) {
+ var doAnimate = $.support.transition && animate
+
+ this.$backdrop = $(document.createElement('div'))
+ .addClass('modal-backdrop ' + animate)
+ .appendTo(this.$body)
+
+ this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
+ if (this.ignoreBackdropClick) {
+ this.ignoreBackdropClick = false
+ return
+ }
+ if (e.target !== e.currentTarget) return
+ this.options.backdrop == 'static'
+ ? this.$element[0].focus()
+ : this.hide()
+ }, this))
+
+ if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+
+ this.$backdrop.addClass('in')
+
+ if (!callback) return
+
+ doAnimate ?
+ this.$backdrop
+ .one('bsTransitionEnd', callback)
+ .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
+ callback()
+
+ } else if (!this.isShown && this.$backdrop) {
+ this.$backdrop.removeClass('in')
+
+ var callbackRemove = function () {
+ that.removeBackdrop()
+ callback && callback()
+ }
+ $.support.transition && this.$element.hasClass('fade') ?
+ this.$backdrop
+ .one('bsTransitionEnd', callbackRemove)
+ .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
+ callbackRemove()
+
+ } else if (callback) {
+ callback()
+ }
+ }
+
+ // these following methods are used to handle overflowing modals
+
+ Modal.prototype.handleUpdate = function () {
+ this.adjustDialog()
+ }
+
+ Modal.prototype.adjustDialog = function () {
+ var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight
+
+ this.$element.css({
+ paddingLeft: !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '',
+ paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : ''
+ })
+ }
+
+ Modal.prototype.resetAdjustments = function () {
+ this.$element.css({
+ paddingLeft: '',
+ paddingRight: ''
+ })
+ }
+
+ Modal.prototype.checkScrollbar = function () {
+ var fullWindowWidth = window.innerWidth
+ if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8
+ var documentElementRect = document.documentElement.getBoundingClientRect()
+ fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left)
+ }
+ this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth
+ this.scrollbarWidth = this.measureScrollbar()
+ }
+
+ Modal.prototype.setScrollbar = function () {
+ var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
+ this.originalBodyPad = document.body.style.paddingRight || ''
+ if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
+ }
+
+ Modal.prototype.resetScrollbar = function () {
+ this.$body.css('padding-right', this.originalBodyPad)
+ }
+
+ Modal.prototype.measureScrollbar = function () { // thx walsh
+ var scrollDiv = document.createElement('div')
+ scrollDiv.className = 'modal-scrollbar-measure'
+ this.$body.append(scrollDiv)
+ var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth
+ this.$body[0].removeChild(scrollDiv)
+ return scrollbarWidth
+ }
+
+
+ // MODAL PLUGIN DEFINITION
+ // =======================
+
+ function Plugin(option, _relatedTarget) {
+ return this.each(function () {
+ var $this = $(this)
+ var data = $this.data('bs.modal')
+ var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
+
+ if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
+ if (typeof option == 'string') data[option](_relatedTarget)
+ else if (options.show) data.show(_relatedTarget)
+ })
+ }
+
+ var old = $.fn.modal
+
+ $.fn.modal = Plugin
+ $.fn.modal.Constructor = Modal
+
+
+ // MODAL NO CONFLICT
+ // =================
+
+ $.fn.modal.noConflict = function () {
+ $.fn.modal = old
+ return this
+ }
+
+
+ // MODAL DATA-API
+ // ==============
+
+ $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
+ var $this = $(this)
+ var href = $this.attr('href')
+ var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7
+ var option = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
+
+ if ($this.is('a')) e.preventDefault()
+
+ $target.one('show.bs.modal', function (showEvent) {
+ if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown
+ $target.one('hidden.bs.modal', function () {
+ $this.is(':visible') && $this.trigger('focus')
+ })
+ })
+ Plugin.call($target, option, this)
+ })
+
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: tooltip.js v3.3.6
+ * http://getbootstrap.com/javascript/#tooltip
+ * Inspired by the original jQuery.tipsy by Jason Frame
+ * ========================================================================
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+ 'use strict';
+
+ // TOOLTIP PUBLIC CLASS DEFINITION
+ // ===============================
+
+ var Tooltip = function (element, options) {
+ this.type = null
+ this.options = null
+ this.enabled = null
+ this.timeout = null
+ this.hoverState = null
+ this.$element = null
+ this.inState = null
+
+ this.init('tooltip', element, options)
+ }
+
+ Tooltip.VERSION = '3.3.6'
+
+ Tooltip.TRANSITION_DURATION = 150
+
+ Tooltip.DEFAULTS = {
+ animation: true,
+ placement: 'top',
+ selector: false,
+ template: '<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',
+ trigger: 'hover focus',
+ title: '',
+ delay: 0,
+ html: false,
+ container: false,
+ viewport: {
+ selector: 'body',
+ padding: 0
+ }
+ }
+
+ Tooltip.prototype.init = function (type, element, options) {
+ this.enabled = true
+ this.type = type
+ this.$element = $(element)
+ this.options = this.getOptions(options)
+ this.$viewport = this.options.viewport && $($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport))
+ this.inState = { click: false, hover: false, focus: false }
+
+ if (this.$element[0] instanceof document.constructor && !this.options.selector) {
+ throw new Error('`selector` option must be specified when initializing ' + this.type + ' on the window.document object!')
+ }
+
+ var triggers = this.options.trigger.split(' ')
+
+ for (var i = triggers.length; i--;) {
+ var trigger = triggers[i]
+
+ if (trigger == 'click') {
+ this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
+ } else if (trigger != 'manual') {
+ var eventIn = trigger == 'hover' ? 'mouseenter' : 'focusin'
+ var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout'
+
+ this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
+ this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
+ }
+ }
+
+ this.options.selector ?
+ (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+ this.fixTitle()
+ }
+
+ Tooltip.prototype.getDefaults = function () {
+ return Tooltip.DEFAULTS
+ }
+
+ Tooltip.prototype.getOptions = function (options) {
+ options = $.extend({}, this.getDefaults(), this.$element.data(), options)
+
+ if (options.delay && typeof options.delay == 'number') {
+ options.delay = {
+ show: options.delay,
+ hide: options.delay
+ }
+ }
+
+ return options
+ }
+
+ Tooltip.prototype.getDelegateOptions = function () {
+ var options = {}
+ var defaults = this.getDefaults()
+
+ this._options && $.each(this._options, function (key, value) {
+ if (defaults[key] != value) options[key] = value
+ })
+
+ return options
+ }
+
+ Tooltip.prototype.enter = function (obj) {
+ var self = obj instanceof this.constructor ?
+ obj : $(obj.currentTarget).data('bs.' + this.type)
+
+ if (!self) {
+ self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
+ $(obj.currentTarget).data('bs.' + this.type, self)
+ }
+
+ if (obj instanceof $.Event) {
+ self.inState[obj.type == 'focusin' ? 'focus' : 'hover'] = true
+ }
+
+ if (self.tip().hasClass('in') || self.hoverState == 'in') {
+ self.hoverState = 'in'
+ return
+ }
+
+ clearTimeout(self.timeout)
+
+ self.hoverState = 'in'
+
+ if (!self.options.delay || !self.options.delay.show) return self.show()
+
+ self.timeout = setTimeout(function () {
+ if (self.hoverState == 'in') self.show()
+ }, self.options.delay.show)
+ }
+
+ Tooltip.prototype.isInStateTrue = function () {
+ for (var key in this.inState) {
+ if (this.inState[key]) return true
+ }
+
+ return false
+ }
+
+ Tooltip.prototype.leave = function (obj) {
+ var self = obj instanceof this.constructor ?
+ obj : $(obj.currentTarget).data('bs.' + this.type)
+
+ if (!self) {
+ self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
+ $(obj.currentTarget).data('bs.' + this.type, self)
+ }
+
+ if (obj instanceof $.Event) {
+ self.inState[obj.type == 'focusout' ? 'focus' : 'hover'] = false
+ }
+
+ if (self.isInStateTrue()) return
+
+ clearTimeout(self.timeout)
+
+ self.hoverState = 'out'
+
+ if (!self.options.delay || !self.options.delay.hide) return self.hide()
+
+ self.timeout = setTimeout(function () {
+ if (self.hoverState == 'out') self.hide()
+ }, self.options.delay.hide)
+ }
+
+ Tooltip.prototype.show = function () {
+ var e = $.Event('show.bs.' + this.type)
+
+ if (this.hasContent() && this.enabled) {
+ this.$element.trigger(e)
+
+ var inDom = $.contains(this.$element[0].ownerDocument.documentElement, this.$element[0])
+ if (e.isDefaultPrevented() || !inDom) return
+ var that = this
+
+ var $tip = this.tip()
+
+ var tipId = this.getUID(this.type)
+
+ this.setContent()
+ $tip.attr('id', tipId)
+ this.$element.attr('aria-describedby', tipId)
+
+ if (this.options.animation) $tip.addClass('fade')
+
+ var placement = typeof this.options.placement == 'function' ?
+ this.options.placement.call(this, $tip[0], this.$element[0]) :
+ this.options.placement
+
+ var autoToken = /\s?auto?\s?/i
+ var autoPlace = autoToken.test(placement)
+ if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
+
+ $tip
+ .detach()
+ .css({ top: 0, left: 0, display: 'block' })
+ .addClass(placement)
+ .data('bs.' + this.type, this)
+
+ this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
+ this.$element.trigger('inserted.bs.' + this.type)
+
+ var pos = this.getPosition()
+ var actualWidth = $tip[0].offsetWidth
+ var actualHeight = $tip[0].offsetHeight
+
+ if (autoPlace) {
+ var orgPlacement = placement
+ var viewportDim = this.getPosition(this.$viewport)
+
+ placement = placement == 'bottom' && pos.bottom + actualHeight > viewportDim.bottom ? 'top' :
+ placement == 'top' && pos.top - actualHeight < viewportDim.top ? 'bottom' :
+ placement == 'right' && pos.right + actualWidth > viewportDim.width ? 'left' :
+ placement == 'left' && pos.left - actualWidth < viewportDim.left ? 'right' :
+ placement
+
+ $tip
+ .removeClass(orgPlacement)
+ .addClass(placement)
+ }
+
+ var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
+
+ this.applyPlacement(calculatedOffset, placement)
+
+ var complete = function () {
+ var prevHoverState = that.hoverState
+ that.$element.trigger('shown.bs.' + that.type)
+ that.hoverState = null
+
+ if (prevHoverState == 'out') that.leave(that)
+ }
+
+ $.support.transition && this.$tip.hasClass('fade') ?
+ $tip
+ .one('bsTransitionEnd', complete)
+ .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) :
+ complete()
+ }
+ }
+
+ Tooltip.prototype.applyPlacement = function (offset, placement) {
+ var $tip = this.tip()
+ var width = $tip[0].offsetWidth
+ var height = $tip[0].offsetHeight
+
+ // manually read margins because getBoundingClientRect includes difference
+ var marginTop = parseInt($tip.css('margin-top'), 10)
+ var marginLeft = parseInt($tip.css('margin-left'), 10)
+
+ // we must check for NaN for ie 8/9
+ if (isNaN(marginTop)) marginTop = 0
+ if (isNaN(marginLeft)) marginLeft = 0
+
+ offset.top += marginTop
+ offset.left += marginLeft
+
+ // $.fn.offset doesn't round pixel values
+ // so we use setOffset directly with our own function B-0
+ $.offset.setOffset($tip[0], $.extend({
+ using: function (props) {
+ $tip.css({
+ top: Math.round(props.top),
+ left: Math.round(props.left)
+ })
+ }
+ }, offset), 0)
+
+ $tip.addClass('in')
+
+ // check to see if placing tip in new offset caused the tip to resize itself
+ var actualWidth = $tip[0].offsetWidth
+ var actualHeight = $tip[0].offsetHeight
+
+ if (placement == 'top' && actualHeight != height) {
+ offset.top = offset.top + height - actualHeight
+ }
+
+ var delta = this.getViewportAdjustedDelta(placement, offset, actualWidth, actualHeight)
+
+ if (delta.left) offset.left += delta.left
+ else offset.top += delta.top
+
+ var isVertical = /top|bottom/.test(placement)
+ var arrowDelta = isVertical ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight
+ var arrowOffsetPosition = isVertical ? 'offsetWidth' : 'offsetHeight'
+
+ $tip.offset(offset)
+ this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical)
+ }
+
+ Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) {
+ this.arrow()
+ .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')
+ .css(isVertical ? 'top' : 'left', '')
+ }
+
+ Tooltip.prototype.setContent = function () {
+ var $tip = this.tip()
+ var title = this.getTitle()
+
+ $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
+ $tip.removeClass('fade in top bottom left right')
+ }
+
+ Tooltip.prototype.hide = function (callback) {
+ var that = this
+ var $tip = $(this.$tip)
+ var e = $.Event('hide.bs.' + this.type)
+
+ function complete() {
+ if (that.hoverState != 'in') $tip.detach()
+ that.$element
+ .removeAttr('aria-describedby')
+ .trigger('hidden.bs.' + that.type)
+ callback && callback()
+ }
+
+ this.$element.trigger(e)
+
+ if (e.isDefaultPrevented()) return
+
+ $tip.removeClass('in')
+
+ $.support.transition && $tip.hasClass('fade') ?
+ $tip
+ .one('bsTransitionEnd', complete)
+ .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) :
+ complete()
+
+ this.hoverState = null
+
+ return this
+ }
+
+ Tooltip.prototype.fixTitle = function () {
+ var $e = this.$element
+ if ($e.attr('title') || typeof $e.attr('data-original-title') != 'string') {
+ $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
+ }
+ }
+
+ Tooltip.prototype.hasContent = function () {
+ return this.getTitle()
+ }
+
+ Tooltip.prototype.getPosition = function ($element) {
+ $element = $element || this.$element
+
+ var el = $element[0]
+ var isBody = el.tagName == 'BODY'
+
+ var elRect = el.getBoundingClientRect()
+ if (elRect.width == null) {
+ // width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093
+ elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top })
+ }
+ var elOffset = isBody ? { top: 0, left: 0 } : $element.offset()
+ var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
+ var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null
+
+ return $.extend({}, elRect, scroll, outerDims, elOffset)
+ }
+
+ Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
+ return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } :
+ placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } :
+ placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
+ /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width }
+
+ }
+
+ Tooltip.prototype.getViewportAdjustedDelta = function (placement, pos, actualWidth, actualHeight) {
+ var delta = { top: 0, left: 0 }
+ if (!this.$viewport) return delta
+
+ var viewportPadding = this.options.viewport && this.options.viewport.padding || 0
+ var viewportDimensions = this.getPosition(this.$viewport)
+
+ if (/right|left/.test(placement)) {
+ var topEdgeOffset = pos.top - viewportPadding - viewportDimensions.scroll
+ var bottomEdgeOffset = pos.top + viewportPadding - viewportDimensions.scroll + actualHeight
+ if (topEdgeOffset < viewportDimensions.top) { // top overflow
+ delta.top = viewportDimensions.top - topEdgeOffset
+ } else if (bottomEdgeOffset > viewportDimensions.top + viewportDimensions.height) { // bottom overflow
+ delta.top = viewportDimensions.top + viewportDimensions.height - bottomEdgeOffset
+ }
+ } else {
+ var leftEdgeOffset = pos.left - viewportPadding
+ var rightEdgeOffset = pos.left + viewportPadding + actualWidth
+ if (leftEdgeOffset < viewportDimensions.left) { // left overflow
+ delta.left = viewportDimensions.left - leftEdgeOffset
+ } else if (rightEdgeOffset > viewportDimensions.right) { // right overflow
+ delta.left = viewportDimensions.left + viewportDimensions.width - rightEdgeOffset
+ }
+ }
+
+ return delta
+ }
+
+ Tooltip.prototype.getTitle = function () {
+ var title
+ var $e = this.$element
+ var o = this.options
+
+ title = $e.attr('data-original-title')
+ || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
+
+ return title
+ }
+
+ Tooltip.prototype.getUID = function (prefix) {
+ do prefix += ~~(Math.random() * 1000000)
+ while (document.getElementById(prefix))
+ return prefix
+ }
+
+ Tooltip.prototype.tip = function () {
+ if (!this.$tip) {
+ this.$tip = $(this.options.template)
+ if (this.$tip.length != 1) {
+ throw new Error(this.type + ' `template` option must consist of exactly 1 top-level element!')
+ }
+ }
+ return this.$tip
+ }
+
+ Tooltip.prototype.arrow = function () {
+ return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow'))
+ }
+
+ Tooltip.prototype.enable = function () {
+ this.enabled = true
+ }
+
+ Tooltip.prototype.disable = function () {
+ this.enabled = false
+ }
+
+ Tooltip.prototype.toggleEnabled = function () {
+ this.enabled = !this.enabled
+ }
+
+ Tooltip.prototype.toggle = function (e) {
+ var self = this
+ if (e) {
+ self = $(e.currentTarget).data('bs.' + this.type)
+ if (!self) {
+ self = new this.constructor(e.currentTarget, this.getDelegateOptions())
+ $(e.currentTarget).data('bs.' + this.type, self)
+ }
+ }
+
+ if (e) {
+ self.inState.click = !self.inState.click
+ if (self.isInStateTrue()) self.enter(self)
+ else self.leave(self)
+ } else {
+ self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
+ }
+ }
+
+ Tooltip.prototype.destroy = function () {
+ var that = this
+ clearTimeout(this.timeout)
+ this.hide(function () {
+ that.$element.off('.' + that.type).removeData('bs.' + that.type)
+ if (that.$tip) {
+ that.$tip.detach()
+ }
+ that.$tip = null
+ that.$arrow = null
+ that.$viewport = null
+ })
+ }
+
+
+ // TOOLTIP PLUGIN DEFINITION
+ // =========================
+
+ function Plugin(option) {
+ return this.each(function () {
+ var $this = $(this)
+ var data = $this.data('bs.tooltip')
+ var options = typeof option == 'object' && option
+
+ if (!data && /destroy|hide/.test(option)) return
+ if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
+ if (typeof option == 'string') data[option]()
+ })
+ }
+
+ var old = $.fn.tooltip
+
+ $.fn.tooltip = Plugin
+ $.fn.tooltip.Constructor = Tooltip
+
+
+ // TOOLTIP NO CONFLICT
+ // ===================
+
+ $.fn.tooltip.noConflict = function () {
+ $.fn.tooltip = old
+ return this
+ }
+
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: popover.js v3.3.6
+ * http://getbootstrap.com/javascript/#popovers
+ * ========================================================================
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+ 'use strict';
+
+ // POPOVER PUBLIC CLASS DEFINITION
+ // ===============================
+
+ var Popover = function (element, options) {
+ this.init('popover', element, options)
+ }
+
+ if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
+
+ Popover.VERSION = '3.3.6'
+
+ Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
+ placement: 'right',
+ trigger: 'click',
+ content: '',
+ template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
+ })
+
+
+ // NOTE: POPOVER EXTENDS tooltip.js
+ // ================================
+
+ Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
+
+ Popover.prototype.constructor = Popover
+
+ Popover.prototype.getDefaults = function () {
+ return Popover.DEFAULTS
+ }
+
+ Popover.prototype.setContent = function () {
+ var $tip = this.tip()
+ var title = this.getTitle()
+ var content = this.getContent()
+
+ $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
+ $tip.find('.popover-content').children().detach().end()[ // we use append for html objects to maintain js events
+ this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
+ ](content)
+
+ $tip.removeClass('fade top bottom left right in')
+
+ // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
+ // this manually by checking the contents.
+ if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
+ }
+
+ Popover.prototype.hasContent = function () {
+ return this.getTitle() || this.getContent()
+ }
+
+ Popover.prototype.getContent = function () {
+ var $e = this.$element
+ var o = this.options
+
+ return $e.attr('data-content')
+ || (typeof o.content == 'function' ?
+ o.content.call($e[0]) :
+ o.content)
+ }
+
+ Popover.prototype.arrow = function () {
+ return (this.$arrow = this.$arrow || this.tip().find('.arrow'))
+ }
+
+
+ // POPOVER PLUGIN DEFINITION
+ // =========================
+
+ function Plugin(option) {
+ return this.each(function () {
+ var $this = $(this)
+ var data = $this.data('bs.popover')
+ var options = typeof option == 'object' && option
+
+ if (!data && /destroy|hide/.test(option)) return
+ if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
+ if (typeof option == 'string') data[option]()
+ })
+ }
+
+ var old = $.fn.popover
+
+ $.fn.popover = Plugin
+ $.fn.popover.Constructor = Popover
+
+
+ // POPOVER NO CONFLICT
+ // ===================
+
+ $.fn.popover.noConflict = function () {
+ $.fn.popover = old
+ return this
+ }
+
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: scrollspy.js v3.3.6
+ * http://getbootstrap.com/javascript/#scrollspy
+ * ========================================================================
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+ 'use strict';
+
+ // SCROLLSPY CLASS DEFINITION
+ // ==========================
+
+ function ScrollSpy(element, options) {
+ this.$body = $(document.body)
+ this.$scrollElement = $(element).is(document.body) ? $(window) : $(element)
+ this.options = $.extend({}, ScrollSpy.DEFAULTS, options)
+ this.selector = (this.options.target || '') + ' .nav li > a'
+ this.offsets = []
+ this.targets = []
+ this.activeTarget = null
+ this.scrollHeight = 0
+
+ this.$scrollElement.on('scroll.bs.scrollspy', $.proxy(this.process, this))
+ this.refresh()
+ this.process()
+ }
+
+ ScrollSpy.VERSION = '3.3.6'
+
+ ScrollSpy.DEFAULTS = {
+ offset: 10
+ }
+
+ ScrollSpy.prototype.getScrollHeight = function () {
+ return this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight)
+ }
+
+ ScrollSpy.prototype.refresh = function () {
+ var that = this
+ var offsetMethod = 'offset'
+ var offsetBase = 0
+
+ this.offsets = []
+ this.targets = []
+ this.scrollHeight = this.getScrollHeight()
+
+ if (!$.isWindow(this.$scrollElement[0])) {
+ offsetMethod = 'position'
+ offsetBase = this.$scrollElement.scrollTop()
+ }
+
+ this.$body
+ .find(this.selector)
+ .map(function () {
+ var $el = $(this)
+ var href = $el.data('target') || $el.attr('href')
+ var $href = /^#./.test(href) && $(href)
+
+ return ($href
+ && $href.length
+ && $href.is(':visible')
+ && [[$href[offsetMethod]().top + offsetBase, href]]) || null
+ })
+ .sort(function (a, b) { return a[0] - b[0] })
+ .each(function () {
+ that.offsets.push(this[0])
+ that.targets.push(this[1])
+ })
+ }
+
+ ScrollSpy.prototype.process = function () {
+ var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
+ var scrollHeight = this.getScrollHeight()
+ var maxScroll = this.options.offset + scrollHeight - this.$scrollElement.height()
+ var offsets = this.offsets
+ var targets = this.targets
+ var activeTarget = this.activeTarget
+ var i
+
+ if (this.scrollHeight != scrollHeight) {
+ this.refresh()
+ }
+
+ if (scrollTop >= maxScroll) {
+ return activeTarget != (i = targets[targets.length - 1]) && this.activate(i)
+ }
+
+ if (activeTarget && scrollTop < offsets[0]) {
+ this.activeTarget = null
+ return this.clear()
+ }
+
+ for (i = offsets.length; i--;) {
+ activeTarget != targets[i]
+ && scrollTop >= offsets[i]
+ && (offsets[i + 1] === undefined || scrollTop < offsets[i + 1])
+ && this.activate(targets[i])
+ }
+ }
+
+ ScrollSpy.prototype.activate = function (target) {
+ this.activeTarget = target
+
+ this.clear()
+
+ var selector = this.selector +
+ '[data-target="' + target + '"],' +
+ this.selector + '[href="' + target + '"]'
+
+ var active = $(selector)
+ .parents('li')
+ .addClass('active')
+
+ if (active.parent('.dropdown-menu').length) {
+ active = active
+ .closest('li.dropdown')
+ .addClass('active')
+ }
+
+ active.trigger('activate.bs.scrollspy')
+ }
+
+ ScrollSpy.prototype.clear = function () {
+ $(this.selector)
+ .parentsUntil(this.options.target, '.active')
+ .removeClass('active')
+ }
+
+
+ // SCROLLSPY PLUGIN DEFINITION
+ // ===========================
+
+ function Plugin(option) {
+ return this.each(function () {
+ var $this = $(this)
+ var data = $this.data('bs.scrollspy')
+ var options = typeof option == 'object' && option
+
+ if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
+ if (typeof option == 'string') data[option]()
+ })
+ }
+
+ var old = $.fn.scrollspy
+
+ $.fn.scrollspy = Plugin
+ $.fn.scrollspy.Constructor = ScrollSpy
+
+
+ // SCROLLSPY NO CONFLICT
+ // =====================
+
+ $.fn.scrollspy.noConflict = function () {
+ $.fn.scrollspy = old
+ return this
+ }
+
+
+ // SCROLLSPY DATA-API
+ // ==================
+
+ $(window).on('load.bs.scrollspy.data-api', function () {
+ $('[data-spy="scroll"]').each(function () {
+ var $spy = $(this)
+ Plugin.call($spy, $spy.data())
+ })
+ })
+
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: tab.js v3.3.6
+ * http://getbootstrap.com/javascript/#tabs
+ * ========================================================================
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+ 'use strict';
+
+ // TAB CLASS DEFINITION
+ // ====================
+
+ var Tab = function (element) {
+ // jscs:disable requireDollarBeforejQueryAssignment
+ this.element = $(element)
+ // jscs:enable requireDollarBeforejQueryAssignment
+ }
+
+ Tab.VERSION = '3.3.6'
+
+ Tab.TRANSITION_DURATION = 150
+
+ Tab.prototype.show = function () {
+ var $this = this.element
+ var $ul = $this.closest('ul:not(.dropdown-menu)')
+ var selector = $this.data('target')
+
+ if (!selector) {
+ selector = $this.attr('href')
+ selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
+ }
+
+ if ($this.parent('li').hasClass('active')) return
+
+ var $previous = $ul.find('.active:last a')
+ var hideEvent = $.Event('hide.bs.tab', {
+ relatedTarget: $this[0]
+ })
+ var showEvent = $.Event('show.bs.tab', {
+ relatedTarget: $previous[0]
+ })
+
+ $previous.trigger(hideEvent)
+ $this.trigger(showEvent)
+
+ if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) return
+
+ var $target = $(selector)
+
+ this.activate($this.closest('li'), $ul)
+ this.activate($target, $target.parent(), function () {
+ $previous.trigger({
+ type: 'hidden.bs.tab',
+ relatedTarget: $this[0]
+ })
+ $this.trigger({
+ type: 'shown.bs.tab',
+ relatedTarget: $previous[0]
+ })
+ })
+ }
+
+ Tab.prototype.activate = function (element, container, callback) {
+ var $active = container.find('> .active')
+ var transition = callback
+ && $.support.transition
+ && ($active.length && $active.hasClass('fade') || !!container.find('> .fade').length)
+
+ function next() {
+ $active
+ .removeClass('active')
+ .find('> .dropdown-menu > .active')
+ .removeClass('active')
+ .end()
+ .find('[data-toggle="tab"]')
+ .attr('aria-expanded', false)
+
+ element
+ .addClass('active')
+ .find('[data-toggle="tab"]')
+ .attr('aria-expanded', true)
+
+ if (transition) {
+ element[0].offsetWidth // reflow for transition
+ element.addClass('in')
+ } else {
+ element.removeClass('fade')
+ }
+
+ if (element.parent('.dropdown-menu').length) {
+ element
+ .closest('li.dropdown')
+ .addClass('active')
+ .end()
+ .find('[data-toggle="tab"]')
+ .attr('aria-expanded', true)
+ }
+
+ callback && callback()
+ }
+
+ $active.length && transition ?
+ $active
+ .one('bsTransitionEnd', next)
+ .emulateTransitionEnd(Tab.TRANSITION_DURATION) :
+ next()
+
+ $active.removeClass('in')
+ }
+
+
+ // TAB PLUGIN DEFINITION
+ // =====================
+
+ function Plugin(option) {
+ return this.each(function () {
+ var $this = $(this)
+ var data = $this.data('bs.tab')
+
+ if (!data) $this.data('bs.tab', (data = new Tab(this)))
+ if (typeof option == 'string') data[option]()
+ })
+ }
+
+ var old = $.fn.tab
+
+ $.fn.tab = Plugin
+ $.fn.tab.Constructor = Tab
+
+
+ // TAB NO CONFLICT
+ // ===============
+
+ $.fn.tab.noConflict = function () {
+ $.fn.tab = old
+ return this
+ }
+
+
+ // TAB DATA-API
+ // ============
+
+ var clickHandler = function (e) {
+ e.preventDefault()
+ Plugin.call($(this), 'show')
+ }
+
+ $(document)
+ .on('click.bs.tab.data-api', '[data-toggle="tab"]', clickHandler)
+ .on('click.bs.tab.data-api', '[data-toggle="pill"]', clickHandler)
+
+}(jQuery);
+
+/* ========================================================================
+ * Bootstrap: affix.js v3.3.6
+ * http://getbootstrap.com/javascript/#affix
+ * ========================================================================
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+ 'use strict';
+
+ // AFFIX CLASS DEFINITION
+ // ======================
+
+ var Affix = function (element, options) {
+ this.options = $.extend({}, Affix.DEFAULTS, options)
+
+ this.$target = $(this.options.target)
+ .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
+ .on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this))
+
+ this.$element = $(element)
+ this.affixed = null
+ this.unpin = null
+ this.pinnedOffset = null
+
+ this.checkPosition()
+ }
+
+ Affix.VERSION = '3.3.6'
+
+ Affix.RESET = 'affix affix-top affix-bottom'
+
+ Affix.DEFAULTS = {
+ offset: 0,
+ target: window
+ }
+
+ Affix.prototype.getState = function (scrollHeight, height, offsetTop, offsetBottom) {
+ var scrollTop = this.$target.scrollTop()
+ var position = this.$element.offset()
+ var targetHeight = this.$target.height()
+
+ if (offsetTop != null && this.affixed == 'top') return scrollTop < offsetTop ? 'top' : false
+
+ if (this.affixed == 'bottom') {
+ if (offsetTop != null) return (scrollTop + this.unpin <= position.top) ? false : 'bottom'
+ return (scrollTop + targetHeight <= scrollHeight - offsetBottom) ? false : 'bottom'
+ }
+
+ var initializing = this.affixed == null
+ var colliderTop = initializing ? scrollTop : position.top
+ var colliderHeight = initializing ? targetHeight : height
+
+ if (offsetTop != null && scrollTop <= offsetTop) return 'top'
+ if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom'
+
+ return false
+ }
+
+ Affix.prototype.getPinnedOffset = function () {
+ if (this.pinnedOffset) return this.pinnedOffset
+ this.$element.removeClass(Affix.RESET).addClass('affix')
+ var scrollTop = this.$target.scrollTop()
+ var position = this.$element.offset()
+ return (this.pinnedOffset = position.top - scrollTop)
+ }
+
+ Affix.prototype.checkPositionWithEventLoop = function () {
+ setTimeout($.proxy(this.checkPosition, this), 1)
+ }
+
+ Affix.prototype.checkPosition = function () {
+ if (!this.$element.is(':visible')) return
+
+ var height = this.$element.height()
+ var offset = this.options.offset
+ var offsetTop = offset.top
+ var offsetBottom = offset.bottom
+ var scrollHeight = Math.max($(document).height(), $(document.body).height())
+
+ if (typeof offset != 'object') offsetBottom = offsetTop = offset
+ if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element)
+ if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
+
+ var affix = this.getState(scrollHeight, height, offsetTop, offsetBottom)
+
+ if (this.affixed != affix) {
+ if (this.unpin != null) this.$element.css('top', '')
+
+ var affixType = 'affix' + (affix ? '-' + affix : '')
+ var e = $.Event(affixType + '.bs.affix')
+
+ this.$element.trigger(e)
+
+ if (e.isDefaultPrevented()) return
+
+ this.affixed = affix
+ this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
+
+ this.$element
+ .removeClass(Affix.RESET)
+ .addClass(affixType)
+ .trigger(affixType.replace('affix', 'affixed') + '.bs.affix')
+ }
+
+ if (affix == 'bottom') {
+ this.$element.offset({
+ top: scrollHeight - height - offsetBottom
+ })
+ }
+ }
+
+
+ // AFFIX PLUGIN DEFINITION
+ // =======================
+
+ function Plugin(option) {
+ return this.each(function () {
+ var $this = $(this)
+ var data = $this.data('bs.affix')
+ var options = typeof option == 'object' && option
+
+ if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
+ if (typeof option == 'string') data[option]()
+ })
+ }
+
+ var old = $.fn.affix
+
+ $.fn.affix = Plugin
+ $.fn.affix.Constructor = Affix
+
+
+ // AFFIX NO CONFLICT
+ // =================
+
+ $.fn.affix.noConflict = function () {
+ $.fn.affix = old
+ return this
+ }
+
+
+ // AFFIX DATA-API
+ // ==============
+
+ $(window).on('load', function () {
+ $('[data-spy="affix"]').each(function () {
+ var $spy = $(this)
+ var data = $spy.data()
+
+ data.offset = data.offset || {}
+
+ if (data.offsetBottom != null) data.offset.bottom = data.offsetBottom
+ if (data.offsetTop != null) data.offset.top = data.offsetTop
+
+ Plugin.call($spy, data)
+ })
+ })
+
+}(jQuery);
[37/47] roller git commit: Merge pull request #5 from
lbtc-xxx/prevent_404_for_domTT
Posted by sn...@apache.org.
Merge pull request #5 from lbtc-xxx/prevent_404_for_domTT
Prevent 404 not found at getting domTT.js and domTT.css
Thanks Kohei!
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/8a3e3fc6
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/8a3e3fc6
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/8a3e3fc6
Branch: refs/heads/bootstrap-ui
Commit: 8a3e3fc63901b1e8a7bd0e0c144404cc4f843e12
Parents: a025403 95c6a4c
Author: David M. Johnson <sn...@apache.org>
Authored: Sat Jan 9 11:32:50 2016 -0500
Committer: David M. Johnson <sn...@apache.org>
Committed: Sat Jan 9 11:32:50 2016 -0500
----------------------------------------------------------------------
app/src/main/webapp/WEB-INF/web.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
[32/47] roller git commit: Prevent annoying scrolling in EntryEdit
page
Posted by sn...@apache.org.
Prevent annoying scrolling in EntryEdit page
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/a3763486
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/a3763486
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/a3763486
Branch: refs/heads/bootstrap-ui
Commit: a3763486e7bf77e45f37dd8b3c2367967f58401c
Parents: 8042fd7
Author: Kohei Nozaki <ky...@bridge9.sakura.ne.jp>
Authored: Wed Jan 6 13:56:16 2016 +0900
Committer: Kohei Nozaki <ky...@bridge9.sakura.ne.jp>
Committed: Wed Jan 6 13:56:16 2016 +0900
----------------------------------------------------------------------
app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp | 11 ++++++++++-
app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp | 4 ++--
2 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/a3763486/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
index b5ba20b..2fe9df7 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
@@ -22,6 +22,15 @@
<script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script>
<script src='<s:url value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js"/>'></script>
+<%-- Prevent annoying scrolling. taken from http://stackoverflow.com/a/10548809/3591946 --%>
+<script type="text/javascript">
+ $().ready(function () {
+ $("a[href='#'][data-toggle='collapse']").click(function (e) {
+ e.preventDefault();
+ });
+ });
+</script>
+
<style>
#tagAutoCompleteWrapper {
width: 40em; /* set width here or else widget will expand to fit its container */
@@ -159,7 +168,7 @@
<h4 class="panel-title">
<a class="collapsed" data-toggle="collapse" data-target="#collapsePlugins"
- href="#collapsePlugins">
+ href="#">
<s:text name="weblogEdit.pluginsToApply"/> </a>
</h4>
http://git-wip-us.apache.org/repos/asf/roller/blob/a3763486/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
index 110b07f..9b59786 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
@@ -26,7 +26,7 @@
<div class="panel-heading">
<h4 class="panel-title">
- <a data-toggle="collapse" data-target="#collapseContentEditor" href="#collapseContentEditor">
+ <a data-toggle="collapse" data-target="#collapseContentEditor" href="#">
<s:text name="weblogEdit.content"/> </a>
</h4>
@@ -52,7 +52,7 @@
<div class="panel-heading">
<h4 class="panel-title">
- <a href="#collapseSummaryEditor" class="collapsed"
+ <a href="#" class="collapsed"
data-toggle="collapse" data-target="#collapseSummaryEditor" >
<s:text name="weblogEdit.summary"/>
</a>
[03/47] roller git commit: Remove duplicate text, fix links.
Posted by sn...@apache.org.
Remove duplicate text, fix links.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/1cbd3dc6
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/1cbd3dc6
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/1cbd3dc6
Branch: refs/heads/bootstrap-ui
Commit: 1cbd3dc6f1d828b1720ab357daf3342e4657aead
Parents: 76d87c2
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Jan 2 13:10:17 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Jan 2 13:10:17 2015 -0500
----------------------------------------------------------------------
README.md | 25 ++++++-------------------
1 file changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/1cbd3dc6/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index c113dae..cc850fd 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,14 @@
-README.txt
+README.md
===
-This is my personal and experimental fork of Apache Roller.
-There are two experiments here:
-
-1) 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: is a branch of Roller's trunk that has been modified to add
-a REST API, powered by Apache CXF and Apache Shiro. Someday this REST API could power
-a new JavaScript based web interface for Roller.
-
-README.txt
-===
-
-This is Rollarcus: my experimental fork of [Apache Roller](https://github.com/apache/roller).
+This is __Rollarcus__: my experimental fork of [Apache Roller](https://github.com/apache/roller).
So far, there are two experiments here:
-1) [https://github.com/snoopdave/rollarcus/tree/shiro_not_spring(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) [https://github.com/snoopdave/rollarcus/tree/jaxrs_not_struts](jaxrs_not_struts): is a branch of Roller's
+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 and Apache Shiro. Someday this REST API
could power a new JavaScript based web interface for Roller.
[40/47] roller git commit: Small progress on Bookmarks (aka Blogroll)
page conversion to Bootstrap.
Posted by sn...@apache.org.
Small progress on Bookmarks (aka Blogroll) page conversion to Bootstrap.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/604dba39
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/604dba39
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/604dba39
Branch: refs/heads/bootstrap-ui
Commit: 604dba39216ad2803723e8718643112f0aa7cdb5
Parents: 127d337
Author: Dave Johnson <sn...@gmail.com>
Authored: Mon Jan 11 21:24:37 2016 -0500
Committer: Dave Johnson <sn...@gmail.com>
Committed: Mon Jan 11 21:24:37 2016 -0500
----------------------------------------------------------------------
.../webapp/WEB-INF/jsps/editor/Bookmarks.jsp | 54 ++++++++------------
.../webapp/WEB-INF/jsps/editor/Categories.jsp | 10 ----
2 files changed, 22 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/604dba39/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
index a16e2ca..4e55680 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
@@ -19,27 +19,21 @@
<%-- JavaScript for bookmarks table --%>
<script>
-function onDelete()
-{
- if ( confirm("<s:text name='bookmarksForm.delete.confirm' />") )
- {
+function onDelete() {
+ if ( confirm("<s:text name='bookmarksForm.delete.confirm' />") ) {
document.bookmarks.submit();
}
}
-function onDeleteFolder()
-{
- if ( confirm("<s:text name='bookmarksForm.deleteFolder.confirm' />") )
- {
+function onDeleteFolder() {
+ if ( confirm("<s:text name='bookmarksForm.deleteFolder.confirm' />") ) {
document.bookmarks.action='<s:url action="bookmarks!deleteFolder" />';
document.bookmarks.submit();
}
}
-function onMove()
-{
- if ( confirm("<s:text name='bookmarksForm.move.confirm' />") )
- {
+function onMove() {
+ if ( confirm("<s:text name='bookmarksForm.move.confirm' />") ) {
document.bookmarks.action='<s:url action="bookmarks!move" />';
document.bookmarks.submit();
}
@@ -64,12 +58,11 @@ function onMove()
<s:param name="bean.id" value="%{folder.id}" />
<s:param name="folderId" value="%{folder.id}" />
</s:url>
- <s:a href="%{editUrl}"><img src='<s:url value="/images/page_white_edit.png"/>' border="0" alt="icon" /
- title="<s:text name='bookmarksForm.folder.edit.tip' />" /></s:a>
+ <s:a href="%{editUrl}"> <span class="glyphicon glyphicon-play-circle"></span> </s:a>
</s:else>
<%-- Form is a table of folders followed by bookmarks, each with checkbox --%>
-<s:form action="bookmarks!delete">
+<s:form action="bookmarks!delete" theme="bootstrap" cssClass="form-horizontal">
<s:hidden name="salt" />
<s:hidden name="weblog" />
<s:hidden name="folderId" />
@@ -79,18 +72,19 @@ function onMove()
<s:submit type="button" action="bookmarks!view" key="bookmarksForm.viewFolder" />
<%-- Folder to View combo-box --%>
- <s:select name="viewFolderId" list="allFolders" listKey="id" listValue="name" />
+ <s:select name="viewFolderId" list="allFolders" listKey="id" listValue="name" onchange="" />
<br /><br />
</s:if>
- <table class="rollertable">
+ <table class="rollertable table table-striped">
<tr class="rHeaderTr">
- <th class="rollertable" width="5%"><input name="control" type="checkbox" onclick="toggleFunctionAll(this.checked);"
- title="<s:text name="bookmarksForm.selectAllLabel"/>"/></th>
+ <th width="5%">
+ <input name="control" type="checkbox" onclick="toggleFunctionAll(this.checked);"
+ title="<s:text name="bookmarksForm.selectAllLabel"/>"/>
+ </th>
<th class="rollertable" width="25%"><s:text name="generic.name" /></th>
<th class="rollertable" width="25%"><s:text name="bookmarksForm.url" /></th>
- <th class="rollertable" width="35%"><s:text name="bookmarksForm.feedurl" /></th>
<th class="rollertable" width="5%"><s:text name="generic.edit" /></th>
<th class="rollertable" width="5%"><s:text name="bookmarksForm.visitLink" /></th>
</tr>
@@ -112,32 +106,27 @@ function onMove()
value="<s:property value="#bookmark.id"/>" />
</td>
- <td class="rollertable">
+ <td>
<str:truncateNicely lower="25" upper="30" ><s:property value="#bookmark.name" /></str:truncateNicely>
</td>
- <td class="rollertable">
+ <td>
<str:truncateNicely lower="40" upper="50" ><s:property value="#bookmark.url" /></str:truncateNicely>
</td>
- <td class="rollertable">
- <str:truncateNicely lower="60" upper="70" ><s:property value="#bookmark.feedUrl" /></str:truncateNicely>
- </td>
-
- <td class="rollertable" align="center">
+ <td align="center">
<s:url var="editUrl" action="bookmarkEdit">
<s:param name="weblog" value="%{actionWeblog.handle}" />
<s:param name="bean.id" value="#bookmark.id" />
<s:param name="folderId" value="%{folderId}" suppressEmptyParameters="true"/>
</s:url>
- <s:a href="%{editUrl}"><img src='<s:url value="/images/page_white_edit.png"/>' border="0" alt="icon"
- title="<s:text name='bookmarksForm.edit.tip' />" /></s:a>
+ <s:a href="%{editUrl}"> <span class="glyphicon glyphicon-edit"></span> </s:a>
</td>
- <td class="rollertable" align="center">
+ <td align="center">
<s:if test="#bookmark.url != null" >
<a href="<s:property value="#bookmark.url" />">
- <img src='<s:url value="/images/world_go.png"/>' border="0" alt="icon" title="<s:text name='bookmarksForm.visitLink.tip' />" />
+ <span class="glyphicon glyphicon-play-circle"></span>
</a>
</s:if>
</td>
@@ -169,7 +158,8 @@ function onMove()
<s:if test="folder.name != 'default'">
<span style="float:right">
- <s:submit value="%{getText('bookmarksForm.deleteFolder')}" action="bookmarks!deleteFolder" onclick="onDeleteFolder();return false;"/>
+ <s:submit value="%{getText('bookmarksForm.deleteFolder')}"
+ action="bookmarks!deleteFolder" onclick="onDeleteFolder();return false;"/>
</span>
</s:if>
</div>
http://git-wip-us.apache.org/repos/asf/roller/blob/604dba39/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
index 03d6f4e..d00b6fe 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
@@ -17,16 +17,6 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<%-- JavaScript for categories table --%>
-<script>
- function onMove() {
- if (confirm("<s:text name='categoriesForm.move.confirm' />")) {
- document.categories.method.value = "moveSelected";
- document.categories.submit();
- }
- }
-</script>
-
<p class="subtitle">
<s:text name="categoriesForm.subtitle">
<s:param value="weblog"/>