You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/04/10 18:56:13 UTC
svn commit: r1311865 [1/7] - in /rave/branches/bootstrap: ./
rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/
rave-portal-resources/src/main/resources/
rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/
rave-portal-reso...
Author: mfranklin
Date: Tue Apr 10 16:56:11 2012
New Revision: 1311865
URL: http://svn.apache.org/viewvc?rev=1311865&view=rev
Log:
Merge remote-tracking branch 'mj/trunk' into bs
Added:
rave/branches/bootstrap/.gitignore
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css/
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap-responsive.css
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap-responsive.min.css
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap.css
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/css/bootstrap.min.css
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/img/
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/img/glyphicons-halflings-white.png
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/img/glyphicons-halflings.png
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/js/
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/js/bootstrap-tabs.js
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/js/bootstrap.js
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/bootstrap/js/bootstrap.min.js
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/rave.css
Modified:
rave/branches/bootstrap/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java
rave/branches/bootstrap/rave-portal-resources/src/main/resources/messages.properties
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categoryDetail.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_paging.tag
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_tabsheader.tag
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/header.tag
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_css.tag
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_css.tag
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/default.css
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/script/rave.js
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/script/rave_layout.js
rave/branches/bootstrap/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java
Added: rave/branches/bootstrap/.gitignore
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/.gitignore?rev=1311865&view=auto
==============================================================================
--- rave/branches/bootstrap/.gitignore (added)
+++ rave/branches/bootstrap/.gitignore Tue Apr 10 16:56:11 2012
@@ -0,0 +1,7 @@
+########################
+## Intellij files
+########################
+
+*.iml
+.idea/
+rave-shindig/overlays/
\ No newline at end of file
Modified: rave/branches/bootstrap/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java (original)
+++ rave/branches/bootstrap/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java Tue Apr 10 16:56:11 2012
@@ -1,58 +1,59 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. 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.
- */
-
-package org.apache.rave.portal.web.util;
-
-/**
- * Defines constants representing the available keys used for inserting and retrieving objects from the {@link org.springframework.ui.Model}
- */
-public class ModelKeys {
- private ModelKeys() {}
-
- public static final String PAGE = "page"; // the current page object
- public static final String PAGES = "pages"; // a list of pages available for the current user
- public static final String PAGE_LAYOUTS = "pageLayouts"; // a list of all the possible page layouts
- public static final String ERROR_MESSAGE = "errorMessage"; // an error message to be reported to the user
- public static final String WIDGETS = "widgets"; // a list of widget objects
- public static final String WIDGET = "widget";
- public static final String WIDGET_STATISTICS = "widgetStatistics"; //statistics for a single widget
- public static final String WIDGETS_STATISTICS = "widgetsStatistics"; //list of statistics for a list of widgets
- public static final String CATEGORY = "category"; //category
- public static final String REFERRING_PAGE_ID = "referringPageId";
- public static final String OPENSOCIAL_ENVIRONMENT = "openSocialEnv";
- public static final String NEW_USER = "newUser"; //a new user instance created
- public static final String USER_PROFILE="userProfile";
- public static final String SEARCH_TERM = "searchTerm";
- public static final String OFFSET = "offset";
- public static final String SEARCHRESULT = "searchResult";
- public static final String TOKENCHECK = "tokencheck";
- public static final String USER_MAP = "userMap";
- public static final String PORTAL_SETTINGS = "portalSettings";
- public static final String TAGS="tags" ;
- public static final String SELECTED_TAG="selectedTag" ;
- public static final String CATEGORIES = "categories";
- public static final String SELECTED_CATEGORY = "selectedCategory";
- public static final String DEFAULT_TAG_PAGE = "defaultTagPage";
- public static final String CAPTCHA_HTML = "captchaHtml";
- public static final String REDIRECT_MESSAGE = "message";
- public static final String STATIC_CONTENT_CACHE = "staticContentCache";
- public static final String BEFORE_RAVE_INIT_SCRIPT = "beforeRaveInitScript";
- public static final String AFTER_RAVE_INIT_SCRIPT = "afterRaveInitScript";
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. 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.
+ */
+
+package org.apache.rave.portal.web.util;
+
+/**
+ * Defines constants representing the available keys used for inserting and retrieving objects from the {@link org.springframework.ui.Model}
+ */
+public class ModelKeys {
+ private ModelKeys() {
+ }
+
+ public static final String PAGE = "page"; // the current page object
+ public static final String PAGES = "pages"; // a list of pages available for the current user
+ public static final String PAGE_LAYOUTS = "pageLayouts"; // a list of all the possible page layouts
+ public static final String ERROR_MESSAGE = "errorMessage"; // an error message to be reported to the user
+ public static final String WIDGETS = "widgets"; // a list of widget objects
+ public static final String WIDGET = "widget";
+ public static final String WIDGET_STATISTICS = "widgetStatistics"; //statistics for a single widget
+ public static final String WIDGETS_STATISTICS = "widgetsStatistics"; //list of statistics for a list of widgets
+ public static final String CATEGORY = "category"; //category
+ public static final String REFERRING_PAGE_ID = "referringPageId";
+ public static final String OPENSOCIAL_ENVIRONMENT = "openSocialEnv";
+ public static final String NEW_USER = "newUser"; //a new user instance created
+ public static final String USER_PROFILE = "userProfile";
+ public static final String SEARCH_TERM = "searchTerm";
+ public static final String OFFSET = "offset";
+ public static final String SEARCHRESULT = "searchResult";
+ public static final String TOKENCHECK = "tokencheck";
+ public static final String USER_MAP = "userMap";
+ public static final String PORTAL_SETTINGS = "portalSettings";
+ public static final String TAGS = "tags";
+ public static final String SELECTED_TAG = "selectedTag";
+ public static final String CATEGORIES = "categories";
+ public static final String SELECTED_CATEGORY = "selectedCategory";
+ public static final String DEFAULT_TAG_PAGE = "defaultTagPage";
+ public static final String CAPTCHA_HTML = "captchaHtml";
+ public static final String REDIRECT_MESSAGE = "message";
+ public static final String STATIC_CONTENT_CACHE = "staticContentCache";
+ public static final String BEFORE_RAVE_INIT_SCRIPT = "beforeRaveInitScript";
+ public static final String AFTER_RAVE_INIT_SCRIPT = "afterRaveInitScript";
+
}
\ No newline at end of file
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/resources/messages.properties
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/resources/messages.properties?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/resources/messages.properties (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/resources/messages.properties Tue Apr 10 16:56:11 2012
@@ -1,356 +1,356 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. 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.
-#
-
-username.required=Username required
-username.invalid.length=Username must be at least 2 characters long
-username.invalid.pattern=Username must be at least 2 characters long and may only contain letters, numbers, \
- _-+.@
-username.exists=Username already exists
-
-password.required=Password required
-password.invalid.length=Password must be at least 4 characters long
-
-confirmPassword.required=Confirm Password required
-confirmPassword.mismatch=Password mismatch
-
-email.required=Email required
-email.invalid=This is not a valid email address
-email.exists=This email address already exists for a user
-email.doesnot.exist=This email address doesn't exists
-account.invalid=Invalid account. Please contact administrator.
-form.some.fields.required=Field marked with * are required
-form.all.fields.required=All fields are required.
-form.field.error.required=This field is required
-
-page.changepassword.button=Change password
-page.changepassword.title=Change password
-page.changepassword.expired=Request to change your password has been expired. Please request another password reminder.
-
-page.error.title=Rave has suffered a brief meltdown
-page.error.message=Please bear with us while we fetch some ice cubes. In the meantime please try
-page.error.reload=reloading
-page.error.details=technical details
-
-page.general.back=Back to Rave
-page.general.browse=Browse
-page.general.addnewpage=Add a New Page
-page.general.confirmpassword=Confirm password:
-page.general.deletepage=Delete Page
-page.general.editpage=Edit Page
-page.general.email=Email address:
-page.general.empty=Add widgets to this page
-page.general.logout=Logout
-page.general.movepage=Move Page
-page.general.movethispage=Move this page:
-page.general.movethispage.after=After {0}
-page.general.movethispage.tofirst=To First Tab (Set as Default)
-page.general.password=Password:
-page.general.screenshot=screenshot
-page.general.title=Rave
-page.general.thumbnail=thumbnail
-page.general.toadmininterface=Admin interface
-page.general.username=Username:
-page.general.login.information=Enter Login Information
-page.general.personal.information=Enter Personal Information (optional)
-page.general.first.name=First Name:
-page.general.last.name=Last Name:
-page.general.display.name=Name seen by other users:
-page.general.status=Status:
-page.general.about.me=Describe Yourself:
-
-page.general.addpage.title=Title
-page.general.addpage.layout.columns_1=One Column
-page.general.addpage.layout.columns_2=Two Columns
-page.general.addpage.layout.columns_2wn=Two Columns (wide/narrow)
-page.general.addpage.layout.columns_3=Three Columns
-page.general.addpage.layout.columns_3nwn=Three Columns (narrow/wide/narrow)
-page.general.addpage.layout.columns_3_newuser=Three Columns (new user)
-page.general.addpage.layout.columns_4=Four Columns
-page.general.addpage.layout.columns_3nwn_1_bottom=Four Columns (narrow/wide/narrow/bottom)
-page.general.addpage.selectlayout=Select Page Layout:
-page.general.checkBox.featured=Featured
-
-page.getWidgetMetadata.button=Get widget metadata
-page.updateWidgetMetadata.button=Update widget metadata
-
-page.home.title=Home
-page.mobile_home.title=Home
-page.home.welcome=Hello {0}, welcome to Rave!
-
-page.menu.title=Page Actions Menu
-
-page.layout.newuser.introtext=This is the default page layout for new users. We suggest you play with some of the Rave features:<ul><li>Rename this page and change the widget layout</li><li>Add a new page</li><li>Add widgets from the Widget Store</li><li>Edit the preferences for a widget</li><li>Move widgets around on a page</li><li>Collapse and restore a widget</li><li>much more...</li></ul>
-page.layout.newuser.subtitle=We have provided a few sample widgets for you to try out. Click on the Widget Store link above to add more widgets!
-
-page.login.title=Login
-page.login.createaccount=New User
-page.login.createaccount.label=Register:
-page.login.createaccount.button=Create New Account
-page.login.openid=OpenID Identity
-page.login.openid.button=Login with OpenID
-page.login.openid.fail=OpenID identification failed.
-page.login.openid.identifier=Identity:
-page.login.rememberme=Remember me
-page.login.usernamepassword=Username and Password
-page.login.usernamepassword.fail=The username or password is incorrect.
-page.login.usernamepassword.login=Login
-page.login.forgot.password=Forgot password
-page.login.forgot.password.label=Password reminder
-page.login.forgot.password.button=Request new password
-page.login.forgot.username=Username reminder
-page.login.forgot.username.label=Username reminder
-page.login.forgot.username.button=Request username
-
-page.newaccount.title=New Account Application
-page.newaccount.button=Create Account
-page.newaccount.message.created=Account successfully created
-
-page.newpassword.title=Request new password
-page.newpassword.email.sent=An email has been sent to {0}.
-page.newpassword.email.sent.login=Click here to login
-page.newpassword.password.button=Request new password
-page.newpassword.password.title=Request new password
-page.newpassword.username.title=Request username
-page.newpassword.message.success=Password successfully changed
-
-page.retrieveusername.title=Request your username
-
-page.store.title=Widget Store
-page.store.search=Search in widget store
-page.store.search.button=Search
-page.store.list.noresult=No widgets found
-page.store.list.result.x.to.y=Showing {0} - {1} of {2} widgets
-page.store.list.search.noresult=No widgets found for ''{0}''
-page.store.list.search.result.x.to.y=Showing {0} - {1} of {2} widgets that match ''{3}''
-page.store.list.widgets.mine=My Widgets
-page.store.list.widgets.all=All Widgets
-page.store.list.widgets.tag=By Tag:
-page.store.list.widgets.category=By Category:
-
-page.userprofile.title=Update user profile
-page.userprofile.button=Update profile
-page.userprofile.openid.url=OpenID URL:
-page.userprofile.message.success=User profile successfully updated
-
-page.widget.title=Widget Detail
-page.widget.addToPage=Add to Page
-page.widget.backToStore=Back to Store
-page.widget.widgetPreview=Widget Preview
-page.widget.rate=Rate:
-page.widget.rate.like=Like
-page.widget.rate.dislike=Dislike
-page.widget.comments=Comments
-page.widget.comment.edit=Edit Comment
-page.widget.usercount=users
-page.widget.rate.likes=Likes:
-page.widget.rate.dislikes=Dislikes:
-page.widget.tags.title=Tags:
-page.widget.tags.add=Add New Tag:
-page.widget.tags.or=--or--
-page.widget.tags.select=Select from list:
-
-page.addwidget.title=Add new widget
-page.addwidget.form.header=Widget
-page.addwidget.form.submit=Add widget
-page.addwidget.result.exists=The widget you submitted already exists.
-page.addwidget.result.success=The widget was successfully added.
-
-page.profile.title={0}''s Profile
-page.profile.personal.info=Personal Information
-page.profile.first.name=First Name:
-page.profile.last.name=Last Name:
-page.profile.display.name=Display Name:
-page.profile.basic.info=Basic Information
-page.profile.about.me=About Me:
-page.profile.status=Status:
-page.profile.contact.info=Contact Information
-page.profile.email=Email ID:
-page.profile.posts=Posts
-page.profile.posts.page=/WEB-INF/jsp/views/profile_posts.jsp
-page.profile.about=About
-page.profile.about.page=/WEB-INF/jsp/views/profile_about.jsp
-page.profile.widgets=Widgets
-page.profile.widgets.page=/WEB-INF/jsp/views/profile_widgets.jsp
-page.profile.find.friends=Find Friends
-page.profile.friends.page=/WEB-INF/jsp/views/profile_friend_finder.jsp
-page.profile.edit=Edit
-page.profile.edit.option=Edit Your Profile Here
-page.profile.save=Save
-page.profile.cancel=Cancel
-
-page.personProfile.title={0}''s Profile
-page.personProfile.personal.info=Personal Information
-page.personProfile.first.name=First Name:
-page.personProfile.last.name=Last Name:
-page.personProfile.display.name=Display Name:
-page.personProfile.basic.info=Basic Information
-page.personProfile.about.me=About Me:
-page.personProfile.status=Status:
-page.personProfile.contact.info=Contact Information
-page.personProfile.email=Email ID:
-page.personProfile.posts=Posts
-page.personProfile.posts.page=/WEB-INF/jsp/views/profile_posts.jsp
-page.personProfile.about=About
-page.personProfile.about.page=/WEB-INF/jsp/views/profile_about.jsp
-page.personProfile.widgets=Widgets
-page.personProfile.widgets.page=/WEB-INF/jsp/views/profile_widgets.jsp
-page.personProfile.find.friends=Find Friends
-page.personProfile.friends.page=/WEB-INF/jsp/views/profile_friend_finder.jsp
-page.personProfile.edit=Edit
-page.personProfile.edit.option=Edit your profile here
-page.personProfile.save=Save
-page.personProfile.cancel=Cancel
-
-admin.home.title=Rave admin interface
-admin.home.shorttitle=Home
-admin.home.subtitle=Welcome to the Rave admin interface
-admin.home.intro=<p>For help, go to the \
- <a href="http://rave.apache.org/documentation/admin-interface.html" target="_blank">documentation site</a>.</p>
-admin.widgets.title=Rave admin interface - Widgets
-admin.widgets.shorttitle=Widgets
-admin.users.title=Rave admin interface - Users
-admin.users.shorttitle=Users
-admin.users.search=Search Users
-admin.users.add=Add user
-admin.userdetail.title=Rave admin interface - User detail
-admin.userdetail.goback=\u00ab Back to users
-admin.userdetail.editdata=Edit user data
-admin.userdetail.action.delete.success=The user profile has been removed
-admin.userdetail.action.delete.confirm=Yes I want to delete this user
-admin.userdetail.action.delete.confirm.required=Checkbox must be checked
-admin.userdetail.action.update.success=The user profile has been updated
-admin.userdata.username=Username
-admin.userdata.email=Email
-admin.userdata.accountstatus=Account status:
-admin.userdata.enabled=Account enabled
-admin.userdata.expired=Account expired
-admin.userdata.locked=Account locked
-admin.userdata.authorities=Authorities:
-admin.newaccount.title=Create new account
-admin.widgets.search=Search Widgets
-admin.widgets.search.choosetype=Choose Type...
-admin.widgets.search.choosestatus=Choose Status...
-admin.widgetdetail.title=Rave admin interface - Widget detail
-admin.widgetdetail.goback=\u00ab Back to widgets
-admin.widgetdetail.editdata=Edit widget data
-admin.widgetdetail.updatebutton=Update widget
-admin.widgetdetail.action.delete.success=The widget has been removed
-admin.widgetdetail.action.update.success=The widget has been updated
-admin.preferences.title=Rave admin interface - Preferences
-admin.preferences.shorttitle=Preferences
-admin.preferences.edit=Edit preferences
-admin.preferencedetail.title=Rave admin interface - Preferences
-admin.preferencedetail.titleSuffix=Page title suffix
-admin.preferencedetail.pageSize=Number of items per page (list)
-admin.preferencedetail.pageSize.malformed=Enter a whole number greater than 0
-admin.preferencedetail.javaScriptDebugMode=JavaScript Debug Mode
-admin.preferencedetail.javaScriptDebugMode.true=Enabled
-admin.preferencedetail.javaScriptDebugMode.false=Disabled
-admin.preferencedetail.updateButton=Update preferences
-admin.preferencedetail.action.update.success=Preferences have been updated
-admin.preferencedetail.goback=\u00ab Back to overview
-admin.categories.title=Rave admin interface - Categories
-admin.category.shortTitle=Categories
-admin.category.create=Create Category
-admin.category.delete=Delete Category
-admin.category.update=Update Category
-admin.categoryData.text=Text
-admin.categoryData.createdDate=Date Created
-admin.categoryData.createdBy=Created By
-admin.categoryData.modifiedDate=Date Modified
-admin.categoryData.modifiedBy=Modified By
-admin.categoryDetail.action.update.success=Category has been updated
-admin.categoryDetail.action.delete.success=Category has been removed
-admin.categoryDetail.action.create.success=Category has been created
-admin.categoryDetail.goback=\u00ab Back to Categories
-admin.categoryDetail.action.delete.confirm=Yes I want to delete this category
-admin.categoryDetail.editData=Edit category data
-admin.categoryDetail.label.text=Text:
-admin.categoryDetail.title=Rave admin interface - Category
-admin.clearsearch=Clear search
-admin.delete=Delete
-
-admin.list.noresult=No results found
-admin.list.result.x.to.y=Showing {0} - {1} of {2} results
-admin.list.search.noresult=No results found for ''{0}''
-admin.list.search.result.x.to.y=Showing {0} - {1} of {2} results that match ''{3}''
-
-widget.author=Author
-widget.authorEmail=Author's email address
-widget.categories=Categories:
-widget.description=Description
-widget.description.required=Description is required
-widget.disableRendering=Disable Widget
-widget.disableRenderingMessage=Disable Widget Message
-widget.screenshotUrl=Screenshot
-widget.screenshotUrl.malformed=URL is malformed
-widget.thumbnailUrl=Thumbnail
-widget.thumbnailUrl.malformed=URL is malformed
-widget.title=Title
-widget.title.required=Title is required
-widget.titleUrl=URL the widget title links to
-widget.titleUrl.malformed=URL is malformed
-widget.type=Type
-widget.type.OpenSocial=OpenSocial
-widget.type.W3C=W3C Widget
-widget.type.required=Choose a widget type
-widget.url=Location (URL)
-widget.url.malformed=URL is malformed
-widget.url.required=URL is required
-widget.url.exists=A Widget already exists for this URL
-widget.widgetStatus=Status
-widget.widgetStatus.PREVIEW=This widget is waiting for approval by the site administrator.
-widget.widgetStatus.PUBLISHED=
-
-widget.chrome.toggle=Collapse/Restore Widget
-widget.chrome.disabled=This widget is currently disabled
-
-widget.menu.about=About this Widget
-widget.menu.delete=Delete Widget
-widget.menu.editprefs=Edit Preferences
-widget.menu.maximize=Maximize
-widget.menu.movethiswidget=Move this widget to page:
-widget.menu.movetopage=Move to Page
-widget.menu.title=Widget Actions
-
-#######################################################################################################################
-# messages available to the client javascript via the MessageBundleController must start with "_rave_client."
-#######################################################################################################################
-_rave_client.api.error=Rave encountered an error while trying to contact the server. Please reload the page and try again. Error:
-_rave_client.api.rpc.error.invalid_params=Rave attempted to update the server with your recent changes, but the changes were rejected by the server as invalid.
-_rave_client.api.rpc.error.internal=Rave attempted to update the server with your recent changes, but the server encountered an internal error.
-_rave_client.api.widget_metadata.invalid_params=Both url and type are needed to get the metadata
-_rave_client.api.widget_metadata.parse_error=Unable to parse Widget for its metadata.\n\nPlease verify that the url is pointing to a valid Widget of the type specified.
-_rave_client.common.add=Add
-_rave_client.common.cancel=Cancel
-_rave_client.common.move=Move
-_rave_client.common.save=Save
-_rave_client.common.update=Update
-_rave_client.form.password.invalid_match=The password does not match
-_rave_client.opensocial.render_error=Unable to render OpenSocial Gadget:
-_rave_client.page.add=Add a New Page
-_rave_client.page.duplicate_name=A page with that name already exists
-_rave_client.page.update=Update Page
-_rave_client.widget.add_prefix=The widget
-_rave_client.widget.add_suffix= has been added to your page
-_rave_client.widget.prefs.required.title=* indicates a required input
-_rave_client.widget.provider.error=This widget type is currently unsupported. Check with your administrator and be sure the correct provider is registered.
-_rave_client.widget.remove_confirm=Are you sure you want to remove this widget from your page?
-_rave_client.widget.users.added_by=has been added by...
-
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. 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.
+#
+
+username.required=Username required
+username.invalid.length=Username must be at least 2 characters long
+username.invalid.pattern=Username must be at least 2 characters long and may only contain letters, numbers, \
+ _-+.@
+username.exists=Username already exists
+
+password.required=Password required
+password.invalid.length=Password must be at least 4 characters long
+
+confirmPassword.required=Confirm Password required
+confirmPassword.mismatch=Password mismatch
+
+email.required=Email required
+email.invalid=This is not a valid email address
+email.exists=This email address already exists for a user
+email.doesnot.exist=This email address doesn't exists
+account.invalid=Invalid account. Please contact administrator.
+form.some.fields.required=Field marked with * are required
+form.all.fields.required=All fields are required.
+form.field.error.required=This field is required
+
+page.changepassword.button=Change password
+page.changepassword.title=Change password
+page.changepassword.expired=Request to change your password has been expired. Please request another password reminder.
+
+page.error.title=Rave has suffered a brief meltdown
+page.error.message=Please bear with us while we fetch some ice cubes. In the meantime please try
+page.error.reload=reloading
+page.error.details=technical details
+
+page.general.back=Back to Rave
+page.general.browse=Browse
+page.general.addnewpage=Add a New Page
+page.general.confirmpassword=Confirm password:
+page.general.deletepage=Delete Page
+page.general.editpage=Edit Page
+page.general.email=Email address:
+page.general.empty=Add widgets to this page
+page.general.logout=Logout
+page.general.movepage=Move Page
+page.general.movethispage=Move this page:
+page.general.movethispage.after=After {0}
+page.general.movethispage.tofirst=To First Tab (Set as Default)
+page.general.password=Password:
+page.general.screenshot=screenshot
+page.general.title=Rave
+page.general.thumbnail=thumbnail
+page.general.toadmininterface=Admin interface
+page.general.username=Username:
+page.general.login.information=Enter Login Information
+page.general.personal.information=Enter Personal Information (optional)
+page.general.first.name=First Name:
+page.general.last.name=Last Name:
+page.general.display.name=Name seen by other users:
+page.general.status=Status:
+page.general.about.me=Describe Yourself:
+
+page.general.addpage.title=Title
+page.general.addpage.layout.columns_1=One Column
+page.general.addpage.layout.columns_2=Two Columns
+page.general.addpage.layout.columns_2wn=Two Columns (wide/narrow)
+page.general.addpage.layout.columns_3=Three Columns
+page.general.addpage.layout.columns_3nwn=Three Columns (narrow/wide/narrow)
+page.general.addpage.layout.columns_3_newuser=Three Columns (new user)
+page.general.addpage.layout.columns_4=Four Columns
+page.general.addpage.layout.columns_3nwn_1_bottom=Four Columns (narrow/wide/narrow/bottom)
+page.general.addpage.selectlayout=Select Page Layout:
+page.general.checkBox.featured=Featured
+
+page.getWidgetMetadata.button=Get widget metadata
+page.updateWidgetMetadata.button=Update widget metadata
+
+page.home.title=Home
+page.mobile_home.title=Home
+page.home.welcome=Hello {0}, welcome to Rave!
+
+page.menu.title=Page Actions Menu
+
+page.layout.newuser.introtext=This is the default page layout for new users. We suggest you play with some of the Rave features:<ul><li>Rename this page and change the widget layout</li><li>Add a new page</li><li>Add widgets from the Widget Store</li><li>Edit the preferences for a widget</li><li>Move widgets around on a page</li><li>Collapse and restore a widget</li><li>much more...</li></ul>
+page.layout.newuser.subtitle=We have provided a few sample widgets for you to try out. Click on the Widget Store link above to add more widgets!
+
+page.login.title=Login
+page.login.createaccount=New User
+page.login.createaccount.label=Register:
+page.login.createaccount.button=Create New Account
+page.login.openid=OpenID Identity
+page.login.openid.button=Login with OpenID
+page.login.openid.fail=OpenID identification failed.
+page.login.openid.identifier=Identity:
+page.login.rememberme=Remember me
+page.login.usernamepassword=Username and Password
+page.login.usernamepassword.fail=The username or password is incorrect.
+page.login.usernamepassword.login=Login
+page.login.forgot.password=Forgot password
+page.login.forgot.password.label=Password reminder
+page.login.forgot.password.button=Request new password
+page.login.forgot.username=Username reminder
+page.login.forgot.username.label=Username reminder
+page.login.forgot.username.button=Request username
+
+page.newaccount.title=New Account Application
+page.newaccount.button=Create Account
+page.newaccount.message.created=Account successfully created
+
+page.newpassword.title=Request new password
+page.newpassword.email.sent=An email has been sent to {0}.
+page.newpassword.email.sent.login=Click here to login
+page.newpassword.password.button=Request new password
+page.newpassword.password.title=Request new password
+page.newpassword.username.title=Request username
+page.newpassword.message.success=Password successfully changed
+
+page.retrieveusername.title=Request your username
+
+page.store.title=Widget Store
+page.store.search=Search in widget store
+page.store.search.button=Search
+page.store.list.noresult=No widgets found
+page.store.list.result.x.to.y=Showing {0} - {1} of {2} widgets
+page.store.list.search.noresult=No widgets found for ''{0}''
+page.store.list.search.result.x.to.y=Showing {0} - {1} of {2} widgets that match ''{3}''
+page.store.list.widgets.mine=My Widgets
+page.store.list.widgets.all=All Widgets
+page.store.list.widgets.tag=By Tag:
+page.store.list.widgets.category=By Category:
+
+page.userprofile.title=Update user profile
+page.userprofile.button=Update profile
+page.userprofile.openid.url=OpenID URL:
+page.userprofile.message.success=User profile successfully updated
+
+page.widget.title=Widget Detail
+page.widget.addToPage=Add to Page
+page.widget.backToStore=Back to Store
+page.widget.widgetPreview=Widget Preview
+page.widget.rate=Rate:
+page.widget.rate.like=Like
+page.widget.rate.dislike=Dislike
+page.widget.comments=Comments
+page.widget.comment.edit=Edit Comment
+page.widget.usercount=users
+page.widget.rate.likes=Likes:
+page.widget.rate.dislikes=Dislikes:
+page.widget.tags.title=Tags:
+page.widget.tags.add=Add New Tag:
+page.widget.tags.or=--or--
+page.widget.tags.select=Select from list:
+
+page.addwidget.title=Add new widget
+page.addwidget.form.header=Widget
+page.addwidget.form.submit=Add widget
+page.addwidget.result.exists=The widget you submitted already exists.
+page.addwidget.result.success=The widget was successfully added.
+
+page.profile.title={0}''s Profile
+page.profile.personal.info=Personal Information
+page.profile.first.name=First Name:
+page.profile.last.name=Last Name:
+page.profile.display.name=Display Name:
+page.profile.basic.info=Basic Information
+page.profile.about.me=About Me:
+page.profile.status=Status:
+page.profile.contact.info=Contact Information
+page.profile.email=Email ID:
+page.profile.posts=Posts
+page.profile.posts.page=/WEB-INF/jsp/views/profile_posts.jsp
+page.profile.about=About
+page.profile.about.page=/WEB-INF/jsp/views/profile_about.jsp
+page.profile.widgets=Widgets
+page.profile.widgets.page=/WEB-INF/jsp/views/profile_widgets.jsp
+page.profile.find.friends=Find Friends
+page.profile.friends.page=/WEB-INF/jsp/views/profile_friend_finder.jsp
+page.profile.edit=Edit
+page.profile.edit.option=Edit Your Profile Here
+page.profile.save=Save
+page.profile.cancel=Cancel
+
+page.personProfile.title={0}''s Profile
+page.personProfile.personal.info=Personal Information
+page.personProfile.first.name=First Name:
+page.personProfile.last.name=Last Name:
+page.personProfile.display.name=Display Name:
+page.personProfile.basic.info=Basic Information
+page.personProfile.about.me=About Me:
+page.personProfile.status=Status:
+page.personProfile.contact.info=Contact Information
+page.personProfile.email=Email ID:
+page.personProfile.posts=Posts
+page.personProfile.posts.page=/WEB-INF/jsp/views/profile_posts.jsp
+page.personProfile.about=About
+page.personProfile.about.page=/WEB-INF/jsp/views/profile_about.jsp
+page.personProfile.widgets=Widgets
+page.personProfile.widgets.page=/WEB-INF/jsp/views/profile_widgets.jsp
+page.personProfile.find.friends=Find Friends
+page.personProfile.friends.page=/WEB-INF/jsp/views/profile_friend_finder.jsp
+page.personProfile.edit=Edit
+page.personProfile.edit.option=Edit your profile here
+page.personProfile.save=Save
+page.personProfile.cancel=Cancel
+
+admin.home.title=Rave admin interface
+admin.home.shorttitle=Home
+admin.home.subtitle=Welcome to the Rave admin interface
+admin.home.intro=<p>For help, go to the \
+ <a href="http://rave.apache.org/documentation/admin-interface.html" target="_blank">documentation site</a>.</p>
+admin.widgets.title=Rave admin interface - Widgets
+admin.widgets.shorttitle=Widgets
+admin.users.title=Rave admin interface - Users
+admin.users.shorttitle=Users
+admin.users.search=Search Users
+admin.users.add=Add user
+admin.userdetail.title=Rave admin interface - User detail
+admin.userdetail.goback=\u00ab Back to users
+admin.userdetail.editdata=Edit user data
+admin.userdetail.action.delete.success=The user profile has been removed
+admin.userdetail.action.delete.confirm=Yes I want to delete this user
+admin.userdetail.action.delete.confirm.required=Checkbox must be checked
+admin.userdetail.action.update.success=The user profile has been updated
+admin.userdata.username=Username
+admin.userdata.email=Email
+admin.userdata.accountstatus=Account status:
+admin.userdata.enabled=Account enabled
+admin.userdata.expired=Account expired
+admin.userdata.locked=Account locked
+admin.userdata.authorities=Authorities:
+admin.newaccount.title=Create new account
+admin.widgets.search=Search Widgets
+admin.widgets.search.choosetype=Choose Type...
+admin.widgets.search.choosestatus=Choose Status...
+admin.widgetdetail.title=Rave admin interface - Widget detail
+admin.widgetdetail.goback=\u00ab Back to widgets
+admin.widgetdetail.editdata=Edit widget data
+admin.widgetdetail.updatebutton=Update widget
+admin.widgetdetail.action.delete.success=The widget has been removed
+admin.widgetdetail.action.update.success=The widget has been updated
+admin.preferences.title=Rave admin interface - Preferences
+admin.preferences.shorttitle=Preferences
+admin.preferences.edit=Edit preferences
+admin.preferencedetail.title=Rave admin interface - Preferences
+admin.preferencedetail.titleSuffix=Page title suffix
+admin.preferencedetail.pageSize=Number of items per page (list)
+admin.preferencedetail.pageSize.malformed=Enter a whole number greater than 0
+admin.preferencedetail.javaScriptDebugMode=JavaScript Debug Mode
+admin.preferencedetail.javaScriptDebugMode.true=Enabled
+admin.preferencedetail.javaScriptDebugMode.false=Disabled
+admin.preferencedetail.updateButton=Update preferences
+admin.preferencedetail.action.update.success=Preferences have been updated
+admin.preferencedetail.goback=\u00ab Back to overview
+admin.categories.title=Rave admin interface - Categories
+admin.category.shortTitle=Categories
+admin.category.create=Create Category
+admin.category.delete=Delete Category
+admin.category.update=Update Category
+admin.categoryData.text=Text
+admin.categoryData.createdDate=Date Created
+admin.categoryData.createdBy=Created By
+admin.categoryData.modifiedDate=Date Modified
+admin.categoryData.modifiedBy=Modified By
+admin.categoryDetail.action.update.success=Category has been updated
+admin.categoryDetail.action.delete.success=Category has been removed
+admin.categoryDetail.action.create.success=Category has been created
+admin.categoryDetail.goback=\u00ab Back to Categories
+admin.categoryDetail.action.delete.confirm=Yes I want to delete this category
+admin.categoryDetail.editData=Edit category data
+admin.categoryDetail.label.text=Text:
+admin.categoryDetail.title=Rave admin interface - Category
+admin.clearsearch=Clear search
+admin.delete=Delete
+
+admin.list.noresult=No results found
+admin.list.result.x.to.y=Showing {0} - {1} of {2} results
+admin.list.search.noresult=No results found for ''{0}''
+admin.list.search.result.x.to.y=Showing {0} - {1} of {2} results that match ''{3}''
+
+widget.author=Author
+widget.authorEmail=Author's email address
+widget.categories=Categories:
+widget.description=Description
+widget.description.required=Description is required
+widget.disableRendering=Disable Widget
+widget.disableRenderingMessage=Disable Widget Message
+widget.screenshotUrl=Screenshot
+widget.screenshotUrl.malformed=URL is malformed
+widget.thumbnailUrl=Thumbnail
+widget.thumbnailUrl.malformed=URL is malformed
+widget.title=Title
+widget.title.required=Title is required
+widget.titleUrl=URL the widget title links to
+widget.titleUrl.malformed=URL is malformed
+widget.type=Type
+widget.type.OpenSocial=OpenSocial
+widget.type.W3C=W3C Widget
+widget.type.required=Choose a widget type
+widget.url=Location (URL)
+widget.url.malformed=URL is malformed
+widget.url.required=URL is required
+widget.url.exists=A Widget already exists for this URL
+widget.widgetStatus=Status
+widget.widgetStatus.PREVIEW=This widget is waiting for approval by the site administrator.
+widget.widgetStatus.PUBLISHED=
+
+widget.chrome.toggle=Collapse/Restore Widget
+widget.chrome.disabled=This widget is currently disabled
+
+widget.menu.about=About this Widget
+widget.menu.delete=Delete Widget
+widget.menu.editprefs=Edit Preferences
+widget.menu.maximize=Maximize
+widget.menu.movethiswidget=Move this widget to page:
+widget.menu.movetopage=Move to Page
+widget.menu.title=Widget Actions
+
+#######################################################################################################################
+# messages available to the client javascript via the MessageBundleController must start with "_rave_client."
+#######################################################################################################################
+_rave_client.api.error=Rave encountered an error while trying to contact the server. Please reload the page and try again. Error:
+_rave_client.api.rpc.error.invalid_params=Rave attempted to update the server with your recent changes, but the changes were rejected by the server as invalid.
+_rave_client.api.rpc.error.internal=Rave attempted to update the server with your recent changes, but the server encountered an internal error.
+_rave_client.api.widget_metadata.invalid_params=Both url and type are needed to get the metadata
+_rave_client.api.widget_metadata.parse_error=Unable to parse Widget for its metadata.\n\nPlease verify that the url is pointing to a valid Widget of the type specified.
+_rave_client.common.add=Add
+_rave_client.common.cancel=Cancel
+_rave_client.common.move=Move
+_rave_client.common.save=Save
+_rave_client.common.update=Update
+_rave_client.form.password.invalid_match=The password does not match
+_rave_client.opensocial.render_error=Unable to render OpenSocial Gadget:
+_rave_client.page.add=Add a New Page
+_rave_client.page.duplicate_name=A page with that name already exists
+_rave_client.page.update=Update Page
+_rave_client.widget.add_prefix=The widget
+_rave_client.widget.add_suffix= has been added to your page
+_rave_client.widget.prefs.required.title=* indicates a required input
+_rave_client.widget.provider.error=This widget type is currently unsupported. Check with your administrator and be sure the correct provider is registered.
+_rave_client.widget.remove_confirm=Are you sure you want to remove this widget from your page?
+_rave_client.widget.users.added_by=has been added by...
+
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp Tue Apr 10 16:56:11 2012
@@ -1,49 +1,49 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. 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.
---%>
-<%@ page language="java" trimDirectiveWhitespaces="true" %>
-<%@ page errorPage="/WEB-INF/jsp/views/error.jsp" %>
-<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
-<%-- Expose any attributes defined in the tiles-defs.xml to the request scope for use in other tiles --%>
-<tiles:importAttribute scope="request"/>
-<!DOCTYPE html>
-<html>
-<head>
- <meta charset="ISO-8859-1"/>
- <meta name="viewport" content="width=device-width" />
- <title><rave:title /></title>
- <rave:rave_css/>
- <rave:custom_css/>
-</head>
-<body>
-<%-- Header Content --%>
-<tiles:insertAttribute name="header"/>
-<%-- Main Body Content --%>
-<tiles:insertAttribute name="body"/>
-<%-- Footer Content --%>
-<tiles:insertAttribute name="footer"/>
-<%-- render any script that needs to execute pre-src includes --%>
-<portal:render-init-script location="${'BEFORE_RAVE'}" />
-<%-- render the javascript src includes at the bottom of the page for performance --%>
-<rave:rave_js/>
-<%-- render custom javascript from extension projects if the tag is overlayed --%>
-<rave:custom_js/>
-<%-- render any script that needs to execute post-src includes --%>
-<portal:render-init-script location="${'AFTER_RAVE'}" />
-</body>
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. 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.
+--%>
+<%@ page language="java" trimDirectiveWhitespaces="true" %>
+<%@ page errorPage="/WEB-INF/jsp/views/error.jsp" %>
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<%-- Expose any attributes defined in the tiles-defs.xml to the request scope for use in other tiles --%>
+<tiles:importAttribute scope="request"/>
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="ISO-8859-1"/>
+ <meta name="viewport" content="width=device-width" />
+ <title><rave:title /></title>
+ <rave:rave_css/>
+ <rave:custom_css/>
+</head>
+<body>
+<%-- Header Content --%>
+<tiles:insertAttribute name="header"/>
+<%-- Main Body Content --%>
+<tiles:insertAttribute name="body"/>
+<%-- Footer Content --%>
+<tiles:insertAttribute name="footer"/>
+<%-- render any script that needs to execute pre-src includes --%>
+<portal:render-init-script location="${'BEFORE_RAVE'}" />
+<%-- render the javascript src includes at the bottom of the page for performance --%>
+<rave:rave_js/>
+<%-- render custom javascript from extension projects if the tag is overlayed --%>
+<rave:custom_js/>
+<%-- render any script that needs to execute post-src includes --%>
+<portal:render-init-script location="${'AFTER_RAVE'}" />
+</body>
</html>
\ No newline at end of file
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp Tue Apr 10 16:56:11 2012
@@ -20,76 +20,79 @@
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
<header>
- <nav class="topnav">
- <ul class="horizontal-list">
- <c:if test="${not empty referringPageId}">
+ <nav>
+ <div class="navbar navbar-fixed-top">
+ <a class="brand" href="#"><fmt:message key="page.addwidget.title"/></a>
+ <ul class="nav pull-right">
+ <c:if test="${not empty referringPageId}">
+ <li>
+ <a href="<spring:url value="/app/store?referringPageId=${referringPageId}" />">
+ <fmt:message key="page.widget.backToStore"/>
+ </a>
+ </li>
+ </c:if>
<li>
- <a href="<spring:url value="/app/store?referringPageId=${referringPageId}" />">
- <fmt:message key="page.widget.backToStore"/>
- </a>
+ <c:choose>
+ <c:when test="${empty referringPageId}">
+ <spring:url value="/index.html" var="gobackurl"/>
+ </c:when>
+ <c:otherwise>
+ <spring:url value="/app/page/view/${referringPageId}" var="gobackurl"/>
+ </c:otherwise>
+ </c:choose>
+ <a href="<c:out value="${gobackurl}"/>"><fmt:message key="page.general.back"/></a>
</li>
- </c:if>
- <li>
- <c:choose>
- <c:when test="${empty referringPageId}">
- <spring:url value="/index.html" var="gobackurl" />
- </c:when>
- <c:otherwise>
- <spring:url value="/app/page/view/${referringPageId}" var="gobackurl"/>
- </c:otherwise>
- </c:choose>
- <a href="<c:out value="${gobackurl}"/>"><fmt:message key="page.general.back"/></a>
- </li>
- <sec:authorize url="/app/admin/">
+ <sec:authorize url="/app/admin/">
+ <li>
+ <a href="<spring:url value="/app/admin/"/>">
+ <fmt:message key="page.general.toadmininterface"/>
+ </a>
+ </li>
+ </sec:authorize>
<li>
- <a href="<spring:url value="/app/admin/"/>">
- <fmt:message key="page.general.toadmininterface"/>
- </a>
+ <a href="<spring:url value="/j_spring_security_logout" htmlEscape="true" />">
+ <fmt:message key="page.general.logout"/></a>
</li>
- </sec:authorize>
- <li>
- <a href="<spring:url value="/j_spring_security_logout" htmlEscape="true" />">
- <fmt:message key="page.general.logout"/></a>
- </li>
- </ul>
+
+ </ul>
+ </div>
+
</nav>
- <h1><fmt:message key="page.addwidget.title"/></h1>
</header>
-<div id="content">
+<div class="container">
<h2><fmt:message key="page.addwidget.form.header"/></h2>
<form:errors path="widget" cssClass="error" element="p"/>
- <form:form id="newWidgetForm" action="add?referringPageId=${referringPageId}" commandName="widget" method="POST">
+ <form:form cssClass="form-horizontal" id="newWidgetForm" action="add?referringPageId=${referringPageId}" commandName="widget" method="POST">
<fieldset>
- <p><fmt:message key="form.some.fields.required"/></p>
+ <div class="control-group label label-important"><fmt:message key="form.some.fields.required"/></div>
- <p>
+ <div class="control-group">
<spring:bind path="url">
- <label for="url"><fmt:message key="widget.url"/> *</label>
- <input type="url" name="url" id="url"
- placeholder="http://example.com/widget.xml" required="required"
- class="long" value="<c:out value="${widget.url}"/>"/>
+ <label class="control-label" for="url"><fmt:message key="widget.url"/> *</label>
+ <div class="controls"><input class="input-xlarge" type="url" name="url" id="url"
+ placeholder="http://example.com/widget.xml" required="required"
+ value="<c:out value="${widget.url}"/>"/></div>
</spring:bind>
<form:errors path="url" cssClass="error"/>
- </p>
+ </div>
- <p>
- <label for="type1"><fmt:message key="widget.type"/> *</label>
- <label for="type1" class="formradio">
- <form:radiobutton path="type" value="OpenSocial"/>
- <fmt:message key="widget.type.OpenSocial"/>
- </label>
- <label for="type2" class="formradio" style="display:inline">
- <form:radiobutton path="type" value="W3C"/>
- <fmt:message key="widget.type.W3C"/>
- <a id="w3cBrowseLink" style="position:relative;left:10px;" href="#"><fmt:message key="page.general.browse"/></a>
- </label>
+ <div class="control-group">
+ <label class="control-label" for="type1"><fmt:message key="widget.type"/> *</label>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="type1" class="formradio"><fmt:message key="widget.type.OpenSocial"/></label>
+ <div class="controls"><form:radiobutton path="type" value="OpenSocial"/></div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="type2" class="formradio"><fmt:message key="widget.type.W3C"/></label>
+ <div class="controls"><form:radiobutton path="type" value="W3C"/></div>
<form:errors path="type" cssClass="error"/>
- </p>
+ </div>
- <a href="#" class="storeItemButton"
- id="fetchMetadataButton"
- onclick="rave.api.rpc.getWidgetMetadata({
+ <a href="#" class="btn btn-primary"
+ id="fetchMetadataButton"
+ onclick="rave.api.rpc.getWidgetMetadata({
url: $('#url').get(0).value,
providerType: $('input:radio[name=type]:checked').val(),
successCallback: function(result) {
@@ -111,72 +114,77 @@
}
}
});">
- <fmt:message key="page.getWidgetMetadata.button"/>
+ <fmt:message key="page.getWidgetMetadata.button"/>
</a>
- <div id="addWidgetForm">
- <p>
- <form:label path="title"><fmt:message key="widget.title"/> *</form:label>
- <form:input path="title" cssClass="long" required="required" autofocus="autofocus"/>
+ <div class="row clearfix" id="addWidgetForm">
+
+
+ <div class="control-group">
+ <form:label cssClass="control-label" path="title"> <fmt:message key="widget.title"/> *</form:label>
+ <div class="controls">
+ <form:input path="title" cssClass="input-xlarge" required="required" autofocus="autofocus"/></div>
<form:errors path="title" cssClass="error"/>
- </p>
+ </div>
- <p>
- <form:label path="description"><fmt:message key="widget.description"/> *</form:label>
- <form:textarea path="description" required="required" cssClass="long"/>
+ <div class="control-group">
+ <form:label cssClass="control-label" path="description"><fmt:message key="widget.description"/> *</form:label>
+ <div class="controls"><form:textarea path="description" required="required" cssClass="input-xlarge"/></div>
<form:errors path="description" cssClass="error"/>
- </p>
+ </div>
- <p>
+ <div class="control-group">
<spring:bind path="thumbnailUrl">
- <label for="thumbnailUrl"><fmt:message key="widget.thumbnailUrl"/></label>
- <input type="url" name="thumbnailUrl" id="thumbnailUrl"
- placeholder="http://example.com/thumbnail.png" class="long"
- value="<c:out value="${widget.thumbnailUrl}"/>"/>
+ <label class="control-label" for="thumbnailUrl"><fmt:message key="widget.thumbnailUrl"/></label>
+ <div class="controls"><input type="url" name="thumbnailUrl" id="thumbnailUrl"
+ placeholder="http://example.com/thumbnail.png" class="input-xlarge"
+ value="<c:out value="${widget.thumbnailUrl}"/>"/></div>
</spring:bind>
<form:errors path="thumbnailUrl" cssClass="error"/>
- </p>
+ </div>
- <p>
+ <div class="control-group">
<spring:bind path="screenshotUrl">
- <label for="screenshotUrl"><fmt:message key="widget.screenshotUrl"/></label>
- <input type="url" name="screenshotUrl" id="screenshotUrl"
- placeholder="http://example.com/screenshot.png" class="long"
- value="<c:out value="${widget.screenshotUrl}"/>"/>
+ <label class="control-label" for="screenshotUrl"><fmt:message key="widget.screenshotUrl"/></label>
+ <div class="controls">
+ <input type="url" name="screenshotUrl" id="screenshotUrl" placeholder="http://example.com/screenshot.png" class="input-xlarge"
+ value="<c:out value="${widget.screenshotUrl}"/>"/></div>
</spring:bind>
<form:errors path="screenshotUrl" cssClass="error"/>
- </p>
+ </div>
- <p>
+ <div class="control-group">
<spring:bind path="titleUrl">
- <label for="titleUrl"><fmt:message key="widget.titleUrl"/></label>
- <input type="url" name="titleUrl" id="titleUrl"
- class="long" value="<c:out value="${widget.titleUrl}"/>"/>
+ <label class="control-label" for="titleUrl"><fmt:message key="widget.titleUrl"/></label>
+ <div class="controls"><input type="url" name="titleUrl" id="titleUrl"
+ class="input-xlarge" value="<c:out value="${widget.titleUrl}"/>"/></div>
</spring:bind>
<form:errors path="titleUrl" cssClass="error"/>
- </p>
+ </div>
- <p>
- <form:label path="author"><fmt:message key="widget.author"/></form:label>
- <form:input path="author" cssClass="long"/>
- <form:errors path="author" cssClass="error"/>
- </p>
- <p>
+ <div class="control-group">
+ <form:label cssClass="control-label" path="author"><fmt:message key="widget.author"/></form:label>
+ <div class="controls"><form:input path="author" cssClass="input-xlarge"/>
+ <form:errors path="author" cssClass="error"/>
+ </div>
+
+ </div>
+ <div class="control-group">
<spring:bind path="authorEmail">
- <label for="authorEmail"><fmt:message key="widget.authorEmail"/></label>
- <input type="email" name="authorEmail" id="authorEmail" class="long"
- value="<c:out value="${widget.authorEmail}"/>"/>
+ <label class="control-label" for="authorEmail"><fmt:message key="widget.authorEmail"/></label>
+ <div class="controls"><input type="email" name="authorEmail" id="authorEmail" class="input-xlarge"
+ value="<c:out value="${widget.authorEmail}"/>"/></div>
</spring:bind>
<form:errors path="titleUrl" cssClass="error"/>
- </p>
+ </div>
</div>
+ </fieldset>
+ <div id="addWidgetFormSubmit">
+ <fieldset>
+ <fmt:message key="page.addwidget.form.submit" var="submit"/>
+ <button class="btn btn-primary" type="submit" value="${submit}">${submit}</button>
</fieldset>
- <div id="addWidgetFormSubmit">
- <fieldset>
- <fmt:message key="page.addwidget.form.submit" var="submit"/>
- <input type="submit" value="${submit}"/>
- </fieldset>
- </div>
+ </div>
</form:form>
</div>
<div id="w3cBrowseForm" title="Browse available W3C widgets">
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp Tue Apr 10 16:56:11 2012
@@ -1,109 +1,105 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. 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.
- --%>
-<%@ page language="java" trimDirectiveWhitespaces="true" %>
-<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
-<fmt:setBundle basename="messages"/>
-
-<fmt:message key="${pageTitleKey}" var="pagetitle"/>
-<rave:header pageTitle="${pagetitle}"/>
-<rave:admin_tabsheader/>
-<div class="pageContent">
- <article class="admincontent">
- <%--@elvariable id="actionresult" type="java.lang.String"--%>
- <c:if test="${actionresult eq 'delete' or actionresult eq 'update' or actionresult eq 'create'}">
- <div class="alert-message success">
- <p>
- <fmt:message key="admin.categoryDetail.action.${actionresult}.success"/>
- </p>
- </div>
- </c:if>
-
- <h2><fmt:message key="admin.category.shortTitle"/></h2>
-
- <div class="rightcolumn">
- <section class="formbox">
- <h3><fmt:message key="admin.category.create"/></h3>
- <form:form id="createCategoryForm" commandName="category" action="category/create" method="POST">
- <form:errors cssClass="error" element="p"/>
- <fieldset>
- <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
-
- <p>
- <label for="text"><fmt:message
- key="admin.categoryDetail.label.text"/></label>
- <form:input id="text" path="text" required="required" autofocus="autofocus"/>
- <form:errors path="text" cssClass="error"/>
- </p>
- </fieldset>
- <fieldset>
- <p>
- <fmt:message key="admin.category.create" var="createCategoryMsg"/>
- <input type="submit" value="${createCategoryMsg}"/>
- </p>
- </fieldset>
- </form:form>
- </section>
- </div>
-
- <div class="leftcolumn">
- <table class="datatable categoryTable">
- <thead>
- <tr>
- <th class="textcell"><fmt:message key="admin.categoryData.text"/></th>
- <th class="textcell"><fmt:message key="admin.categoryData.createdBy"/></th>
- <th class="textcell"><fmt:message key="admin.categoryData.createdDate"/></th>
- <th class="textcell"><fmt:message key="admin.categoryData.modifiedBy"/></th>
- <th class="textcell"><fmt:message key="admin.categoryData.modifiedDate"/></th>
- </tr>
- </thead>
- <tbody>
- <c:forEach items="${categories}" var="category">
- <spring:url value="/app/admin/category/edit?id=${category.entityId}" var="detaillink"/>
-
- <tr data-detaillink="${detaillink}">
- <td class="textcell">
- <c:out value="${category.text}"/>
- </td>
- <td class="textcell">
- <c:out value="${category.createdUser.username}"/>
- </td>
- <td class="textcell">
- <fmt:formatDate value="${category.createdDate}" dateStyle="short" type="both" />
- </td>
- <td class="textcell">
- <c:out value="${category.lastModifiedUser.username}"/>
- </td>
- <td class="textcell">
- <fmt:formatDate value="${category.lastModifiedDate}" dateStyle="short" type="both" />
- </td>
- </tr>
- </c:forEach>
- </tbody>
- </table>
-
- </div>
- </article>
-</div>
-<portal:register-init-script location="${'AFTER_RAVE'}">
- <script>
- $(function() {
- rave.admin.initAdminUi();
- });
- </script>
-</portal:register-init-script>
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. 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.
+ --%>
+<%@ page language="java" trimDirectiveWhitespaces="true" %>
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<fmt:setBundle basename="messages"/>
+
+<fmt:message key="${pageTitleKey}" var="pagetitle"/>
+
+<rave:header pageTitle="${pagetitle}"/>
+<div class="container-fluid">
+ <div class="span2">
+ <rave:admin_tabsheader/>
+ </div>
+ <article class="span8">
+ <h2><fmt:message key="admin.category.shortTitle"/></h2>
+ <%--@elvariable id="actionresult" type="java.lang.String"--%>
+ <c:if test="${actionresult eq 'delete' or actionresult eq 'update' or actionresult eq 'create'}">
+ <div class="alert alert-info">
+ <fmt:message key="admin.categoryDetail.action.${actionresult}.success"/>
+ </div>
+ </c:if>
+
+ <table class="table table-striped table-bordered table-condensed">
+ <thead>
+ <tr>
+ <th><fmt:message key="admin.categoryData.text"/></th>
+ <th><fmt:message key="admin.categoryData.createdBy"/></th>
+ <th><fmt:message key="admin.categoryData.createdDate"/></th>
+ <th><fmt:message key="admin.categoryData.modifiedBy"/></th>
+ <th><fmt:message key="admin.categoryData.modifiedDate"/></th>
+ </tr>
+ </thead>
+ <tbody>
+ <c:forEach items="${categories}" var="category">
+ <spring:url value="/app/admin/category/edit?id=${category.entityId}" var="detaillink"/>
+
+ <tr data-detaillink="${detaillink}">
+ <td>
+ <a href="${detaillink}"><c:out value="${category.text}"/></a>
+ </td>
+ <td>
+ <c:out value="${category.createdUser.username}"/>
+ </td>
+ <td>
+ <c:out value="${category.createdDate}"/>
+ </td>
+ <td>
+ <c:out value="${category.lastModifiedUser.username}"/>
+ </td>
+ <td>
+ <c:out value="${category.lastModifiedDate}"/>
+ </td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
+
+
+ </article>
+ <div class="span4">
+ <form:form cssClass="form-horizontal" commandName="category" action="category/create" method="POST">
+ <form:errors cssClass="error" element="p"/>
+ <fieldset>
+ <legend><fmt:message key="admin.category.create"/></legend>
+ <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
+ <div class="control-group">
+ <label class="control-label" for="text"><fmt:message key="admin.categoryDetail.label.text"/></label>
+ <div class="controls">
+ <form:input cssClass="input-medium" id="text" path="text" required="required" autofocus="autofocus"/>
+ <form:errors path="text" cssClass="error"/></div>
+ </div>
+ </fieldset>
+ <fieldset>
+ <fmt:message key="admin.category.create" var="createCategoryMsg"/>
+ <div class="controls">
+ <button class="btn btn-primary" type="submit" value="${createCategoryMsg}">${createCategoryMsg}</button>
+ </div>
+
+ </fieldset>
+ </form:form>
+ </div>
+</div>
+<portal:register-init-script location="${'AFTER_RAVE'}">
+ <script>
+ $(function() {
+ rave.admin.initAdminUi();
+ });
+ </script>
+</portal:register-init-script>
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categoryDetail.jsp
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categoryDetail.jsp?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categoryDetail.jsp (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categoryDetail.jsp Tue Apr 10 16:56:11 2012
@@ -1,97 +1,83 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. 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.
- --%>
-<%@ page language="java" trimDirectiveWhitespaces="true" %>
-<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
-<fmt:setBundle basename="messages"/>
-
-<fmt:message key="${pageTitleKey}" var="pagetitle"/>
-<rave:header pageTitle="${pagetitle}"/>
-<rave:admin_tabsheader/>
-<div class="pageContent">
- <article class="admincontent">
- <ul class="horizontal-list goback">
- <li><a href="<spring:url value="/app/admin/categories"/>"><fmt:message key="admin.categoryDetail.goback"/></a>
- </li>
- </ul>
- <h2><c:out value="${category.text}"/></h2>
-
- <div class="rightcolumn">
- <section class="formbox">
- <h3><fmt:message key="admin.delete"/><c:out value=" ${category.text}"/></h3>
- <form:form id="deleteCategory" action="delete" commandName="category" method="POST">
- <fieldset>
- <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
-
- <div>
- <ul class="checkboxlist">
- <li>
- <input type="checkbox" name="confirmdelete" id="confirmdelete" value="true"/>
- <label for="confirmdelete"><fmt:message
- key="admin.categoryDetail.action.delete.confirm"/></label>
- <c:if test="${missingConfirm}">
- <p class="error"><fmt:message
- key="admin.userdetail.action.delete.confirm.required"/></p>
- </c:if>
- </li>
- </ul>
- </div>
- </fieldset>
- <fieldset>
- <p>
- <fmt:message key="admin.category.delete" var="deleteCategoryMsg"/>
- <input type="submit" value="${deleteCategoryMsg}"/>
- </p>
- </fieldset>
- </form:form>
- </section>
-
-
- </div>
-
- <div class="leftcolumn">
- <section class="formbox">
- <h3><fmt:message key="admin.categoryDetail.editData"/></h3>
- <form:form id="updateCategory" action="update" commandName="category" method="POST">
- <form:errors cssClass="error" element="p"/>
- <fieldset>
- <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
- <p>
- <label for="text"><fmt:message
- key="admin.categoryDetail.label.text"/></label>
-
- <form:input id="text" path="text" required="required" value="${category.text}" autofocus="autofocus"/>
- <form:errors path="text" cssClass="error"/>
- </p>
- </fieldset>
- <fieldset>
- <fmt:message key="admin.category.update" var="updateCategoryMsg"/>
- <input type="submit" value="${updateCategoryMsg}"/>
- </fieldset>
- </form:form>
- </section>
-
- </div>
-
- <div class="clear-float">
-
- </div>
-
-
- </article>
-</div>
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. 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.
+ --%>
+<%@ page language="java" trimDirectiveWhitespaces="true" %>
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<fmt:setBundle basename="messages"/>
+
+<fmt:message key="${pageTitleKey}" var="pagetitle"/>
+<rave:header pageTitle="${pagetitle}"/>
+<div class="container-fluid">
+ <div class="span2">
+ <rave:admin_tabsheader/>
+ </div>
+ <article class="span6">
+ <ul class="horizontal-list goback">
+ <li>
+ <a href="<spring:url value="/app/admin/categories"/>"><fmt:message key="admin.categoryDetail.goback"/></a>
+ </li>
+ </ul>
+ <h2><c:out value="${category.text}"/></h2>
+
+ <section class="span6">
+ <h3><fmt:message key="admin.delete"/><c:out value=" ${category.text}"/></h3>
+ <form:form id="deleteCategory" action="delete" commandName="category" method="POST">
+ <fieldset>
+ <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
+
+ <div>
+ <ul class="checkboxlist">
+ <li>
+ <input type="checkbox" name="confirmdelete" id="confirmdelete" value="true"/>
+ <label for="confirmdelete"><fmt:message key="admin.categoryDetail.action.delete.confirm"/></label>
+ <c:if test="${missingConfirm}">
+ <p class="error"><fmt:message key="admin.userdetail.action.delete.confirm.required"/></p>
+ </c:if>
+ </li>
+ </ul>
+ </div>
+ </fieldset>
+ <fieldset>
+ <fmt:message key="admin.category.delete" var="deleteCategoryMsg"/>
+ <button class="btn btn-primary" type="submit" value="${deleteCategoryMsg}">${deleteCategoryMsg}</button>
+ </fieldset>
+ </form:form>
+ </section>
+
+ </article>
+ <section class="span3">
+ <h3><fmt:message key="admin.categoryDetail.editData"/></h3>
+ <form:form id="updateCategory" action="update" commandName="category" method="POST">
+ <form:errors cssClass="error" element="p"/>
+ <fieldset>
+ <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
+ <p>
+ <label for="text"><fmt:message
+ key="admin.categoryDetail.label.text"/></label>
+
+ <form:input id="text" path="text" required="required" value="${category.text}" autofocus="autofocus"/>
+ <form:errors path="text" cssClass="error"/>
+ </p>
+ </fieldset>
+ <fieldset>
+ <fmt:message key="admin.category.update" var="updateCategoryMsg"/>
+ <button class="btn btn-primary" type="submit" value="${updateCategoryMsg}">${updateCategoryMsg}</button>
+ </fieldset>
+ </form:form>
+ </section>
+</div>
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp Tue Apr 10 16:56:11 2012
@@ -22,13 +22,13 @@
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
<rave:header pageTitle="${pagetitle}"/>
-<rave:admin_tabsheader/>
-<div class="pageContent">
- <article class="admincontent">
+
+<div class="container-fluid">
+ <div class="span2">
+ <rave:admin_tabsheader/>
+ </div>
+ <article class="span8">
<h2><fmt:message key="admin.home.subtitle"/></h2>
<fmt:message key="admin.home.intro"/>
- <div class="clear-float">
-
- </div>
</article>
-</div>
\ No newline at end of file
+</div>