Skip to content

O
Openfire
Commit 4e6e9efa authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gaston
Browse files
Options

Modified to use resource bundles for i18n. JM-156 


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@985 b35dd754-fafc-0310-a699-88a17e54d16e
parent 76bc12a5
Show whitespace changes
Inline Side-by-side
Showing with 1510 additions and 822 deletions
src/i18n/messenger_i18n_en.properties
View file @ 4e6e9efa
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
# In property strings that are parameterized, single quotes can be used to # In property strings that are parameterized, single quotes can be used to
# quote the "{" (curly brace) if necessary. A real single quote is represented by ''. # quote the "{" (curly brace) if necessary. A real single quote is represented by ''.
# #
# REVISION HISTORY (by Jive Messenger version):
#
# Server startup messages # Server startup messages
startup.name=Jive Messenger {0} Started [{1}] startup.name=Jive Messenger {0} Started [{1}]
...@@ -159,10 +161,14 @@ short.title = Jive Messenger ...@@ -159,10 +161,14 @@ short.title = Jive Messenger
title = Jive Messenger title = Jive Messenger
# Admin Console Pages below # Admin Console Pages below
global.restart=restart
global.server_status=Server Status
# Group Chat Service Properties Page # Group Chat Service Properties Page
groupchat.service.properties.title=Group Chat Service Properties groupchat.service.properties.title=Group Chat Service Properties
groupchat.service.properties.introduction=Use the form below to edit group chat service settings. Note, any changes will require a server restart. groupchat.service.properties.introduction=Use the form below to edit group chat service settings. Note, any changes will require a server restart.
groupchat.service.properties.saved_successfully=Service properties edited successfully. You must <b>restart</b> the server in order for the changes to take effect (see <a href="index.jsp">Server Status</a>). groupchat.service.properties.saved_successfully=Service properties edited successfully. You must
groupchat.service.properties.saved_successfully2=the server in order for the changes to take effect (see
groupchat.service.properties.error_service_name=Error setting the service name. groupchat.service.properties.error_service_name=Error setting the service name.
groupchat.service.properties.legend=Service Name groupchat.service.properties.legend=Service Name
groupchat.service.properties.label_service_name=Group chat service name: groupchat.service.properties.label_service_name=Group chat service name:
...@@ -198,4 +204,753 @@ groupchat.admins.no_admins=No administrators specified, use the form above to ad ...@@ -198,4 +204,753 @@ groupchat.admins.no_admins=No administrators specified, use the form above to ad
groupchat.admins.dialog.title=Click to delete... groupchat.admins.dialog.title=Click to delete...
groupchat.admins.dialog.text=Are you sure you want to remove this user from the list? groupchat.admins.dialog.text=Are you sure you want to remove this user from the list?
#audit policy Page
audit.policy.title=Audit Policy
audit.policy.settings.saved_successfully=Settings updated successfully.
audit.policy.title_info=can audit XMPP traffic on the server and save the data to XML data files. The amount of data sent via an XMPP server can be substantial. Messenger provides several settings to control whether to audit packets, how audit files are created, and the types of packets to save. In most cases, logging Message packets will provide all of the data an enterprise requires. Presence and IQ packets are primarily useful for tracing and troubleshooting XMPP deployments.
audit.policy.policytitle=Set Message Audit Policy
audit.policy.label_disable_auditing=Disable Message Auditing
audit.policy.label_disable_auditing_info=-- packets are not logged.
audit.policy.label_enable_auditing=Enable Message Auditing
audit.policy.label_enable_auditing_info=-- packets are logged with the following options:
audit.policy.maxfile_size=Maximum file size (MB):
audit.policy.validnumber=Please enter a valid number.
audit.policy.maxfile_number=Maximum number of files:
audit.policy.flush_interval=Flush Interval (seconds):
audit.policy.packet_audit=Packets to audit:
audit.policy.label_audit_messenge_packets=Audit Message Packets
audit.policy.label_audit_presence_packets=Audit Presence Packets
audit.policy.label_audit_iq_packets=Audit IQ Packets
audit.policy.queued_packets=Queued packets:
#chatroom history settings Page
chatroom.history.settings.title=Chat Room History Settings
chatroom.history.settings.saved_successfully=Settings updated successfully.
chatroom.history.settings.info_response1=Chatrooms can replay conversation histories to provide context to new members joining a room.
chatroom.history.settings.info_response2=provides several options for controlling how much history to store for each room.
chatroom.history.settings.policy=Set Chatroom History Policy
chatroom.history.settings.label_show_title=Don't Show History
chatroom.history.settings.label_show_content=- Do not show the entire chat history.
chatroom.history.settings.label_show_Entire_title=Show Entire Chat History
chatroom.history.settings.label_show_Entire_content=- Show the entire chat history to the user.
chatroom.history.settings.label_show_message_number_title=Show a Specific Number of Messages
chatroom.history.settings.label_show_message_number_content=Show a specific number of the most recent messages in the chat. Use the box below to specify that number.
#error Page
error.admin_privileges=You don't have admin privileges to perform this operation.
error.requested_user=The requested user
error.username=(username:
error.not_found=was not found.
error.not_found_group=The requested group was not found.
error.exception=Exception:
#error serverdown Page
error.serverdown.title=Server Down
error.serverdown.admin_console=Admin Console
error.serverdown.is_down=is currently down. To continue:
error.serverdown.start=Start the server.
error.serverdown.login=Login to the admin console
#group create Page
group.create.title=Create Group
group.create.error=Error creating the group. Please check your error logs.
group.create.form=Use the form below to create a group.
group.create.new_group_title=Create New Group
group.create.group_name=Group Name:
group.create.invalid_group_name=Invalid group name.
group.create.invalid_group_info=Group already exists - please choose a different name.
group.create.label_description=Description:
group.create.invalid_description=Invalid description.
group.create.label_initial_member=Initial Member(s):
group.create.share_groups_title=Shared Roster Groups
group.create.share_groups_info=You can use the form below to show this group in users' rosters. Select from one of three options for who should see this group in their rosters.
group.create.disable_share_group=Disable sharing group in rosters
group.create.enable_share_group=Enable sharing group in rosters
group.create.group_display_name=Group Display Name
group.create.enter_a_group_name=Enter a Group Display Name.
group.create.show_group_in_all_users=Show group in all users' rosters.
group.create.show_group_in_group_members=Show group in group members' rosters
group.create.show_group_in_roster_group=Show group to members' rosters of these groups:
group.create.required_fields=Required fields
#group delete Page
group.delete.title=Delete Group
group.delete.hint_info=Are you sure you want to delete the group
group.delete.hint_info1=from the system?
#group edit Page
group.edit.title=Edit Group
group.edit.form_info=Edit group settings and add or remove group members and administrators using the forms below.
group.edit.update=Group information updated successfully.
group.edit.update_add_user=User(s) added successfully.
group.edit.update_del_user=User(s) deleted successfully.
group.edit.update_user=User(s) updated successfully.
group.edit.update_success=Group created successfully.
group.edit.not_update=User(s) not added successfully.
group.edit.group_summary=Group Summary
group.edit.group_name=Name:
group.edit.group_description=Description:
group.edit.group_not_description=No Description
group.edit.group_share_title=Shared Roster Groups
group.edit.group_share_content=You can use the form below to show this group in users' rosters. Select from one of three options for who should see this group in their rosters.
group.edit.group_share_not_in_rosters=Disable sharing group in rosters
group.edit.group_share_in_rosters=Enable sharing group in rosters
group.edit.group_display_name=Group Display Name
group.edit.show_groups_in_all_user=Show group in all users' rosters.
group.edit.show_groups_in_groups_members=Show group in group members' rosters
group.edit.show_group_in_roster_group=Show group to members' rosters of these groups:
group.edit.add_user=Add User(s):
group.edit.username=Username
group.edit.admin=Admin
group.edit.remove=Remove
group.edit.user_hint=No members in this group. Use the form above to add some.
#group summary Page
group.summary.title=Group Summary
group.summary.list_group=Below is a list of the groups in the system.
group.summary.delete_group=Group deleted successfully.
group.summary.total_group=Total Groups:
group.summary.showing=Showing
group.summary.page=Pages:
group.summary.page_name=Name
group.summary.page_member=Members
group.summary.page_admin=Admins
group.summary.page_edit=Edit
group.summary.page_delete=Delete
group.summary.no_groups=No groups in the system.
group.summary.click_edit="Click to edit..."
group.summary.click_delete="Click to delete..."
#header Page
header.admin=Admin
#index Page
index.title=Server Settings
index.title.info=Below are properties for this server. Click the "Edit Properties" button below to change some of the server settings. Some settings can not be changed.
index.properties=Server Properties
index.uptime=Server Uptime:
index.version=Version:
index.home=Messenger Home:
index.server_name=Server Name:
index.server_port=Server Ports
index.server_ip=IP:Port, Security:
index.port_type=NORMAL
index.port_type1=TLS (SSL)
index.domain_name=Domain Name(s):
index.environment=Environment
index.jvm=JVM Version and Vendor:
index.app=Appserver:
index.os=OS / Hardware:
index.local=Locale / Timezone:
#license details Page
license.details.info=The following is a summary of your
license.details.info1=license.
license.details.details=License Details
license.details.type=License Type:
license.details.max_session=Maximum Allowable Sessions:
license.details.unlimited=Unlimited
license.details.expiration_date=Expiration Date:
license.details.expiration_date_never=Never
#log Page
log.line=line
#login Page
login.title=Admin Console
login.hint=Admin Console Login
login.error=Error: You don't have JavaScript enabled. This tool uses JavaScript and much of it will not work correctly without it enabled. Please turn JavaScript back on and reload this page.
login.failed=Login failed: make sure your username and password are correct and that you're an admin or moderator.
login.username=username
login.password=password
login.version=Version
#logviewer Page
logviewer.title=Log Viewer
logviewer.error=Error
logviewer.warn=Warn
logviewer.info=Info
logviewer.debug=Debug
logviewer.log=Log File:
logviewer.order=Order:
logviewer.normal=logviewer.
logviewer.reverse=Reverse
logviewer.modified=Last Modified:
logviewer.line=Lines:
logviewer.all=All
logviewer.confirm=Are you sure you want to clear this log file?
logviewer.clear=Are you sure you want to clear this log file?
logviewer.alt_clear=Clear Log
logviewer.clear=Clear
logviewer.alt_mark=Mark Log
logviewer.mark=Mark
logviewer.refresh=Refresh:
logviewer.seconds=seconds
logviewer.debug_log=Debug Log
logviewer.enabled=Enabled
#muc create permission Page
muc.create.permission.title=Room Creation Permissions
muc.create.permission.info=Use the form below to configure the policy for who can create group chat rooms.
muc.create.permission.error=Error adding the user. Please verify the JID is correct.
muc.create.permission.update=Settings updated successfully.
muc.create.permission.add_user=User added successfully.
muc.create.permission.user_removed=User removed successfully.
muc.create.permission.policy=Permission Policy
muc.create.permission.anyone_created=Anyone can create a chat room.
muc.create.permission.specific_created=Only specific users can create a chat room.
muc.create.permission.allowed_users=Allowed Users
muc.create.permission.add_jid=Add User (JID):
muc.create.permission.no_allowed_users=No allowed users, use the form above to add one.
muc.create.permission.click_title=Click to delete...
muc.create.permission.confirm_remove=Are you sure you want to remove this user from the list?
#muc room affiliations Page
muc.room.affiliations.title=User Permissions
muc.room.affiliations.info=Below is the list of room owners, administrators, members and outcasts of the the room
muc.room.affiliations.info_detail=Room owners can alter the room configuration, grant ownership and administrative privileges to users and destroy the room. Room administrators can ban, grant membership and moderator privileges to users. Room members are the only allowed users to join the room when it is configured as members-only. Whilst room outcasts are users who have been banned from the room.
muc.room.affiliations.error_removing_user=Error removing the user. The room must have at least one owner.
muc.room.affiliations.error_banning_user=Error banning the user. Owners or Administratos cannot be banned.
muc.room.affiliations.error_adding_user=Error adding the user. Please verify the JID is correct.
muc.room.affiliations.user_added=User added successfully.
muc.room.affiliations.user_removed=User removed successfully.
muc.room.affiliations.permission=User Permissions
muc.room.affiliations.add_jid=Add User (JID):
muc.room.affiliations.owner=Owner
muc.room.affiliations.admin=Admin
muc.room.affiliations.member=Member
muc.room.affiliations.outcast=Outcast
muc.room.affiliations.user=User
muc.room.affiliations.delete=Delete
muc.room.affiliations.room_owner=Room Owners
muc.room.affiliations.no_users=No Users
muc.room.affiliations.click_delete=Click to delete...
muc.room.affiliations.confirm_removed=Are you sure you want to remove this user from the list?
muc.room.affiliations.room_admin=Room Admins
muc.room.affiliations.room_member=Room Members
muc.room.affiliations.room_outcast=Room Outcasts
#muc room delete Page
muc.room.delete.title=Destroy Room
muc.room.delete.info=Are you sure you want to destroy the room
muc.room.delete.detail=from the system? You may specify a reason for the room destruction and an alternative room address that will replace this room. This information will be sent to room occupants.
muc.room.delete.destructon_title=Destruction Details
muc.room.delete.room_id=Room ID:
muc.room.delete.reason=Reason:
muc.room.delete.alternate_address=Alternate Room Address:
#muc room edit form Page
muc.room.edit.form.title=Room Administration
muc.room.edit.form.edited=Room settings edited successfully.
muc.room.edit.form.created=Room creation was successfully.
muc.room.edit.form.info=Use the form below to edit the room settings.
muc.room.edit.form.room_id=Room ID
muc.room.edit.form.users=Users
muc.room.edit.form.on=Created On
muc.room.edit.form.modified=Last Modified
muc.room.edit.form.change_room=Change the room settings of this room using the form below
muc.room.edit.form.persistent_room=Use the form below to create a new persistent room. The new room will be immediately available.
muc.room.edit.form.error_created_id=Error creating the room. A room with the request ID already exists.
muc.room.edit.form.error_created_privileges=Error creating the room. You do not have enough privileges to create rooms.
muc.room.edit.form.valid_hint=Please enter a valid ID. Do not include the service name in the ID.
muc.room.edit.form.room_name=Room Name
muc.room.edit.form.valid_hint_name=Please enter a valid name.
muc.room.edit.form.description=Description
muc.room.edit.form.valid_hint_description=Please enter a valid description.
muc.room.edit.form.topic=Topic
muc.room.edit.form.valid_hint_subject=Please enter a valid subject.
muc.room.edit.form.max_room=Maximun Room Occupants
muc.room.edit.form.none=None
muc.room.edit.form.valid_hint_max_room=Please select the maximun room occupants.
muc.room.edit.form.broadcast=Roles for Which Presence is Broadcast
muc.room.edit.form.moderator=Moderator
muc.room.edit.form.participant=Participant
muc.room.edit.form.visitor=Visitor
muc.room.edit.form.required_password=Password required to enter
muc.room.edit.form.confirm_password=Confirm password
muc.room.edit.form.new_password=Please make sure to enter the same new password.
muc.room.edit.form.discover_jid=Role that May Discover Real JIDs of Occupants
muc.room.edit.form.anyone=Anyone
muc.room.edit.form.role=Please select a role.
muc.room.edit.form.room_options=Room Options
muc.room.edit.form.list_room=List Room in Directory
muc.room.edit.form.room_moderated=Make Room Moderated
muc.room.edit.form.moderated_member_only=Make Room Members-only
muc.room.edit.form.invite_other=Allow Occupants to invite Others
muc.room.edit.form.change_subject=Allow Occupants to change Subject
muc.room.edit.form.log=Log Room Conversations
#muc room summary Page
muc.room.summary.title=Group Chat Rooms
muc.room.summary.info=Below is an overview of the Group Chat Rooms in the system. From here you can view the rooms, edit their properties, and create new rooms.
muc.room.summary.destroyed=Room destroyed successfully.
muc.room.summary.total_room=Total Rooms
muc.room.summary.showing=Showing
muc.room.summary.sorted_id=Sorted by Room ID
muc.room.summary.page=Pages
muc.room.summary.room=Room
muc.room.summary.description=Description
muc.room.summary.persistent=Persistent
muc.room.summary.users=Users
muc.room.summary.edit=Edit
muc.room.summary.destroy=Destroy
muc.room.summary.no_room_in_group=No rooms in the Group Chat service.
muc.room.summary.alt_persistent=Room is persistent
muc.room.summary.alt_temporary=Room is temporary
muc.room.summary.click_edit=Click to edit...
muc.room.summary.click_delete=Click to delete...
#muc tasks Page
muc.tasks.title=Other Settings
muc.tasks.info=Use the forms below to configure settings for kicking idle users from group chat rooms and to configure the task that logs room conversations to the database.
muc.tasks.update=Idle user settings updated successfully.
muc.tasks.log=Conversation logging settings updated successfully.
muc.tasks.valid_idel_minutes=Please enter a valid number for max idle minutes.
muc.tasks.valid_frequency=Please enter a valid number for the frequency.
muc.tasks.valid_batch=Please enter a valid number for the batch size.
muc.tasks.user_setting=Idle User Settings
muc.tasks.never_kick=Never kick idle users.
muc.tasks.kick_user=Kick users after they have been idle for
muc.tasks.minutes=minutes.
muc.tasks.conversation.logging=Conversation Logging
muc.tasks.flush=Flush interval (seconds):
muc.tasks.batch=Batch size:
#offline messages Page
offline.messages.title=Offline Messages
offline.messages.update=Settings updated successfully.
offline.messages.info=XMPP provides the option for servers to store-and-forward IM messages when they are sent to a user that is not logged in. Supporting store-and-forward of 'offline messages' can be a very convenient feature of an XMPP deployment. However, offline messages, like email, can take up a significant amount of space on a server. There are several options for handling offline messages; select the policy that best suites your needs.
offline.messages.size=Current size of all offline message:
offline.messages.policy=Offline Message Policy
offline.messages.never_back=Never store offline messages and bounce messages back to the sender.
offline.messages.never_store=Never store offline messages and drop messages so the sender is not notified.
offline.messages.storage_messenger=Store offline messages for later retrieval. Messages will be delivered the next time the recipient logs in. Choose a storage policy and storage store max size below.
offline.messages.always_store=Always Store
offline.messages.always_store_info=Always store messages,even if the max storage size has been exceeded.
offline.messages.bounce=Store or Bounce
offline.messages.bounce_info=Store messages up to the max storage size. After the max size has been exceeded, bounce the message back to the sender.
offline.messages.drop=Store or Drop
offline.messages.drop_info=Store messages for a user up to the max storage size. After the max size has been exceeded, silently drop messages.
offline.messages.storage_limit=Per-user offline message storage limit:
#private data settings Page
private.data.settings.title=Private Data
private.data.settings.update=Settings updated successfully.
private.data.settings.info=Private data storage allows XMPP clients to store settings, bookmarks, etc. on the server. Users can log into their account and their settings will follow them around (as opposed to having the clients store the settings on the local computer where their settings will not follow them). You may enable or disable this feature.
private.data.settings.policy=Set Private Data Policy
private.data.settings.enable_storage=Enable Private Data Storage
private.data.settings.enable_storage_info=allow clients to store information on the server.
private.data.settings.disable_storage=Disable Private Data Storage
private.data.settings.disable_storage_info=do not allow server-side storage.
#reg settings Page
reg.settings.title=Registration Settings
reg.settings.info=Use the forms below to change various aspects of user registration and login.
reg.settings.update=Settings updated successfully.
reg.settings.inband_account=Inband Account Registration
reg.settings.inband_account_info=Inband account registration allows users to create accounts on the server automatically using most clients. It does not affect the ability to create new accounts through this web administration interface. Administrators may want to disable this option so users are required to register by other means (e.g. sending requests to the server administrator or through your own custom web interface).
reg.settings.enable=Enabled
reg.settings.auto_create_user=Users can automatically create new accounts.
reg.settings.disable=Disabled
reg.settings.not_auto_create=Users can not automatically create new accounts.
reg.settings.anonymous_login=Anonymous Login
reg.settings.anonymous_login_info=You can choose to enable or disable anonymous user login. If it is enabled, anyone can connect to the server and create a new session. If it is disabled only users who have accounts will be able to connect.
reg.settings.anyone_login=Anyone may login to the server.
reg.settings.only_registered_login=Only registered users may login.
#server db Page
server.db.title=Database Properties
server.db.info=Below is a list of properties for your database and the JDBC driver.
server.db.connect_info=Database Connection Info
server.db.version=Database and Version:
server.db.jdbc=JDBC Driver:
server.db.jdbc_driver=JDBC Driver Version:
server.db.connect_url=DB Connection URL:
server.db.user=DB User:
server.db.transaction=Transaction Support:
server.db.transaction_level=Transaction Isolation Level:
server.db.multiple_connect=Supports multiple connections
server.db.multiple_connect2=open at once:
server.db.read_only_mode=In read-only mode:
#server properties Page
server.properties.title=System Properties
server.properties.info=Below is a list of the system properties. Values for password sensitive fields are hidden. Long property names and values are clipped. Hold your mouse over the property name to see the full value or to see both the full name and value, click the edit icon next to the property.
server.properties.system=System Properties
server.properties.error=Error -- creating the property failed, see below.
server.properties.saved=Property saved successfully.
server.properties.deleted=Property deleted successfully.
server.properties.edit_property=Use the form below this table to edit the property value.
server.properties.error_deleting=Error deleting the property.
server.properties.no_property=No properties set.
server.properties.name=Property Name
server.properties.value=Property Value
server.properties.edit=Edit
server.properties.delete=Delete
server.properties.alt_edit=Click to edit this property
server.properties.alt_delete=Click to delete this property
server.properties.edit_property_title=Edit property
server.properties.new_property=Add new property
server.properties.enter_property_name=Please enter a property name.
server.properties.enter_property_value=Please enter a property value.
server.properties.max_character=1000 character max.
#server props Page
server.props.title=Edit Server Properties
server.props.info=Use the form below to edit server properties.
server.props.update=Server properties updated successfully. You'll need to
server.props.update2=the server to have the changes take effect (see
server.props.property=Server Properties
server.props.name=Server Name:
server.props.valid_hostname=Please enter a valid server host name or
server.props.valid_hostname1=restore the default
server.props.port=Port:
server.props.valid_port=Please enter a valid port number or
server.props.valid_port1=restore the default
server.props.error_port=Error -- this port and the SSL port can not be equal.
server.props.ssl=SSL Enabled:
server.props.enable=Enabled
server.props.disable=Disabled
server.props.ssl_valid=Please enter a valid SSL port number or
server.props.ssl_valid1=restore the default
server.props.admin_port= Admin Console Port:
#server stopped Page
server.stopped.title_restarting=Restarting Server
server.stopped.title_stopped=Server stopped
server.stopped.admin_console=Admin Console
server.stopped.restarted=The server is being restarted.To continue:
server.stopped.wait_time=Wait a few seconds until the server has been restarted.
server.stopped.login_console=Login to the admin console
server.stopped.stop=The server is being stopped.To continue:
server.stopped.wait_restarted=Wait a few seconds and then
server.stopped.wait_restarted2=the server.
#session conflict Page
session.conflict.title=Conflict Policy
session.conflict.update=Settings updated successfully.
session.conflict.info=XMPP allows multiple logins to the same user account by assigning a unique "resource name" to each connection. If a connection requests a resource name that is already in use, the server must decide how to handle the conflict. The options on this page allow you to determine if the server always kicks off existing connections, never kicks off existing connections, or sets the number of login attempts that should be rejected before kicking off an existing connection. The last option allows users to receive an error when logging in that allows them to request a different resource name.
session.conflict.policy=Set Conflict Policy
session.conflict.always_kick=Always kick
session.conflict.always_kick_info=If there is a resource conflict,immediately kick the other resource.
session.conflict.never_kick=Never kick
session.conflict.never_kick_info=If there is a resource conflict, don't allow the new resource to log in.
session.conflict.allow_one=Allow one login attempt
session.conflict.resource_conflict=If there is a resource conflict,report an error one time but don't kick the existing connection.
session.conflict.kick_value=Assign kick value
session.conflict.kick_value_info=Specify the number of login attempts allowed before conflicting resources are kicked. You must specify a number greater than one.
session.conflict.enter_value=Please enter a value greater than 1.
#session details Page
session.details.title=Session Details
session.details.info=Below are session details for the session
session.details.info1=If the user
session.details.info2=has multiple sessions open, they will appear below.
session.details.session_id=Session ID:
session.details.username=User Name &amp; Resource:
session.details.anonymous=Anonymous
session.details.status=Status
session.details.close=Closed
session.details.connect=Connected
session.details.streaming=Streaming
session.details.authenticated=Authenticated
session.details.unknown=Unknown
session.details.presence=Presence
session.details.away=Away
session.details.chat_available=Available to Chat
session.details.not_disturb=Do Not Disturb
session.details.online=Online
session.details.extended=Extended Away
session.details.unknown=Unknown/Not Recognized
session.details.session_created=Session Created:
session.details.last_active=Session Last Active:
session.details.statistics=Session Statistics:
session.details.received=Packets Received/Sent:
session.details.hostname=Client IP / Hostname:
session.details.multiple_session=Multiple User Sessions
session.details.name=Name
session.details.resource=Resource
session.details.if_presence=Presence (if authenticated)
session.details.clientip=Client IP
session.details.close_connect=Close Connection
session.details.session_detail=Current session details above.
#session filter Page
session.filter.title=Filter Session Summary by User
session.filter.info=To filter the list of sessions by user, select the user from the list below or enter their username in the box below.
session.filter.enter_username=Please enter a valid username or choose a username from the list.
session.filter.specify_username=Specify username:
session.filter.choose_user=Choose user:
#session row Page
session.row.cliked=Click for more info...
session.row.cliked_ssl=User is connected via SSL
session.row.cliked_kill_session=Click to kill session...
session.row.confirm_close=Are you sure you want to close this connection?
#session summary Page
session.summary.title=Session Summary
session.summary.close=Session closed successfully.
session.summary.active=Active Sessions
session.summary.showing=Showing
session.summary.page=Pages
session.summary.info=Below is a list of sessions on this server.
session.summary.not_session=No Sessions
session.summary.last_update=List last updated
#setup admin settings Page
setup.admin.settings.account=Administrator Account
setup.admin.settings.info=Enter settings for the system administrator account (username of "admin") below. It is important to choose a password for the account that cannot be easily guessed -- for example, at least six characters long and containing a mix of letters and numbers. You can skip this step if you have already setup your admin account (not for first time users).
setup.admin.settings.error=There were errors when updating the admin account. Please see below.
setup.admin.settings.install=If this is a new
setup.admin.settings.install1=installation, the current password will be
setup.admin.settings.install2=admin
setup.admin.settings.password=Please enter the correct current password.
setup.admin.settings.email=Admin Email Address:
setup.admin.settings.valid_email=A valid email address for the admin account.
setup.admin.settings.enter_email=Please enter a valid email address.
setup.admin.settings.new_password=New Password:
setup.admin.settings.valid_new_password=Please enter a valid new password.
setup.admin.settings.not_new_password=The new passwords do not match.
setup.admin.settings.confirm_password=Confirm Password:
setup.admin.settings.valid_confirm=Please enter a valid new confirmation password.
#setup completed Page
setup.completed.setup=Setup
setup.completed.jive=Jive Software
setup.completed.run=Setup Already Run
setup.completed.run_info=It appears setup has already been run. To administer your community, please use the
setup.completed.run_info1=Admin Tool
setup.completed.run_info2=To re-run setup, you need to stop your appserver, delete the "setup" property from the jive-messenger.xml file, restart Messenger then reload the setup tool.
#setup datasource jndi Page
setup.datasource.jndi.setting=Datasource Settings - JNDI Connection
setup.datasource.jndi.setting_info=Choose a JNDI datasource below to connect to the
setup.datasource.jndi.setting_info1=database. The name varies between application servers, but it is generally of the form:
setup.datasource.jndi.setting_info2=Please consult your application server's documentation for more information.
setup.datasource.jndi.name=JNDI Datasource Name:
setup.datasource.jndi.custom=Custom:
setup.datasource.jndi.valid_name=Please enter a valid JNDI name.
setup.datasource.jndi.note=Note, it might take between 30-60 seconds to connect to your database.
#setup datasource settings Page
setup.datasource.settings.title=Datasource Settings
setup.datasource.settings.info=Choose how you would like to connect to the
setup.datasource.settings.info1=database.
setup.datasource.settings.connect=Standard Database Connection
setup.datasource.settings.connect_info=Use an external database with the built-in connection pool.
setup.datasource.settings.jndi=JNDI Datasource
setup.datasource.settings.jndi_info=Use a datasource defined by your application server via JNDI.
setup.datasource.settings.embedded=Embedded Database
setup.datasource.settings.embedded_info=Use an embedded database, powered by HSQLDB. This option requires no external database configuration and is an easy way to get running quickly. However, this is not recommended for large installations.
#setup datasource standard Page
setup.datasource.standard.title=Datasource Settings - Standard Connection
setup.datasource.standard.info=Specify a JDBC driver and connection properties to connect to your database. If you need more information about this process please see the database documentation distributed with setup.datasource.standard.note=
setup.datasource.standard.info2=Note:
setup.datasource.standard.info3=Database scripts for most popular databases are included in the Jive Messenger distribution at
setup.datasource.standard.failed_connect=Failed to establish a database connection - please see specific errors listed below.
setup.datasource.standard.pick_database=Pick Database...
setup.datasource.standard.jdbc=JDBC Driver Class:
setup.datasource.standard.jdbc_info=The valid classname of your JDBC driver, ie: com.mydatabase.driver.MyDriver.
setup.datasource.standard.url=Database URL:
setup.datasource.standard.valid_url=The valid URL used to connect to your database, ie: jdbc:mysql://host:port/database
setup.datasource.standard.username=Username:
setup.datasource.standard.username_info=The user used to connect to your database - note, this may not be required and can be left blank.
setup.datasource.standard.password=Password:
setup.datasource.standard.password_info=The password for the user account used for this database - note, this may not be required and can be left blank.
setup.datasource.standard.connect=Connections:
setup.datasource.standard.min=Minimum:
setup.datasource.standard.max=Maximum:
setup.datasource.standard.pool=The minimum and maximum number of database connections the connection pool should maintain.
setup.datasource.standard.timeout=Connection Timeout:
setup.datasource.standard.timeout_info=The time (in days) before connections in the connection pool are recycled.
setup.datasource.standard.note=Note, it might take between 30-60 seconds to connect to your database.
#setup env check Page
setup.env.check.setup=Setup
setup.env.check.error=Error: Can not proceed with
setup.env.check.error_info=Your current installation fails to meet minimum
setup.env.check.error_info1=requirements - please see the checklist below:
setup.env.check.jdk=At least JDK 1.5
setup.env.check.servlet=Servlet 2.2 Support
setup.env.check.jsp=JSP 1.1 Support
setup.env.check.class=Classes
setup.env.check.jive=Jive Home Directory
setup.env.check.not_home=Messenger Home Directory - Not Set
setup.env.check.doc=Please read the installation documentation and try setting up your environment again. After making changes, restart your appserver and load this page again.
#setup finished Page
setup.finished.title=Setup Complete!
setup.finished.info=This installation of
setup.finished.info1=is now complete.To continue:
setup.finished.restart=Please
setup.finished.restart2=the server.
setup.finished.login=Login to the admin console
#setup host settings Page
setup.host.settings.title=Server Settings
setup.host.settings.info=Below are host settings for this server. Note: the suggested value for the domain is based on the network settings of this machine.
setup.host.settings.domain=Domain:
setup.host.settings.invalid_domain=Invalid domain.
setup.host.settings.hostname=Hostname or IP address of this server.
setup.host.settings.port=Admin Console Port:
setup.host.settings.invalid_port=Invalid port number.
setup.host.settings.port_number=Port number for the web-based admin console (default is 9090).
setup.host.settings.ssl=SSL Connections Enabled:
setup.host.settings.yes=Yes
setup.host.settings.no=No
setup.host.settings.secure=Enables or disables secure XMPP connections.
#setup index Page
setup.index.title=Setup Checklist
setup.index.info=Welcome to
setup.index.info1=Setup. This tool will lead you through the initial setup or upgrade process. Before continuing, verify that your environment meets all the requirements below.
setup.index.success=Success
setup.index.error=Error
setup.index.vm=Java VM Support
setup.index.jdk=At least JDK 1.5
setup.index.found=Found: JVM
setup.index.class=Classes
setup.index.con_file=Configuration Files
setup.index.dir=conf Directory
setup.index.valid_conf=Valid conf directory.
setup.index.unable_locate_dir=Unable to locate valid conf directory. Please refer to the installation documentation for the correct way to set the conf directory.
setup.index.not_permission=Setup was able to find your conf directory but does not have read permission on it. Please alter the directory permissions.
setup.index.not_write_permission=Setup was able to find your conf directory but does not have write permission on it. Please alter the directory permissions.
#setup pause Page
setup.pause.title=Please restart your server and close this window. Launch the admin using either the launcher or start as a service to enter the admin tool.
setup.pause.close=Close Window
#setup sidebar Page
setup.sidebar.title=Setup Progress
#ssl-settings Page
ssl.settings.title=SSL Security Settings
ssl.settings.update=Settings updated successfully.
ssl.settings.uninstalled=Certificate uninstalled successfully.
ssl.settings.error=Error uninstalling the certificate.
ssl.settings.error_messenge=Error message
ssl.settings.error_certificate=Error installing the certificate, please see the form below.
ssl.settings.info=SSL/TLS allows secure connections to be made between the server and clients. This page displays installed certificates. Use the form at the bottom of the page to install a new certificate.
ssl.settings.certificate=Installed Certificates
ssl.settings.alias=Alias (host)
ssl.settings.type=Certificate Type
ssl.settings.uninstall=Uninstall
ssl.settings.click_uninstall=Click to uninstall...
ssl.settings.confirm_uninstall=Are you sure you want to uninstall this certificate?
ssl.settings.key=Public Key:
ssl.settings.no_installed=No certificates installed. Use the form below to install one.
ssl.settings.install_certificate=Install Certificate
ssl.settings.install_certificate_info=New X.509 certificates can be added to the system by pasting in the certificate data sent to you by a Certificate Authority (e.g. Verisign) or you can generate your own self-signed certificates.
ssl.settings.enter_alias=Please enter a valid alias.
ssl.settings.enter_certificate=Please enter a valid certificate.
ssl.settings.error_installing=Error installing the certificate.
ssl.settings.error_reported=Error reported
ssl.settings.server=Server Certificate
ssl.settings.client=Client Certificate
ssl.settings.a_certificate=Certificate
ssl.settings.paste_certificate=Paste in the certificate sent to you by the CA or the self-signed certificate generated via the keytool.
#user create Page
user.create.title=Create User
user.create.info=Use the form below to create a new user.
user.create.error_creating_account=Error creating the user account. Please check your error logs.
user.create.invalid_username=Invalid username.
user.create.user_exist=Username already exists - please choose a different one.
user.create.invalid_name=Invalid name.
user.create.invalid_email=Invalid email.
user.create.invalid_password=Invalid password.
user.create.invalid_match_password=Passwords don't match.
user.create.invalid_password_confirm=Invalid password confirmation.
user.create.created_success=New user created successfully.
user.create.new_user=Create New User
user.create.username=Username
user.create.name=Name
user.create.email=Email
user.create.pwd=Password
user.create.confirm_pwd=Confirm Password
user.create.requied=Required fields
#user delete Page
user.delete.title=Delete User
user.delete.info=Are you sure you want to delete the user
user.delete.info1=from the system?
user.delete.warning=Warning! You are about to delete your
user.delete.warning2=own
user.delete.warning3=user account. Are you sure you want to do this? Doing so will log you out of the system immediately.
#user edit form Page
user.edit.form.title=Edit User
user.edit.form.update=User edited successfully.
user.edit.form.info=Use the form below to edit user properties.
user.edit.form.property=User Properties
user.edit.form.enter_name=Please enter a valid name.
user.edit.form.enter_mail=Please enter a valid email address.
#user message Page
user.message.title=Send Administrative Message
user.message.send=Message sent successfully.
user.message.send_admin_msg=Send Administrative Message
user.message.info=Use the form below to send an administrative message to all users.
user.message.specified_user_info=User the form below to send an administrative message to the specified user. If the user is connected from multiple sessions you will need to choose which session to message.
user.message.to=To
user.message.all_online_user=All Online Users
user.message.send_session=Send to all user sessions
user.message.valid_address=Please choose a valid address.
user.message.message=Message
user.message.valid_message=Please enter a valid message.
#user password Page
user.password.title=Change Password
user.password.error_set_pwd=Error setting the password. Please make sure the password you enter is valid and matches the confirmation password.
user.password.update=Password updated successfully.
user.password.info=Use the form below to change the user's password.
user.password.change=Change Password
user.password.new_pwd=New Password
user.password.confirm_new_pwd=Confirm New Password
#user properties Page
user.properties.title=User Properties
user.properties.info=Below is a summary of user properties. To edit properties, click the "Edit" button below.
user.properties.created=New user created successfully.
user.properties.update=User properties updated successfully.
user.properties.available=Available
user.properties.offline=Offline
user.properties.not_set=Not set.
user.properties.registered=Registered
#user search Page
user.search.title=User Search
user.search.not_found=User not found. Please try a different search.
user.search.search_user=Search For User
#User Summary Page
User.Summary.title=User Summary
User.Summary.info=Below is a list of users in the system.
User.Summary.deleted=User deleted successfully.
User.Summary.total_user=Total Users
User.Summary.showing=Showing
User.Summary.sorted=Sorted by Username
User.Summary.pages=Pages
User.Summary.created=Created
User.Summary.edit=Edit
User.Summary.delete=Delete
User.Summary.not_user=No users in the system.
User.Summary.click_edit=Click to edit...
User.Summary.click_delete=Click to delete...
#user tabs Page
user.tabs.properties=User Properties
user.tabs.edit=Edit User
user.tabs.send=Send Message
user.tabs.change_pwd=Change Password
user.tabs.delete_user=Delete User
\ No newline at end of file
src/web/audit-policy.jsp
View file @ 4e6e9efa
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Audit Policy"; String title = LocaleUtils.getLocalizedString("audit.policy.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "audit-policy.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "audit-policy.jsp"));
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Settings updated successfully. <fmt:message key="audit.policy.settings.saved_successfully" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -112,18 +112,13 @@ ...@@ -112,18 +112,13 @@
<p> <p>
<fmt:message key="title" /> <fmt:message key="title" />
can audit XMPP traffic on the server and save <fmt:message key="audit.policy.title_info" />
the data to XML data files. The amount of data sent via an XMPP server can be substantial.
Messenger provides several settings to control whether to audit packets, how
audit files are created, and the types of packets to save. In most cases, logging
Message packets will provide all of the data an enterprise requires. Presence
and IQ packets are primarily useful for tracing and troubleshooting XMPP deployments.
</p> </p>
<form action="audit-policy.jsp"> <form action="audit-policy.jsp">
<fieldset> <fieldset>
<legend>Set Message Audit Policy</legend> <legend><fmt:message key="audit.policy.policytitle" /></legend>
<div> <div>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
...@@ -134,7 +129,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -134,7 +129,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb01"> <label for="rb01">
<b>Disable Message Auditing</b> -- packets are not logged. <b><fmt:message key="audit.policy.label_disable_auditing" /></b> <fmt:message key="audit.policy.label_disable_auditing_info" />
</label> </label>
</td> </td>
</tr> </tr>
...@@ -145,7 +140,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -145,7 +140,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb02"> <label for="rb02">
<b>Enable Message Auditing</b> -- packets are logged with the following options: <b><fmt:message key="audit.policy.label_enable_auditing" /></b> <fmt:message key="audit.policy.label_enable_auditing_info" />
</label> </label>
</td> </td>
</tr> </tr>
...@@ -157,7 +152,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -157,7 +152,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap class="c1"> <td width="1%" nowrap class="c1">
Maximum file size (MB): <fmt:message key="audit.policy.maxfile_size" />
</td> </td>
<td width="99%"> <td width="99%">
<input type="text" size="15" maxlength="50" name="maxSize" <input type="text" size="15" maxlength="50" name="maxSize"
...@@ -166,7 +161,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -166,7 +161,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
<% if (errors.get("maxSize") != null) { %> <% if (errors.get("maxSize") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
Please enter a valid number. <fmt:message key="audit.policy.validnumber" />
</span> </span>
<% } %> <% } %>
...@@ -175,7 +170,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -175,7 +170,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap class="c1"> <td width="1%" nowrap class="c1">
Maximum number of files: <fmt:message key="audit.policy.maxfile_number" />
</td> </td>
<td width="99%"> <td width="99%">
<input type="text" size="15" maxlength="50" name="maxCount" <input type="text" size="15" maxlength="50" name="maxCount"
...@@ -184,7 +179,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -184,7 +179,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
<% if (errors.get("maxCount") != null) { %> <% if (errors.get("maxCount") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
Please enter a valid number. <fmt:message key="audit.policy.validnumber" />
</span> </span>
<% } %> <% } %>
...@@ -193,7 +188,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -193,7 +188,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap class="c1"> <td width="1%" nowrap class="c1">
Flush Interval (seconds): <fmt:message key="audit.policy.flush_interval" />
</td> </td>
<td width="99%"> <td width="99%">
<input type="text" size="15" maxlength="50" name="logTimeout" <input type="text" size="15" maxlength="50" name="logTimeout"
...@@ -202,7 +197,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -202,7 +197,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
<% if (errors.get("logTimeout") != null) { %> <% if (errors.get("logTimeout") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
Please enter a valid number. <fmt:message key="audit.policy.validnumber" />
</span> </span>
<% } %> <% } %>
...@@ -211,7 +206,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -211,7 +206,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap class="c1"> <td width="1%" nowrap class="c1">
Packets to audit: <fmt:message key="audit.policy.packet_audit" />
</td> </td>
<td width="99%"> <td width="99%">
...@@ -224,7 +219,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -224,7 +219,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
</td> </td>
<td width="99%"> <td width="99%">
<label for="cb01"> <label for="cb01">
<b>Audit Message Packets</b> <b><fmt:message key="audit.policy.label_audit_messenge_packets" /></b>
</label> </label>
</td> </td>
</tr> </tr>
...@@ -236,7 +231,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -236,7 +231,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
</td> </td>
<td width="99%"> <td width="99%">
<label for="cb02"> <label for="cb02">
<b>Audit Presence Packets</b> <b><fmt:message key="audit.policy.label_audit_presence_packets" /></b>
</label> </label>
</td> </td>
</tr> </tr>
...@@ -248,7 +243,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -248,7 +243,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
</td> </td>
<td width="99%"> <td width="99%">
<label for="cb03"> <label for="cb03">
<b>Audit IQ Packets</b> <b><fmt:message key="audit.policy.label_audit_iq_packets" /></b>
</label> </label>
</td> </td>
</tr> </tr>
...@@ -263,7 +258,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym ...@@ -263,7 +258,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
<table border="0"> <table border="0">
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap class="c1"> <td width="1%" nowrap class="c1">
Queued packets: <fmt:message key="audit.policy.queued_packets" />
</td> </td>
<td width="99%"> <td width="99%">
<%= auditManager.getAuditor().getQueuedPacketsNumber() %> <%= auditManager.getAuditor().getQueuedPacketsNumber() %>
......
src/web/chatroom-history-settings.jsp
View file @ 4e6e9efa
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Chat Room History Settings"; String title = LocaleUtils.getLocalizedString("chatroom.history.settings.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "chatroom-history-settings.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "chatroom-history-settings.jsp"));
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Settings updated successfully. <fmt:message key="chatroom.history.settings.saved_successfully" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -103,15 +103,14 @@ ...@@ -103,15 +103,14 @@
%> %>
<p> <p>
Chatrooms can replay conversation histories to provide context to new members joining a room. <fmt:message key="chatroom.history.settings.info_response1" />
<fmt:message key="short.title" /> provides several options for controlling how <fmt:message key="short.title" /> <fmt:message key="chatroom.history.settings.info_response2" />
much history to store for each room.
</p> </p>
<form action="chatroom-history-settings.jsp" method="post"> <form action="chatroom-history-settings.jsp" method="post">
<fieldset> <fieldset>
<legend>Set Chatroom History Policy</legend> <legend><fmt:message key="chatroom.history.settings.policy" /></legend>
<div> <div>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
...@@ -121,8 +120,8 @@ much history to store for each room. ...@@ -121,8 +120,8 @@ much history to store for each room.
<%= ((policy==NONE) ? "checked" : "") %>> <%= ((policy==NONE) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb01"><b>Don't Show History</b></label> - Do not show the entire chat <label for="rb01"><b><fmt:message key="chatroom.history.settings.label_show_title" /></b>
history. </label><fmt:message key="chatroom.history.settings.label_show_content" />
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
...@@ -131,8 +130,8 @@ much history to store for each room. ...@@ -131,8 +130,8 @@ much history to store for each room.
<%= ((policy==ALL) ? "checked" : "") %>> <%= ((policy==ALL) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb02"><b>Show Entire Chat History</b></label> - Show the entire chat history <label for="rb02"><b><fmt:message key="chatroom.history.settings.label_show_Entire_title" /></b></label>
to the user. <fmt:message key="chatroom.history.settings.label_show_Entire_content" />
</td> </td>
</tr> </tr>
<tr valign="top" class=""> <tr valign="top" class="">
...@@ -141,9 +140,8 @@ much history to store for each room. ...@@ -141,9 +140,8 @@ much history to store for each room.
<%= ((policy==NUMBER) ? "checked" : "") %>> <%= ((policy==NUMBER) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb03"><b>Show a Specific Number of Messages</b></label> - Show a specific <label for="rb03"><b><fmt:message key="chatroom.history.settings.label_show_message_number_title" /></b></label> -
number of the most recent messages in the chat. Use the box below to specify <fmt:message key="chatroom.history.settings.label_show_message_number_content" />
that number.
</tr> </tr>
<tr valign="top" class=""> <tr valign="top" class="">
<td width="1%" nowrap> <td width="1%" nowrap>
......
src/web/error-serverdown.jsp
View file @ 4e6e9efa
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
- $Revision$ - $Revision$
- $Date$ - $Date$
--%> --%>
<%@ page import="org.jivesoftware.admin.AdminConsole"%> <%@ page import="org.jivesoftware.admin.AdminConsole,
org.jivesoftware.util.LocaleUtils"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
...@@ -17,14 +18,14 @@ ...@@ -17,14 +18,14 @@
<% String path = request.getContextPath(); <% String path = request.getContextPath();
// Title of this page // Title of this page
String title = AdminConsole.getAppName() + " Server Down"; String title = AdminConsole.getAppName() + " " +LocaleUtils.getLocalizedString("error.serverdown.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
%> %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html> <html>
<head> <head>
<title><%= AdminConsole.getAppName() %> Admin Console<%= (pageinfo.getTitle() != null ? (": "+pageinfo.getTitle()) : "") %></title> <title><%= AdminConsole.getAppName() %> <fmt:message key="error.serverdown.admin_console" /><%= (pageinfo.getTitle() != null ? (": "+pageinfo.getTitle()) : "") %></title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link rel="stylesheet" type="text/css" href="<%= path %>/style/global.css"> <link rel="stylesheet" type="text/css" href="<%= path %>/style/global.css">
</head> </head>
...@@ -36,7 +37,7 @@ ...@@ -36,7 +37,7 @@
<tbody> <tbody>
<tr> <tr>
<td> <td>
<img src="<%= path %>/<%= AdminConsole.getLogoImage() %>" border="0" alt="<%= AdminConsole.getAppName() %> Admin Console"> <img src="<%= path %>/<%= AdminConsole.getLogoImage() %>" border="0" alt="<%= AdminConsole.getAppName() %> <fmt:message key="error.serverdown.admin_console" />">
</td> </td>
<td align="right"> <td align="right">
<table cellpadding="0" cellspacing="0" border="0"> <table cellpadding="0" cellspacing="0" border="0">
...@@ -67,16 +68,15 @@ ...@@ -67,16 +68,15 @@
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<p> <p>
<%= AdminConsole.getAppName() %> is currently down. <%= AdminConsole.getAppName() %> <fmt:message key="error.serverdown.is_down" />
To continue:
</p> </p>
<ol> <ol>
<li> <li>
Start the server. <fmt:message key="error.serverdown.start" />
</li> </li>
<li> <li>
<a href="index.jsp">Login to the admin console</a>. <a href="index.jsp"><fmt:message key="error.serverdown.login" /></a>.
</li> </li>
</ol> </ol>
......
src/web/error.jsp
View file @ 4e6e9efa
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
org.jivesoftware.messenger.group.GroupNotFoundException" org.jivesoftware.messenger.group.GroupNotFoundException"
isErrorPage="true" isErrorPage="true"
%> %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<% boolean debug = "true".equals(JiveGlobals.getProperty("skin.default.debug")); <% boolean debug = "true".equals(JiveGlobals.getProperty("skin.default.debug"));
if (debug) { if (debug) {
exception.printStackTrace(); exception.printStackTrace();
...@@ -22,24 +22,24 @@ ...@@ -22,24 +22,24 @@
<% if (exception instanceof UnauthorizedException) { %> <% if (exception instanceof UnauthorizedException) { %>
<p> <p>
You don't have admin privileges to perform this operation. <fmt:message key="error.admin_privileges" />
</p> </p>
<% } else if (exception instanceof UserNotFoundException) { <% } else if (exception instanceof UserNotFoundException) {
String username = ParamUtils.getParameter(request,"username"); String username = ParamUtils.getParameter(request,"username");
%> %>
<p> <p>
The requested user <fmt:message key="error.requested_user" />
<% if (username != null) { %> <% if (username != null) { %>
(username: <%= username %>) (<fmt:message key="error.username" /><%= username %>)
<% } %> <% } %>
was not found. <fmt:message key="error.not_found" />
</p> </p>
<% } else if (exception instanceof GroupNotFoundException) { %> <% } else if (exception instanceof GroupNotFoundException) { %>
<p> <p>
The requested group was not found. <fmt:message key="error.not_found_group" />
</p> </p>
<% } %> <% } %>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
PrintWriter pout = new PrintWriter(sout); PrintWriter pout = new PrintWriter(sout);
exception.printStackTrace(pout); exception.printStackTrace(pout);
%> %>
Exception: <fmt:message key="error.exception" />
<pre> <pre>
<%= sout.toString() %> <%= sout.toString() %>
</pre> </pre>
......
src/web/group-create.jsp
View file @ 4e6e9efa
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<jsp:useBean id="errors" class="java.util.HashMap" /> <jsp:useBean id="errors" class="java.util.HashMap" />
...@@ -130,7 +131,7 @@ ...@@ -130,7 +131,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean"/> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean"/>
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Create Group"; String title = LocaleUtils.getLocalizedString("group.create.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-create.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-create.jsp"));
...@@ -153,7 +154,7 @@ ...@@ -153,7 +154,7 @@
<img src="images/success-16x16.gif" width="16" height="16" border="0"> <img src="images/success-16x16.gif" width="16" height="16" border="0">
</td> </td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Error creating the group. Please check your error logs. <fmt:message key="group.create.error" />
</td> </td>
</tr> </tr>
</tbody> </tbody>
...@@ -163,19 +164,19 @@ ...@@ -163,19 +164,19 @@
<% } %> <% } %>
<p> <p>
Use the form below to create a group. <fmt:message key="group.create.form" />
</p> </p>
<form name="f" action="group-create.jsp" method="post"> <form name="f" action="group-create.jsp" method="post">
<fieldset> <fieldset>
<legend>Create New Group</legend> <legend><fmt:message key="group.create.new_group_title" /></legend>
<div> <div>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
<label for="gname">Group Name:</label> * <label for="gname"><fmt:message key="group.create.group_name" /></label> *
</td> </td>
<td width="99%"> <td width="99%">
<input type="text" name="name" size="30" maxlength="75" <input type="text" name="name" size="30" maxlength="75"
...@@ -189,9 +190,9 @@ Use the form below to create a group. ...@@ -189,9 +190,9 @@ Use the form below to create a group.
<td width="1%" nowrap>&nbsp;</td> <td width="1%" nowrap>&nbsp;</td>
<td width="99%"> <td width="99%">
<% if (errors.get("name") != null) { %> <% if (errors.get("name") != null) { %>
<span class="jive-error-text">Invalid group name.</span> <span class="jive-error-text"><fmt:message key="group.create.invalid_group_name" /></span>
<% } else if (errors.get("groupAlreadyExists") != null) { %> <% } else if (errors.get("groupAlreadyExists") != null) { %>
<span class="jive-error-text">Group already exists - please choose a different name.</span> <span class="jive-error-text"><fmt:message key="group.create.invalid_group_info" /></span>
<% } %> <% } %>
</td> </td>
</tr> </tr>
...@@ -200,7 +201,7 @@ Use the form below to create a group. ...@@ -200,7 +201,7 @@ Use the form below to create a group.
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
<label for="gdesc">Description:</label> <label for="gdesc"><fmt:message key="group.create.label_description" /></label>
</td> </td>
<td width="99%"> <td width="99%">
<textarea name="description" cols="30" rows="3" id="gdesc" <textarea name="description" cols="30" rows="3" id="gdesc"
...@@ -215,7 +216,7 @@ Use the form below to create a group. ...@@ -215,7 +216,7 @@ Use the form below to create a group.
&nbsp; &nbsp;
</td> </td>
<td width="99%"> <td width="99%">
<span class="jive-error-text">Invalid description.</span> <span class="jive-error-text"><fmt:message key="group.create.invalid_description" /></span>
</td> </td>
</tr> </tr>
...@@ -223,7 +224,7 @@ Use the form below to create a group. ...@@ -223,7 +224,7 @@ Use the form below to create a group.
<tr> <tr>
<td nowrap width="1%" valign="top"> <td nowrap width="1%" valign="top">
Initial Member(s): <fmt:message key="group.create.label_initial_member" />
</td> </td>
<td nowrap class="c1" align="left"> <td nowrap class="c1" align="left">
<textarea name="users" cols="30" rows="3" id="gdesc" <textarea name="users" cols="30" rows="3" id="gdesc"
...@@ -233,11 +234,10 @@ Use the form below to create a group. ...@@ -233,11 +234,10 @@ Use the form below to create a group.
</table> </table>
<br> <br>
<p><b>Shared Roster Groups</b></p> <p><b><fmt:message key="group.create.share_groups_title" /></b></p>
<p> <p>
You can use the form below to show this group in users' rosters. Select from one of three <fmt:message key="group.create.share_groups_info" />
options for who should see this group in their rosters.
</p> </p>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
...@@ -247,7 +247,7 @@ Use the form below to create a group. ...@@ -247,7 +247,7 @@ Use the form below to create a group.
<input type="radio" name="enableRosterGroups" value="false" id="rb201" <%= !enableRosterGroups ? "checked" : "" %>> <input type="radio" name="enableRosterGroups" value="false" id="rb201" <%= !enableRosterGroups ? "checked" : "" %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb201">Disable sharing group in rosters</label> <label for="rb201"><fmt:message key="group.create.disable_share_group" /></label>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -255,7 +255,7 @@ Use the form below to create a group. ...@@ -255,7 +255,7 @@ Use the form below to create a group.
<input type="radio" name="enableRosterGroups" value="true" id="rb202" <%= enableRosterGroups ? "checked" : "" %>> <input type="radio" name="enableRosterGroups" value="true" id="rb202" <%= enableRosterGroups ? "checked" : "" %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb202">Enable sharing group in rosters</label> <label for="rb202"><fmt:message key="group.create.enable_share_group" /></label>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -268,7 +268,7 @@ Use the form below to create a group. ...@@ -268,7 +268,7 @@ Use the form below to create a group.
<tbody> <tbody>
<tr> <tr>
<td width="1%" nowrap> <td width="1%" nowrap>
Group Display Name <fmt:message key="group.create.group_display_name" />
</td> </td>
<td width="99%"> <td width="99%">
<input type="text" name="groupDisplayName" size="30" maxlength="100" value="<%= (groupDisplayName != null ? groupDisplayName : "") %>" <input type="text" name="groupDisplayName" size="30" maxlength="100" value="<%= (groupDisplayName != null ? groupDisplayName : "") %>"
...@@ -276,7 +276,7 @@ Use the form below to create a group. ...@@ -276,7 +276,7 @@ Use the form below to create a group.
<% if (errors.get("groupDisplayName") != null) { %> <% if (errors.get("groupDisplayName") != null) { %>
<span class="jive-error-text">Enter a Group Display Name.</span> <span class="jive-error-text"><fmt:message key="group.create.enter_a_group_name" /></span>
<% } %> <% } %>
</td> </td>
...@@ -293,8 +293,7 @@ Use the form below to create a group. ...@@ -293,8 +293,7 @@ Use the form below to create a group.
<%= ("everybody".equals(showGroup) ? "checked" : "") %>> <%= ("everybody".equals(showGroup) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb002" <label for="rb002"><fmt:message key="group.create.show_group_in_all_users" /></label>
>Show group in all users' rosters.</label>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -304,8 +303,7 @@ Use the form below to create a group. ...@@ -304,8 +303,7 @@ Use the form below to create a group.
<%= ("onlyGroup".equals(showGroup) && (groupNames == null || groupNames.length == 0) ? "checked" : "") %>> <%= ("onlyGroup".equals(showGroup) && (groupNames == null || groupNames.length == 0) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb001" <label for="rb001"><fmt:message key="group.create.show_group_in_group_members" /></label>
>Show group in group members' rosters</label>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -315,8 +313,7 @@ Use the form below to create a group. ...@@ -315,8 +313,7 @@ Use the form below to create a group.
<%= (groupNames != null && groupNames.length > 0) ? "checked" : "" %>> <%= (groupNames != null && groupNames.length > 0) ? "checked" : "" %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb003" <label for="rb003"><fmt:message key="group.create.show_group_in_roster_group" /></label>
>Show group to members' rosters of these groups:</label>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -347,7 +344,7 @@ Use the form below to create a group. ...@@ -347,7 +344,7 @@ Use the form below to create a group.
</table> </table>
<br> <br>
<span class="jive-description">* Required fields </span> <span class="jive-description">* <fmt:message key="group.create.required_fields" /> </span>
</div> </div>
</fieldset> </fieldset>
......
src/web/group-delete.jsp
View file @ 4e6e9efa
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
...@@ -47,7 +48,7 @@ ...@@ -47,7 +48,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Delete Group"; String title = LocaleUtils.getLocalizedString("group.delete.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-delete.jsp?group="+URLEncoder.encode(groupName, "UTF-8"))); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-delete.jsp?group="+URLEncoder.encode(groupName, "UTF-8")));
...@@ -58,9 +59,9 @@ ...@@ -58,9 +59,9 @@
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<p> <p>
Are you sure you want to delete the group <fmt:message key="group.delete.hint_info" />
<b><a href="group-edit.jsp?group=<%= URLEncoder.encode(group.getName(), "UTF-8")%>"><%= group.getName() %></a></b> <b><a href="group-edit.jsp?group=<%= URLEncoder.encode(group.getName(), "UTF-8")%>"><%= group.getName() %></a></b>
from the system? <fmt:message key="group.delete.hint_info1" />
</p> </p>
<form action="group-delete.jsp"> <form action="group-delete.jsp">
......
src/web/group-edit.jsp
View file @ 4e6e9efa
...@@ -21,11 +21,12 @@ ...@@ -21,11 +21,12 @@
org.jivesoftware.messenger.user.UserManager, org.jivesoftware.messenger.user.UserManager,
org.jivesoftware.messenger.user.UserNotFoundException, org.jivesoftware.messenger.user.UserNotFoundException,
org.jivesoftware.stringprep.Stringprep, org.jivesoftware.stringprep.Stringprep,
java.io.UnsupportedEncodingException" java.io.UnsupportedEncodingException,
org.jivesoftware.util.LocaleUtils"
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<!-- Define Administration Bean --> <!-- Define Administration Bean -->
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"/> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"/>
<jsp:useBean id="errors" class="java.util.HashMap"/> <jsp:useBean id="errors" class="java.util.HashMap"/>
...@@ -207,7 +208,7 @@ ...@@ -207,7 +208,7 @@
%> %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean"/> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean"/>
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Edit Group"; String title = LocaleUtils.getLocalizedString("group.edit.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-edit.jsp?group="+URLEncoder.encode(groupName, "UTF-8"))); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-edit.jsp?group="+URLEncoder.encode(groupName, "UTF-8")));
...@@ -217,8 +218,7 @@ ...@@ -217,8 +218,7 @@
<jsp:include page="top.jsp" flush="true"/> <jsp:include page="top.jsp" flush="true"/>
<jsp:include page="title.jsp" flush="true"/> <jsp:include page="title.jsp" flush="true"/>
<p> <p>
Edit group settings and add or remove group members and administrators <fmt:message key="group.edit.form_info" />
using the forms below.
</p> </p>
<% <%
...@@ -230,15 +230,15 @@ ...@@ -230,15 +230,15 @@
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
<% if (groupInfoChanged) { %> <% if (groupInfoChanged) { %>
Group information updated successfully. <fmt:message key="group.edit.update" />
<% } else if ("true".equals(request.getParameter("success"))) { %> <% } else if ("true".equals(request.getParameter("success"))) { %>
User(s) added successfully. <fmt:message key="group.edit.update_add_user" />
<% } else if ("true".equals(request.getParameter("deletesuccess"))) { %> <% } else if ("true".equals(request.getParameter("deletesuccess"))) { %>
User(s) deleted successfully. <fmt:message key="group.edit.update_del_user" />
<% } else if ("true".equals(request.getParameter("updatesuccess"))) { %> <% } else if ("true".equals(request.getParameter("updatesuccess"))) { %>
User(s) updated successfully. <fmt:message key="group.edit.update_user" />
<% } else if ("true".equals(request.getParameter("creategroupsuccess"))) { %> <% } else if ("true".equals(request.getParameter("creategroupsuccess"))) { %>
Group created successfully. <fmt:message key="group.edit.update_success" />
<% <%
} }
%> %>
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
<tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
<% if(add) { %> <% if(add) { %>
User(s) not added successfully. <fmt:message key="group.edit.not_update" />
<%= errorBuf %> <%= errorBuf %>
<% } %> <% } %>
</td></tr> </td></tr>
...@@ -269,13 +269,13 @@ ...@@ -269,13 +269,13 @@
<fieldset> <fieldset>
<legend> <legend>
Group Summary <fmt:message key="group.edit.group_summary" />
</legend> </legend>
<table cellpadding="3" cellspacing="1" border="0"> <table cellpadding="3" cellspacing="1" border="0">
<tr> <tr>
<td width="1%"> <td width="1%">
Name: <fmt:message key="group.edit.group_name" />
</td> </td>
<% if(!edit) { %> <% if(!edit) { %>
<td align=left nowrap width="1%"> <td align=left nowrap width="1%">
...@@ -296,11 +296,11 @@ ...@@ -296,11 +296,11 @@
</tr> </tr>
<tr> <tr>
<td width="1%"> <td width="1%">
Description: <fmt:message key="group.edit.group_description" />
</td> </td>
<% if(!edit) { %> <% if(!edit) { %>
<td colspan="2"> <td colspan="2">
<%= ((group.getDescription() != null) ? group.getDescription() : "<i>No Description</i>") %> <%= ((group.getDescription() != null) ? group.getDescription() : "<i>"+LocaleUtils.getLocalizedString("group.edit.group_not_description")+"</i>") %>
</td> </td>
<% } else { %> <% } else { %>
...@@ -315,11 +315,10 @@ ...@@ -315,11 +315,10 @@
<br> <br>
<p>Shared Roster Groups</p> <p><fmt:message key="group.edit.group_share_title" /></p>
<p> <p>
You can use the form below to show this group in users' rosters. Select from one of three <fmt:message key="group.edit.group_share_content" />
options for who should see this group in their rosters.
</p> </p>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
...@@ -329,7 +328,7 @@ ...@@ -329,7 +328,7 @@
<input type="radio" name="enableRosterGroups" value="false" id="rb201" <%= !enableRosterGroups ? "checked" : "" %>> <input type="radio" name="enableRosterGroups" value="false" id="rb201" <%= !enableRosterGroups ? "checked" : "" %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb201">Disable sharing group in rosters</label> <label for="rb201"><fmt:message key="group.edit.group_share_not_in_rosters" /></label>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -337,7 +336,7 @@ ...@@ -337,7 +336,7 @@
<input type="radio" name="enableRosterGroups" value="true" id="rb202" <%= enableRosterGroups ? "checked" : "" %>> <input type="radio" name="enableRosterGroups" value="true" id="rb202" <%= enableRosterGroups ? "checked" : "" %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb202">Enable sharing group in rosters</label> <label for="rb202"><fmt:message key="group.edit.group_share_in_rosters" /></label>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -350,7 +349,7 @@ ...@@ -350,7 +349,7 @@
<tbody> <tbody>
<tr> <tr>
<td width="1%" nowrap> <td width="1%" nowrap>
Group Display Name <fmt:message key="group.edit.group_display_name" />
</td> </td>
<td width="99%"> <td width="99%">
<input type="text" name="groupDisplayName" size="30" maxlength="100" value="<%= (groupDisplayName != null ? groupDisplayName : "") %>" <input type="text" name="groupDisplayName" size="30" maxlength="100" value="<%= (groupDisplayName != null ? groupDisplayName : "") %>"
...@@ -369,8 +368,7 @@ ...@@ -369,8 +368,7 @@
<%= ("everybody".equals(showGroup) ? "checked" : "") %>> <%= ("everybody".equals(showGroup) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb002" <label for="rb002"><fmt:message key="group.edit.show_groups_in_all_user" /></label>
>Show group in all users' rosters.</label>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -380,8 +378,7 @@ ...@@ -380,8 +378,7 @@
<%= ("onlyGroup".equals(showGroup) && (groupNames == null || groupNames.length == 0) ? "checked" : "") %>> <%= ("onlyGroup".equals(showGroup) && (groupNames == null || groupNames.length == 0) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb001" <label for="rb001"><fmt:message key="group.edit.show_groups_in_groups_members" /></label>
>Show group in group members' rosters</label>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -391,8 +388,7 @@ ...@@ -391,8 +388,7 @@
<%= (groupNames != null && groupNames.length > 0) ? "checked" : "" %>> <%= (groupNames != null && groupNames.length > 0) ? "checked" : "" %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb003" <label for="rb003"><fmt:message key="group.edit.show_group_in_roster_group" /></label>
>Show group to members' rosters of these groups:</label>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -440,7 +436,7 @@ ...@@ -440,7 +436,7 @@
<table cellpadding="3" cellspacing="1" border="0"> <table cellpadding="3" cellspacing="1" border="0">
<tr> <tr>
<td nowrap width="1%"> <td nowrap width="1%">
Add User(s): <fmt:message key="group.edit.add_user" />
</td> </td>
<td nowrap class="c1" align="left"> <td nowrap class="c1" align="left">
<input type="text" size="40" name="users"/> <input type="text" size="40" name="users"/>
...@@ -454,7 +450,7 @@ ...@@ -454,7 +450,7 @@
<input type="hidden" name="group" value="<%= groupName %>"> <input type="hidden" name="group" value="<%= groupName %>">
<table class="jive-table" cellpadding="3" cellspacing="0" border="0" width="600"> <table class="jive-table" cellpadding="3" cellspacing="0" border="0" width="600">
<tr> <tr>
<th>Username</th><th width="1%">Admin</th><th width="1%">Remove</th> <th><fmt:message key="group.edit.username" /></th><th width="1%"><fmt:message key="group.edit.admin" /></th><th width="1%"><fmt:message key="group.edit.remove" /></th>
</tr> </tr>
<!-- Add admins first --> <!-- Add admins first -->
<% <%
...@@ -468,7 +464,7 @@ ...@@ -468,7 +464,7 @@
<tr> <tr>
<td align="center" colspan="3"> <td align="center" colspan="3">
<br> <br>
No members in this group. Use the form above to add some. <fmt:message key="group.edit.user_hint" />
<br> <br>
<br> <br>
</td> </td>
......
src/web/group-summary.jsp
View file @ 4e6e9efa
...@@ -20,13 +20,14 @@ ...@@ -20,13 +20,14 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Group Summary"; String title = LocaleUtils.getLocalizedString("group.summary.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-summary.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-summary.jsp"));
...@@ -48,7 +49,7 @@ ...@@ -48,7 +49,7 @@
%> %>
<p> <p>
Below is a list of the groups in the system. <fmt:message key="group.summary.list_group" />
</p> </p>
<% if (request.getParameter("deletesuccess") != null) { %> <% if (request.getParameter("deletesuccess") != null) { %>
...@@ -58,7 +59,7 @@ Below is a list of the groups in the system. ...@@ -58,7 +59,7 @@ Below is a list of the groups in the system.
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Group deleted successfully. <fmt:message key="group.summary.delete_group" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -67,10 +68,10 @@ Below is a list of the groups in the system. ...@@ -67,10 +68,10 @@ Below is a list of the groups in the system.
<% } %> <% } %>
<p> <p>
Total Groups: <%= webManager.getGroupManager().getGroupCount() %>, <fmt:message key="group.summary.total_group" /> <%= webManager.getGroupManager().getGroupCount() %>,
<% if (numPages > 1) { %> <% if (numPages > 1) { %>
Showing <%= (start+1) %>-<%= (start+range) %>, <fmt:message key="group.summary.showing" /> <%= (start+1) %>-<%= (start+range) %>,
<% } %> <% } %>
</p> </p>
...@@ -78,7 +79,7 @@ Total Groups: <%= webManager.getGroupManager().getGroupCount() %>, ...@@ -78,7 +79,7 @@ Total Groups: <%= webManager.getGroupManager().getGroupCount() %>,
<% if (numPages > 1) { %> <% if (numPages > 1) { %>
<p> <p>
Pages: <fmt:message key="group.summary.page" />
[ [
<% for (int i=0; i<numPages; i++) { <% for (int i=0; i<numPages; i++) {
String sep = ((i+1)<numPages) ? " " : ""; String sep = ((i+1)<numPages) ? " " : "";
...@@ -99,11 +100,11 @@ Total Groups: <%= webManager.getGroupManager().getGroupCount() %>, ...@@ -99,11 +100,11 @@ Total Groups: <%= webManager.getGroupManager().getGroupCount() %>,
<thead> <thead>
<tr> <tr>
<th>&nbsp;</th> <th>&nbsp;</th>
<th>Name</th> <th><fmt:message key="group.summary.page_name" /></th>
<th>Members</th> <th><fmt:message key="group.summary.page_member" /></th>
<th>Admins</th> <th><fmt:message key="group.summary.page_admin" /></th>
<th>Edit</th> <th><fmt:message key="group.summary.page_edit" /></th>
<th>Delete</th> <th><fmt:message key="group.summary.page_delete" /></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -114,7 +115,7 @@ Total Groups: <%= webManager.getGroupManager().getGroupCount() %>, ...@@ -114,7 +115,7 @@ Total Groups: <%= webManager.getGroupManager().getGroupCount() %>,
%> %>
<tr> <tr>
<td align="center" colspan="6"> <td align="center" colspan="6">
No groups in the system. <fmt:message key="group.summary.no_groups" />
</td> </td>
</tr> </tr>
...@@ -146,12 +147,12 @@ Total Groups: <%= webManager.getGroupManager().getGroupCount() %>, ...@@ -146,12 +147,12 @@ Total Groups: <%= webManager.getGroupManager().getGroupCount() %>,
</td> </td>
<td width="1%" align="center"> <td width="1%" align="center">
<a href="group-edit.jsp?group=<%= groupName %>" <a href="group-edit.jsp?group=<%= groupName %>"
title="Click to edit..." title=<fmt:message key="group.summary.click_edit" />
><img src="images/edit-16x16.gif" width="17" height="17" border="0"></a> ><img src="images/edit-16x16.gif" width="17" height="17" border="0"></a>
</td> </td>
<td width="1%" align="center" style="border-right:1px #ccc solid;"> <td width="1%" align="center" style="border-right:1px #ccc solid;">
<a href="group-delete.jsp?group=<%= groupName %>" <a href="group-delete.jsp?group=<%= groupName %>"
title="Click to delete..." title=<fmt:message key="group.summary.click_delete" />
><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a> ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
</td> </td>
</tr> </tr>
...@@ -166,7 +167,7 @@ Total Groups: <%= webManager.getGroupManager().getGroupCount() %>, ...@@ -166,7 +167,7 @@ Total Groups: <%= webManager.getGroupManager().getGroupCount() %>,
<% if (numPages > 1) { %> <% if (numPages > 1) { %>
<p> <p>
Pages: <fmt:message key="group.summary.page" />
[ [
<% for (i=0; i<numPages; i++) { <% for (i=0; i<numPages; i++) {
String sep = ((i+1)<numPages) ? " " : ""; String sep = ((i+1)<numPages) ? " " : "";
......
src/web/header.jsp
View file @ 4e6e9efa
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<html> <html>
<head> <head>
<title><fmt:message key="title" /> Admin</title> <title><fmt:message key="title" /> <fmt:message key="header.admin" /></title>
<meta http-equiv="content-type" content="text/html; charset="> <meta http-equiv="content-type" content="text/html; charset=">
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
<!-- // code for window popups <!-- // code for window popups
......
src/web/index.jsp
View file @ 4e6e9efa
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
%> %>
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Server Settings"; String title = LocaleUtils.getLocalizedString("index.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.setPageID("server-settings"); pageinfo.setPageID("server-settings");
%> %>
...@@ -65,8 +65,7 @@ ...@@ -65,8 +65,7 @@
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<p> <p>
Below are properties for this server. Click the "Edit Properties" button below to change <fmt:message key="index.title.info" />
some of the server settings. Some settings can not be changed.
</p> </p>
<script lang="JavaScript" type="text/javascript"> <script lang="JavaScript" type="text/javascript">
...@@ -82,7 +81,7 @@ some of the server settings. Some settings can not be changed. ...@@ -82,7 +81,7 @@ some of the server settings. Some settings can not be changed.
<table cellpadding="0" cellspacing="0" border="0" width="100%"> <table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead> <thead>
<tr> <tr>
<th colspan="2">Server Properties</th> <th colspan="2"><fmt:message key="index.properties" /></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -90,7 +89,7 @@ some of the server settings. Some settings can not be changed. ...@@ -90,7 +89,7 @@ some of the server settings. Some settings can not be changed.
<% if (serverOn) { %> <% if (serverOn) { %>
<tr> <tr>
<td class="c1">Server Uptime:</td> <td class="c1"><fmt:message key="index.uptime" /></td>
<td> <td>
<% DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM); <% DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM);
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
...@@ -131,21 +130,21 @@ some of the server settings. Some settings can not be changed. ...@@ -131,21 +130,21 @@ some of the server settings. Some settings can not be changed.
<% } %> <% } %>
<tr> <tr>
<td class="c1">Version:</td> <td class="c1"><fmt:message key="index.version" /></td>
<td class="c2"> <td class="c2">
<%= AdminConsole.getAppName() %> <%= AdminConsole.getAppName() %>
<%= AdminConsole.getVersionString() %> <%= AdminConsole.getVersionString() %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="c1">Messenger Home:</td> <td class="c1"><fmt:message key="index.home" /></td>
<td class="c2"> <td class="c2">
<%= JiveGlobals.getMessengerHome() %> <%= JiveGlobals.getMessengerHome() %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Server Name: <fmt:message key="index.server_name" />
</td> </td>
<td class="c2"> <td class="c2">
${webManager.serverInfo.name} ${webManager.serverInfo.name}
...@@ -154,7 +153,7 @@ some of the server settings. Some settings can not be changed. ...@@ -154,7 +153,7 @@ some of the server settings. Some settings can not be changed.
</tbody> </tbody>
<thead> <thead>
<tr> <tr>
<th colspan="2">Server Ports</th> <th colspan="2"><fmt:message key="index.server_port" /></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -163,18 +162,18 @@ some of the server settings. Some settings can not be changed. ...@@ -163,18 +162,18 @@ some of the server settings. Some settings can not be changed.
<% i++; %> <% i++; %>
<tr> <tr>
<td class="c1"> <td class="c1">
<%= i %>: IP:Port, Security: <%= i %>: <fmt:message key="index.server_ip" />
</td> </td>
<td class="c2"> <td class="c2">
${port.IPAddress}:${port.port}, ${port.IPAddress}:${port.port},
<c:choose> <c:choose>
<c:when test="${empty port.securityType}"> <c:when test="${empty port.securityType}">
NORMAL <fmt:message key="index.port_type" />
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:choose> <c:choose>
<c:when test="${port.securityType == 'TLS'}"> <c:when test="${port.securityType == 'TLS'}">
TLS (SSL) <fmt:message key="index.port_type1" />
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:out value="${port.securityType}" /> <c:out value="${port.securityType}" />
...@@ -186,7 +185,7 @@ some of the server settings. Some settings can not be changed. ...@@ -186,7 +185,7 @@ some of the server settings. Some settings can not be changed.
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td class="c1"> <td class="c1">
<nobr>&nbsp;&nbsp;&nbsp; Domain Name(s):</nobr> <nobr>&nbsp;&nbsp;&nbsp; <fmt:message key="index.domain_name" /></nobr>
</td> </td>
<td class="c2"> <td class="c2">
<c:set var="sep" value="" /> <c:set var="sep" value="" />
...@@ -200,30 +199,30 @@ some of the server settings. Some settings can not be changed. ...@@ -200,30 +199,30 @@ some of the server settings. Some settings can not be changed.
</tbody> </tbody>
<thead> <thead>
<tr> <tr>
<th colspan="2">Environment</th> <th colspan="2"><fmt:message key="index.environment" /></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td class="c1">JVM Version and Vendor:</td> <td class="c1"><fmt:message key="index.jvm" /></td>
<td class="c2"> <td class="c2">
<%= System.getProperty("java.version") %> <%= System.getProperty("java.vendor") %> <%= System.getProperty("java.version") %> <%= System.getProperty("java.vendor") %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="c1">Appserver:</td> <td class="c1"><fmt:message key="index.app" /></td>
<td class="c2"> <td class="c2">
<%= application.getServerInfo() %> <%= application.getServerInfo() %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="c1">OS / Hardware:</td> <td class="c1"><fmt:message key="index.os" /></td>
<td class="c2"> <td class="c2">
<%= System.getProperty("os.name") %> / <%= System.getProperty("os.arch") %> <%= System.getProperty("os.name") %> / <%= System.getProperty("os.arch") %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="c1">Locale / Timezone:</td> <td class="c1"><fmt:message key="index.local" /></td>
<td class="c2"> <td class="c2">
<%= JiveGlobals.getLocale() %> / <%= JiveGlobals.getTimeZone().getDisplayName(JiveGlobals.getLocale()) %> <%= JiveGlobals.getLocale() %> / <%= JiveGlobals.getTimeZone().getDisplayName(JiveGlobals.getLocale()) %>
(<%= (JiveGlobals.getTimeZone().getRawOffset()/1000/60/60) %> GMT) (<%= (JiveGlobals.getTimeZone().getRawOffset()/1000/60/60) %> GMT)
......
src/web/license-details.jsp
View file @ 4e6e9efa
...@@ -45,15 +45,15 @@ ...@@ -45,15 +45,15 @@
%> %>
<p> <p>
The following is a summary of your <fmt:message key="short.title" /> license. <fmt:message key="license.details.info" /> <fmt:message key="short.title" /> <fmt:message key="license.details.info1" />
</p> </p>
<table class="box" cellpadding="3" cellspacing="1" border="0" width="600"> <table class="box" cellpadding="3" cellspacing="1" border="0" width="600">
<tr class="tableHeaderBlue"><td colspan="2" align="center"><fmt:message key="short.title" /> License Details</td></tr> <tr class="tableHeaderBlue"><td colspan="2" align="center"><fmt:message key="short.title" /> <fmt:message key="license.details.details" /></td></tr>
<tr> <tr>
<td class="jive-label"> <td class="jive-label">
License Type: <fmt:message key="license.details.type" />
</td> </td>
<td> <td>
...@@ -61,20 +61,20 @@ The following is a summary of your <fmt:message key="short.title" /> license. ...@@ -61,20 +61,20 @@ The following is a summary of your <fmt:message key="short.title" /> license.
</tr> </tr>
<tr> <tr>
<td class="jive-label"> <td class="jive-label">
Maximum Allowable Sessions: <fmt:message key="license.details.max_session" />
</td> </td>
<td> <td>
Unlimited <fmt:message key="license.details.unlimited" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="jive-label"> <td class="jive-label">
Expiration Date: <fmt:message key="license.details.expiration_date" />
</td> </td>
<td> <td>
Never <fmt:message key="license.details.expiration_date_never" />
</td> </td>
......
src/web/log.jsp
View file @ 4e6e9efa
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
errorPage="error.jsp" errorPage="error.jsp"
%> %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<%! <%!
...@@ -183,7 +184,7 @@ ...@@ -183,7 +184,7 @@
<div class="log"> <div class="log">
<table cellpadding="1" cellspacing="0" border="0" width="100%"> <table cellpadding="1" cellspacing="0" border="0" width="100%">
<tr> <tr>
<th class="head-num">line</th> <th class="head-num"><fmt:message key="log.line" /></th>
<th>&nbsp;</th> <th>&nbsp;</th>
</tr> </tr>
<tr> <tr>
......
src/web/login.jsp
View file @ 4e6e9efa
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<html> <html>
<head> <head>
<title><%= AdminConsole.getAppName() %> Admin Console</title> <title><%= AdminConsole.getAppName() %> <fmt:message key="login.title" /></title>
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
<!-- <!--
// break out of frames // break out of frames
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
></div></td> ></div></td>
<td colspan="3" <td colspan="3"
><div id="jive-login-text-image" ><div id="jive-login-text-image"
><img src="images/login-text.gif" width="237" height="28" border="0" alt="Admin Console Login" ><img src="images/login-text.gif" width="237" height="28" border="0" alt="<fmt:message key="login.hint" />"
></div></td> ></div></td>
</tr> </tr>
...@@ -186,9 +186,7 @@ ...@@ -186,9 +186,7 @@
<td><img src="images/error-16x16.gif" width="16" height="16" border="0" alt="" vspace="2"></td> <td><img src="images/error-16x16.gif" width="16" height="16" border="0" alt="" vspace="2"></td>
<td> <td>
<div class="jive-error-text" style="padding-left:5px;"> <div class="jive-error-text" style="padding-left:5px;">
Error: You don't have JavaScript enabled. This tool uses JavaScript <fmt:message key="login.error" />
and much of it will not work correctly without it enabled. Please turn
JavaScript back on and reload this page.
</div> </div>
</td> </td>
</tr> </tr>
...@@ -206,8 +204,7 @@ ...@@ -206,8 +204,7 @@
<td><img src="images/error-16x16.gif" width="16" height="16" border="0" alt="" vspace="2"></td> <td><img src="images/error-16x16.gif" width="16" height="16" border="0" alt="" vspace="2"></td>
<td> <td>
<div class="jive-error-text" style="padding-left:5px;"> <div class="jive-error-text" style="padding-left:5px;">
Login failed: make sure your username and password are correct <fmt:message key="login.failed" />
and that you're an admin or moderator.
</div> </div>
</td> </td>
</tr> </tr>
...@@ -231,12 +228,12 @@ ...@@ -231,12 +228,12 @@
<tr valign="top"> <tr valign="top">
<td class="jive-login-label"> <td class="jive-login-label">
<label for="u01"> <label for="u01">
username <fmt:message key="login.username" />
</label> </label>
</td> </td>
<td class="jive-login-label"> <td class="jive-login-label">
<label for="p01"> <label for="p01">
password <fmt:message key="login.password" />
</label> </label>
</td> </td>
<td> <td>
...@@ -249,7 +246,7 @@ ...@@ -249,7 +246,7 @@
<tr class="jive-footer"> <tr class="jive-footer">
<td colspan="3" nowrap> <td colspan="3" nowrap>
<span style="font-size:0.8em;"> <span style="font-size:0.8em;">
<%= AdminConsole.getAppName() %>, Version: <%= AdminConsole.getVersionString() %> <%= AdminConsole.getAppName() %>, <fmt:message key="login.version" />: <%= AdminConsole.getVersionString() %>
</span> </span>
</td> </td>
</tr> </tr>
......
src/web/logviewer.jsp
View file @ 4e6e9efa
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
%> %>
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Log Viewer"; String title = LocaleUtils.getLocalizedString("logviewer.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "logviewer.jsp?log=" + log)); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "logviewer.jsp?log=" + log));
...@@ -249,7 +249,7 @@ IFRAME { ...@@ -249,7 +249,7 @@ IFRAME {
<td class="jive-spacer" width="1%">&nbsp;</td> <td class="jive-spacer" width="1%">&nbsp;</td>
<td class="jive-tab<%= (("error".equals(log))?"-active":"") %>" width="1%"> <td class="jive-tab<%= (("error".equals(log))?"-active":"") %>" width="1%">
<a href="logviewer.jsp?log=error" <a href="logviewer.jsp?log=error"
>Error</a> ><fmt:message key="logviewer.error" /></a>
<span class="new"> <span class="new">
<%= ((newlogs.containsKey("error"))?"*":"") %> <%= ((newlogs.containsKey("error"))?"*":"") %>
</span> </span>
...@@ -257,7 +257,7 @@ IFRAME { ...@@ -257,7 +257,7 @@ IFRAME {
<td class="jive-spacer" width="1%">&nbsp;</td> <td class="jive-spacer" width="1%">&nbsp;</td>
<td class="jive-tab<%= (("warn".equals(log))?"-active":"") %>" width="1%"> <td class="jive-tab<%= (("warn".equals(log))?"-active":"") %>" width="1%">
<a href="logviewer.jsp?log=warn" <a href="logviewer.jsp?log=warn"
>Warn</a> ><fmt:message key="logviewer.warn" /></a>
<span class="new"> <span class="new">
<%= ((newlogs.containsKey("warn"))?"*":"") %> <%= ((newlogs.containsKey("warn"))?"*":"") %>
</span> </span>
...@@ -265,7 +265,7 @@ IFRAME { ...@@ -265,7 +265,7 @@ IFRAME {
<td class="jive-spacer" width="1%">&nbsp;</td> <td class="jive-spacer" width="1%">&nbsp;</td>
<td class="jive-tab<%= (("info".equals(log))?"-active":"") %>" width="1%"> <td class="jive-tab<%= (("info".equals(log))?"-active":"") %>" width="1%">
<a href="logviewer.jsp?log=info" <a href="logviewer.jsp?log=info"
>Info</a> ><fmt:message key="logviewer.info" /></a>
<span class="new"> <span class="new">
<%= ((newlogs.containsKey("info"))?"*":"") %> <%= ((newlogs.containsKey("info"))?"*":"") %>
</span> </span>
...@@ -273,7 +273,7 @@ IFRAME { ...@@ -273,7 +273,7 @@ IFRAME {
<td class="jive-spacer" width="1%">&nbsp;</td> <td class="jive-spacer" width="1%">&nbsp;</td>
<td class="jive-tab<%= (("debug".equals(log))?"-active":"") %>" width="1%"> <td class="jive-tab<%= (("debug".equals(log))?"-active":"") %>" width="1%">
<a href="logviewer.jsp?log=debug" <a href="logviewer.jsp?log=debug"
>Debug</a> ><fmt:message key="logviewer.debug" /></a>
<span class="new"> <span class="new">
<%= ((newlogs.containsKey("debug"))?"*":"") %> <%= ((newlogs.containsKey("debug"))?"*":"") %>
</span> </span>
...@@ -297,25 +297,25 @@ IFRAME { ...@@ -297,25 +297,25 @@ IFRAME {
<td> <td>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tr> <tr>
<td nowrap>Log File:</td> <td nowrap><fmt:message key="logviewer.log" /></td>
<td nowrap><b><%= logFile.getName() %></b> (<%= byteFormatter.format(logFile.length()) %>)</td> <td nowrap><b><%= logFile.getName() %></b> (<%= byteFormatter.format(logFile.length()) %>)</td>
<td width="96%" rowspan="3">&nbsp;</td> <td width="96%" rowspan="3">&nbsp;</td>
<td nowrap>Order:</td> <td nowrap><fmt:message key="logviewer.order" /></td>
<td nowrap> <td nowrap>
<input type="radio" name="mode" value="asc"<%= ("asc".equals(mode)?" checked":"") %> <input type="radio" name="mode" value="asc"<%= ("asc".equals(mode)?" checked":"") %>
onclick="this.form.submit();" id="rb01" onclick="this.form.submit();" id="rb01"
><label for="rb01">Normal</label> ><label for="rb01"><fmt:message key="logviewer.normal" /></label>
<input type="radio" name="mode" value="desc"<%= ("desc".equals(mode)?" checked":"") %> <input type="radio" name="mode" value="desc"<%= ("desc".equals(mode)?" checked":"") %>
onclick="this.form.submit();" id="rb02" onclick="this.form.submit();" id="rb02"
><label for="rb02">Reverse</label> ><label for="rb02"><fmt:message key="logviewer.reverse" /></label>
</td> </td>
</tr> </tr>
<tr> <tr>
<td nowrap>Last Modified:</td> <td nowrap><fmt:message key="logviewer.modified" /></td>
<td nowrap> <td nowrap>
<span><%= dateFormatter.format(lastMod) %></span> <span><%= dateFormatter.format(lastMod) %></span>
</td> </td>
<td nowrap>Lines:</td> <td nowrap><fmt:message key="logviewer.line" /></td>
<td nowrap> <td nowrap>
<select name="lines" size="1" <select name="lines" size="1"
onchange="this.form.submit();"> onchange="this.form.submit();">
...@@ -326,7 +326,7 @@ IFRAME { ...@@ -326,7 +326,7 @@ IFRAME {
<% } %> <% } %>
<option value="All"<%= (("All".equals(numLinesParam))?" selected":"") %> <option value="All"<%= (("All".equals(numLinesParam))?" selected":"") %>
>All ><fmt:message key="logviewer.all" />
</select> </select>
</td> </td>
</tr> </tr>
...@@ -354,25 +354,25 @@ IFRAME { ...@@ -354,25 +354,25 @@ IFRAME {
<tbody> <tbody>
<tr> <tr>
<td class="icon"> <td class="icon">
<a href="#" onclick="if (confirm('Are you sure you want to clear this log file?')) {setLog('clearLog'); document.logViewer.submit(); return true;} else { return false; }"><img src="images/delete-16x16.gif" border="0" alt="Clear Log"></a> <a href="#" onclick="if (confirm('<fmt:message key="logviewer.confirm" />')) {setLog('clearLog'); document.logViewer.submit(); return true;} else { return false; }"><img src="images/delete-16x16.gif" border="0" alt="<fmt:message key="logviewer.alt_clear" />"></a>
</td> </td>
<td class="icon-label"> <td class="icon-label">
<a href="#" onclick="if (confirm('Are you sure you want to clear this log file?')) {setLog('clearLog'); document.logViewer.submit(); return true;} else { return false; }" <a href="#" onclick="if (confirm('<fmt:message key="logviewer.clear" />')) {setLog('clearLog'); document.logViewer.submit(); return true;} else { return false; }"
>Clear</a> ><fmt:message key="logviewer.clear" /></a>
</td> </td>
<td class="icon"> <td class="icon">
<a href="#" onclick="setLog('markLog'); document.logViewer.submit(); return true;"><img src="images/mark-16x16.gif" border="0" alt="Mark Log"></a> <a href="#" onclick="setLog('markLog'); document.logViewer.submit(); return true;"><img src="images/mark-16x16.gif" border="0" alt="<fmt:message key="logviewer.alt_mark" />"></a>
</td> </td>
<td class="icon-label"> <td class="icon-label">
<a href="#" onclick="setLog('markLog'); document.logViewer.submit(); return true;" <a href="#" onclick="setLog('markLog'); document.logViewer.submit(); return true;"
>Mark</a> ><fmt:message key="logviewer.mark" /></a>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</td> </td>
<td nowrap>Refresh:</td> <td nowrap><fmt:message key="logviewer.refresh" /></td>
<td nowrap> <td nowrap>
<select size="1" name="refresh" onchange="this.form.submit();"> <select size="1" name="refresh" onchange="this.form.submit();">
<% for (int j=0; j<REFRESHES.length; j++) { <% for (int j=0; j<REFRESHES.length; j++) {
...@@ -382,7 +382,7 @@ IFRAME { ...@@ -382,7 +382,7 @@ IFRAME {
<% } %> <% } %>
</select> </select>
(seconds) (<fmt:message key="logviewer.seconds" />)
</td> </td>
</tr> </tr>
...@@ -394,13 +394,13 @@ IFRAME { ...@@ -394,13 +394,13 @@ IFRAME {
<table cellpadding="0" cellspacing="0" border="0" width="100%"> <table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr> <tr>
<td width="1%" nowrap> <td width="1%" nowrap>
Debug Log: &nbsp; <fmt:message key="logviewer.debug_log" />: &nbsp;
</td> </td>
<td width="1%"> <td width="1%">
<input type="radio" name="debugEnabled" value="true"<%= ((debugEnabled) ? " checked" : "") %> id="de01"> <input type="radio" name="debugEnabled" value="true"<%= ((debugEnabled) ? " checked" : "") %> id="de01">
</td> </td>
<td width="1%" nowrap> <td width="1%" nowrap>
<label for="de01">Enabled</label> &nbsp; <label for="de01"><fmt:message key="logviewer.enabled" /></label> &nbsp;
</td> </td>
<td width="1%"> <td width="1%">
<input type="radio" name="debugEnabled" value="false"<%= ((!debugEnabled) ? " checked" : "") %> id="de02"> <input type="radio" name="debugEnabled" value="false"<%= ((!debugEnabled) ? " checked" : "") %> id="de02">
......
src/web/muc-create-permission.jsp
View file @ 4e6e9efa
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %> <% admin.init(request, response, session, application, out ); %>
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Room Creation Permissions"; String title = LocaleUtils.getLocalizedString("muc.create.permission.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Room Permissions", "muc-create-permission.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Room Permissions", "muc-create-permission.jsp"));
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<p> <p>
Use the form below to configure the policy for who can create group chat rooms. <fmt:message key="muc.create.permission.info" />
</p> </p>
<% if (errors.size() > 0) { %> <% if (errors.size() > 0) { %>
...@@ -104,7 +104,7 @@ Use the form below to configure the policy for who can create group chat rooms. ...@@ -104,7 +104,7 @@ Use the form below to configure the policy for who can create group chat rooms.
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Error adding the user. Please verify the JID is correct. <fmt:message key="muc.create.permission.error" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -119,15 +119,15 @@ Use the form below to configure the policy for who can create group chat rooms. ...@@ -119,15 +119,15 @@ Use the form below to configure the policy for who can create group chat rooms.
<td class="jive-icon-label"> <td class="jive-icon-label">
<% if (success) { %> <% if (success) { %>
Settings updated successfully. <fmt:message key="muc.create.permission.update" />
<% } else if (addsuccess) { %> <% } else if (addsuccess) { %>
User added successfully. <fmt:message key="muc.create.permission.add_user" />
<% } else if (deletesuccess) { %> <% } else if (deletesuccess) { %>
User removed successfully. <fmt:message key="muc.create.permission.user_removed" />
<% } %> <% } %>
</td></tr> </td></tr>
...@@ -140,7 +140,7 @@ Use the form below to configure the policy for who can create group chat rooms. ...@@ -140,7 +140,7 @@ Use the form below to configure the policy for who can create group chat rooms.
<form action="muc-create-permission.jsp?save" method="post"> <form action="muc-create-permission.jsp?save" method="post">
<fieldset> <fieldset>
<legend>Permission Policy</legend> <legend><fmt:message key="muc.create.permission.policy" /></legend>
<div> <div>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
...@@ -150,7 +150,7 @@ Use the form below to configure the policy for who can create group chat rooms. ...@@ -150,7 +150,7 @@ Use the form below to configure the policy for who can create group chat rooms.
<%= ((!mucServer.isRoomCreationRestricted()) ? "checked" : "") %>> <%= ((!mucServer.isRoomCreationRestricted()) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb01">Anyone can create a chat room.</label> <label for="rb01"><fmt:message key="muc.create.permission.anyone_created" /></label>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -160,7 +160,7 @@ Use the form below to configure the policy for who can create group chat rooms. ...@@ -160,7 +160,7 @@ Use the form below to configure the policy for who can create group chat rooms.
<%= ((mucServer.isRoomCreationRestricted()) ? "checked" : "") %>> <%= ((mucServer.isRoomCreationRestricted()) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb02">Only specific users can create a chat room.</label> <label for="rb02"><fmt:message key="muc.create.permission.specific_created" /></label>
</td> </td>
</tr> </tr>
</tbody> </tbody>
...@@ -179,10 +179,10 @@ Use the form below to configure the policy for who can create group chat rooms. ...@@ -179,10 +179,10 @@ Use the form below to configure the policy for who can create group chat rooms.
<form action="muc-create-permission.jsp?add" method="post"> <form action="muc-create-permission.jsp?add" method="post">
<fieldset> <fieldset>
<legend>Allowed Users</legend> <legend><fmt:message key="muc.create.permission.allowed_users" /></legend>
<div> <div>
<p> <p>
<label for="userJIDtf">Add User (JID):</label> <label for="userJIDtf"><fmt:message key="muc.create.permission.add_jid" /></label>
<input type="text" name="userJID" size="30" maxlength="100" value="<%= (userJID != null ? userJID : "") %>" <input type="text" name="userJID" size="30" maxlength="100" value="<%= (userJID != null ? userJID : "") %>"
onclick="this.form.openPerms[1].checked=true;" id="userJIDtf"> onclick="this.form.openPerms[1].checked=true;" id="userJIDtf">
<input type="submit" value="Add"> <input type="submit" value="Add">
...@@ -201,7 +201,7 @@ Use the form below to configure the policy for who can create group chat rooms. ...@@ -201,7 +201,7 @@ Use the form below to configure the policy for who can create group chat rooms.
<tr> <tr>
<td colspan="2"> <td colspan="2">
No allowed users, use the form above to add one. <fmt:message key="muc.create.permission.no_allowed_users" />
</td> </td>
</tr> </tr>
...@@ -216,8 +216,8 @@ Use the form below to configure the policy for who can create group chat rooms. ...@@ -216,8 +216,8 @@ Use the form below to configure the policy for who can create group chat rooms.
</td> </td>
<td width="1%" align="center"> <td width="1%" align="center">
<a href="muc-create-permission.jsp?userJID=<%= user %>&delete=true" <a href="muc-create-permission.jsp?userJID=<%= user %>&delete=true"
title="Click to delete..." title="<fmt:message key="muc.create.permission.click_title" />"
onclick="return confirm('Are you sure you want to remove this user from the list?');" onclick="return confirm('<fmt:message key="muc.create.permission.confirm_remove" />');"
><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a> ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
</td> </td>
</tr> </tr>
......
src/web/muc-room-affiliations.jsp
View file @ 4e6e9efa
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %> <% admin.init(request, response, session, application, out ); %>
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "User Permissions"; String title = LocaleUtils.getLocalizedString("muc.room.affiliations.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Room Permissions", "muc-room-affiliations.jsp?roomName="+roomName)); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Room Permissions", "muc-room-affiliations.jsp?roomName="+roomName));
...@@ -117,12 +117,9 @@ ...@@ -117,12 +117,9 @@
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<p> <p>
Below is the list of room owners, administrators, members and outcasts of the the room <fmt:message key="muc.room.affiliations.info" />
<b><a href="muc-room-edit-form.jsp?roomName=<%= room.getName() %>"><%= room.getName() %></a></b>. <b><a href="muc-room-edit-form.jsp?roomName=<%= room.getName() %>"><%= room.getName() %></a></b>.
Room owners can alter the room configuration, grant ownership and administrative privileges to users <fmt:message key="muc.room.affiliations.info_detail" />
and destroy the room. Room administrators can ban, grant membership and moderator privileges to
users. Room members are the only allowed users to join the room when it is configured as members-only.
Whilst room outcasts are users who have been banned from the room.
</p> </p>
<% if (errors.size() > 0) { %> <% if (errors.size() > 0) { %>
...@@ -134,15 +131,15 @@ Whilst room outcasts are users who have been banned from the room. ...@@ -134,15 +131,15 @@ Whilst room outcasts are users who have been banned from the room.
<td class="jive-icon-label"> <td class="jive-icon-label">
<% if (errors.containsKey("ConflictException")) { %> <% if (errors.containsKey("ConflictException")) { %>
Error removing the user. The room must have at least one owner. <fmt:message key="muc.room.affiliations.error_removing_user" />
<% } else if (errors.containsKey("NotAllowedException")) { %> <% } else if (errors.containsKey("NotAllowedException")) { %>
Error banning the user. Owners or Administratos cannot be banned. <fmt:message key="muc.room.affiliations.error_banning_user" />
<% } else { %> <% } else { %>
Error adding the user. Please verify the JID is correct. <fmt:message key="muc.room.affiliations.error_adding_user" />
<% } %> <% } %>
</td></tr> </td></tr>
...@@ -159,11 +156,11 @@ Whilst room outcasts are users who have been banned from the room. ...@@ -159,11 +156,11 @@ Whilst room outcasts are users who have been banned from the room.
<td class="jive-icon-label"> <td class="jive-icon-label">
<% if (addsuccess) { %> <% if (addsuccess) { %>
User added successfully. <fmt:message key="muc.room.affiliations.user_added" />
<% } else if (deletesuccess) { %> <% } else if (deletesuccess) { %>
User removed successfully. <fmt:message key="muc.room.affiliations.user_removed" />
<% } %> <% } %>
</td></tr> </td></tr>
...@@ -177,16 +174,16 @@ Whilst room outcasts are users who have been banned from the room. ...@@ -177,16 +174,16 @@ Whilst room outcasts are users who have been banned from the room.
<input type="hidden" name="roomName" value="<%= roomName %>"> <input type="hidden" name="roomName" value="<%= roomName %>">
<fieldset> <fieldset>
<legend>User Permissions</legend> <legend><fmt:message key="muc.room.affiliations.permission" /></legend>
<div> <div>
<p> <p>
<label for="memberJID">Add User (JID):</label> <label for="memberJID"><fmt:message key="muc.room.affiliations.add_jid" /></label>
<input type="text" name="userJID" size="30" maxlength="100" value="<%= (userJID != null ? userJID : "") %>" id="memberJID"> <input type="text" name="userJID" size="30" maxlength="100" value="<%= (userJID != null ? userJID : "") %>" id="memberJID">
<select name="affiliation"> <select name="affiliation">
<option value="owner">Owner</option> <option value="owner"><fmt:message key="muc.room.affiliations.owner" /></option>
<option value="admin">Admin</option> <option value="admin"><fmt:message key="muc.room.affiliations.admin" /></option>
<option value="member">Member</option> <option value="member"><fmt:message key="muc.room.affiliations.member" /></option>
<option value="outcast">Outcast</option> <option value="outcast"><fmt:message key="muc.room.affiliations.outcast" /></option>
</select> </select>
<input type="submit" value="Add"> <input type="submit" value="Add">
</p> </p>
...@@ -195,20 +192,20 @@ Whilst room outcasts are users who have been banned from the room. ...@@ -195,20 +192,20 @@ Whilst room outcasts are users who have been banned from the room.
<table cellpadding="0" cellspacing="0" border="0" width="100%"> <table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead> <thead>
<tr> <tr>
<th colspan="2">User</th> <th colspan="2"><fmt:message key="muc.room.affiliations.user" /></th>
<th width="1%">Delete</th> <th width="1%"><fmt:message key="muc.room.affiliations.delete" /></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<%-- Add owners section --%> <%-- Add owners section --%>
<tr> <tr>
<td colspan="2"><b>Room Owners</b></td> <td colspan="2"><b><fmt:message key="muc.room.affiliations.room_owner" /></b></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<% if (room.getOwners().isEmpty()) { %> <% if (room.getOwners().isEmpty()) { %>
<tr> <tr>
<td colspan="2" align="center"><i>No Users</i></td> <td colspan="2" align="center"><i><fmt:message key="muc.room.affiliations.no_users" /></i></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<% } <% }
...@@ -222,21 +219,21 @@ Whilst room outcasts are users who have been banned from the room. ...@@ -222,21 +219,21 @@ Whilst room outcasts are users who have been banned from the room.
</td> </td>
<td width="1%" align="center"> <td width="1%" align="center">
<a href="muc-room-affiliations.jsp?roomName=<%= roomName %>&userJID=<%= user %>&delete=true&affiliation=owner" <a href="muc-room-affiliations.jsp?roomName=<%= roomName %>&userJID=<%= user %>&delete=true&affiliation=owner"
title="Click to delete..." title="<fmt:message key="muc.room.affiliations.click_delete" />"
onclick="return confirm('Are you sure you want to remove this user from the list?');" onclick="return confirm('<fmt:message key="muc.room.affiliations.confirm_removed" />');"
><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a> ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
</td> </td>
</tr> </tr>
<% } } %> <% } } %>
<%-- Add admins section --%> <%-- Add admins section --%>
<tr> <tr>
<td colspan="2"><b>Room Admins</b></td> <td colspan="2"><b><fmt:message key="muc.room.affiliations.room_admin" /></b></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<% if (room.getAdmins().isEmpty()) { %> <% if (room.getAdmins().isEmpty()) { %>
<tr> <tr>
<td colspan="2" align="center"><i>No Users</i></td> <td colspan="2" align="center"><i><fmt:message key="muc.room.affiliations.no_users" /></i></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<% } <% }
...@@ -250,21 +247,21 @@ Whilst room outcasts are users who have been banned from the room. ...@@ -250,21 +247,21 @@ Whilst room outcasts are users who have been banned from the room.
</td> </td>
<td width="1%" align="center"> <td width="1%" align="center">
<a href="muc-room-affiliations.jsp?roomName=<%= roomName %>&userJID=<%= user %>&delete=true&affiliation=admin" <a href="muc-room-affiliations.jsp?roomName=<%= roomName %>&userJID=<%= user %>&delete=true&affiliation=admin"
title="Click to delete..." title="<fmt:message key="muc.room.affiliations.click_delete" />"
onclick="return confirm('Are you sure you want to remove this user from the list?');" onclick="return confirm('<fmt:message key="muc.room.affiliations.confirm_removed" />');"
><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a> ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
</td> </td>
</tr> </tr>
<% } } %> <% } } %>
<%-- Add members section --%> <%-- Add members section --%>
<tr> <tr>
<td colspan="2"><b>Room Members</b></td> <td colspan="2"><b><fmt:message key="muc.room.affiliations.room_member" /></b></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<% if (room.getMembers().isEmpty()) { %> <% if (room.getMembers().isEmpty()) { %>
<tr> <tr>
<td colspan="2" align="center"><i>No Users</i></td> <td colspan="2" align="center"><i><fmt:message key="muc.room.affiliations.no_users" /></i></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<% } <% }
...@@ -280,21 +277,21 @@ Whilst room outcasts are users who have been banned from the room. ...@@ -280,21 +277,21 @@ Whilst room outcasts are users who have been banned from the room.
</td> </td>
<td width="1%" align="center"> <td width="1%" align="center">
<a href="muc-room-affiliations.jsp?roomName=<%= roomName %>&userJID=<%= user %>&delete=true&affiliation=member" <a href="muc-room-affiliations.jsp?roomName=<%= roomName %>&userJID=<%= user %>&delete=true&affiliation=member"
title="Click to delete..." title="<fmt:message key="muc.room.affiliations.click_delete" />"
onclick="return confirm('Are you sure you want to remove this user from the list?');" onclick="return confirm('<fmt:message key="muc.room.affiliations.confirm_removed" />');"
><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a> ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
</td> </td>
</tr> </tr>
<% } } %> <% } } %>
<%-- Add outcasts section --%> <%-- Add outcasts section --%>
<tr> <tr>
<td colspan="2"><b>Room Outcasts</b></td> <td colspan="2"><b><fmt:message key="muc.room.affiliations.room_outcast" /></b></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<% if (room.getOutcasts().isEmpty()) { %> <% if (room.getOutcasts().isEmpty()) { %>
<tr> <tr>
<td colspan="2" align="center"><i>No Users</i></td> <td colspan="2" align="center"><i><fmt:message key="muc.room.affiliations.no_users" /></i></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<% } <% }
...@@ -308,8 +305,8 @@ Whilst room outcasts are users who have been banned from the room. ...@@ -308,8 +305,8 @@ Whilst room outcasts are users who have been banned from the room.
</td> </td>
<td width="1%" align="center"> <td width="1%" align="center">
<a href="muc-room-affiliations.jsp?roomName=<%= roomName %>&userJID=<%= user %>&delete=true&affiliation=outcast" <a href="muc-room-affiliations.jsp?roomName=<%= roomName %>&userJID=<%= user %>&delete=true&affiliation=outcast"
title="Click to delete..." title="<fmt:message key="muc.room.affiliations.click_delete" />"
onclick="return confirm('Are you sure you want to remove this user from the list?');" onclick="return confirm('<fmt:message key="muc.room.affiliations.confirm_removed" />');"
><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a> ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
</td> </td>
</tr> </tr>
......
src/web/muc-room-delete.jsp
View file @ 4e6e9efa
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Destroy Room"; String title = LocaleUtils.getLocalizedString("muc.room.delete.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-room-delete.jsp?roomName="+roomName)); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-room-delete.jsp?roomName="+roomName));
...@@ -62,23 +62,22 @@ ...@@ -62,23 +62,22 @@
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<p> <p>
Are you sure you want to destroy the room <fmt:message key="muc.room.delete.info" />
<b><a href="muc-room-edit-form.jsp?roomName=<%= room.getName() %>"><%= room.getName() %></a></b> <b><a href="muc-room-edit-form.jsp?roomName=<%= room.getName() %>"><%= room.getName() %></a></b>
from the system? You may specify a reason for the room destruction and an alternative room <fmt:message key="muc.room.delete.detail" />
address that will replace this room. This information will be sent to room occupants.
</p> </p>
<form action="muc-room-delete.jsp"> <form action="muc-room-delete.jsp">
<input type="hidden" name="roomName" value="<%= roomName %>"> <input type="hidden" name="roomName" value="<%= roomName %>">
<fieldset> <fieldset>
<legend>Destruction Details</legend> <legend><fmt:message key="muc.room.delete.destructon_title" /></legend>
<div> <div>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
<tr> <tr>
<td class="c1"> <td class="c1">
Room ID: <fmt:message key="muc.room.delete.room_id" />
</td> </td>
<td> <td>
<%= room.getName() %> <%= room.getName() %>
...@@ -86,7 +85,7 @@ address that will replace this room. This information will be sent to room occup ...@@ -86,7 +85,7 @@ address that will replace this room. This information will be sent to room occup
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Reason: <fmt:message key="muc.room.delete.reason" />
</td> </td>
<td> <td>
<input type="text" size="50" maxlength="150" name="reason"> <input type="text" size="50" maxlength="150" name="reason">
...@@ -94,7 +93,7 @@ address that will replace this room. This information will be sent to room occup ...@@ -94,7 +93,7 @@ address that will replace this room. This information will be sent to room occup
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Alternate Room Address: <fmt:message key="muc.room.delete.alternate_address" />
</td> </td>
<td> <td>
<input type="text" size="30" maxlength="150" name="alternateJID"> <input type="text" size="30" maxlength="150" name="alternateJID">
......
src/web/muc-room-edit-form.jsp
View file @ 4e6e9efa
...@@ -22,12 +22,13 @@ ...@@ -22,12 +22,13 @@
org.xmpp.packet.IQ, org.xmpp.packet.IQ,
org.xmpp.packet.Message, org.xmpp.packet.Message,
org.xmpp.packet.JID, org.xmpp.packet.JID,
org.jivesoftware.messenger.auth.UnauthorizedException" org.jivesoftware.messenger.auth.UnauthorizedException,
org.jivesoftware.util.LocaleUtils"
errorPage="error.jsp" errorPage="error.jsp"
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out); %> <% webManager.init(request, response, session, application, out); %>
...@@ -276,7 +277,7 @@ ...@@ -276,7 +277,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Room Administration"; String title = LocaleUtils.getLocalizedString("muc.room.edit.form.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
if (create) { if (create) {
...@@ -301,11 +302,11 @@ ...@@ -301,11 +302,11 @@
<td class="jive-icon-label"> <td class="jive-icon-label">
<% if (success) { %> <% if (success) { %>
Room settings edited successfully. <fmt:message key="muc.room.edit.form.edited" />
<% } else if (addsuccess) { %> <% } else if (addsuccess) { %>
Room creation was successfully. <fmt:message key="muc.room.edit.form.created" />
<% } %> <% } %>
</td></tr> </td></tr>
...@@ -317,16 +318,16 @@ ...@@ -317,16 +318,16 @@
<% if (!create) { %> <% if (!create) { %>
<p> <p>
Use the form below to edit the room settings. <fmt:message key="muc.room.edit.form.info" />
</p> </p>
<div class="jive-table"> <div class="jive-table">
<table cellpadding="0" cellspacing="0" border="0" width="100%"> <table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead> <thead>
<tr> <tr>
<th scope="col">Room ID</th> <th scope="col"><fmt:message key="muc.room.edit.form.room_id" /></th>
<th scope="col">Users</th> <th scope="col"><fmt:message key="muc.room.edit.form.users" /></th>
<th scope="col">Created On</th> <th scope="col"><fmt:message key="muc.room.edit.form.on" /></th>
<th scope="col">Last Modified</th> <th scope="col"><fmt:message key="muc.room.edit.form.modified" /></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -340,9 +341,9 @@ ...@@ -340,9 +341,9 @@
</table> </table>
</div> </div>
<br> <br>
<p>Change the room settings of this room using the form below</p> <p><fmt:message key="muc.room.edit.form.change_room" /></p>
<% } else { %> <% } else { %>
<p>Use the form below to create a new persistent room. The new room will be immediately available.</p> <p><fmt:message key="muc.room.edit.form.persistent_room" /></p>
<% if (errors.containsKey("room_already_exists") || errors.containsKey("not_enough_permissions")) { %> <% if (errors.containsKey("room_already_exists") || errors.containsKey("not_enough_permissions")) { %>
<div class="jive-error"> <div class="jive-error">
...@@ -352,11 +353,11 @@ ...@@ -352,11 +353,11 @@
<td class="jive-icon-label"> <td class="jive-icon-label">
<% if (errors.containsKey("room_already_exists")) { %> <% if (errors.containsKey("room_already_exists")) { %>
Error creating the room. A room with the request ID already exists. <fmt:message key="muc.room.edit.form.error_created_id" />
<% } else if (errors.containsKey("not_enough_permissions")) { %> <% } else if (errors.containsKey("not_enough_permissions")) { %>
Error creating the room. You do not have enough privileges to create rooms. <fmt:message key="muc.room.edit.form.error_created_privileges" />
<% } %> <% } %>
</td></tr> </td></tr>
...@@ -379,12 +380,12 @@ ...@@ -379,12 +380,12 @@
<tbody> <tbody>
<% if (create) { %> <% if (create) { %>
<tr> <tr>
<td>Room ID:</td> <td><fmt:message key="muc.room.edit.form.room_id" />:</td>
<td><input type="text" name="roomName" value="<%= roomName != null ? roomName : ""%>"> <td><input type="text" name="roomName" value="<%= roomName != null ? roomName : ""%>">
<% if (errors.get("roomName") != null) { %> <% if (errors.get("roomName") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
Please enter a valid ID. Do not include the service name in the ID. <fmt:message key="muc.room.edit.form.valid_hint" />
</span> </span>
<% } %> <% } %>
...@@ -392,97 +393,97 @@ ...@@ -392,97 +393,97 @@
</tr> </tr>
<% } %> <% } %>
<tr> <tr>
<td>Room Name:</td> <td><fmt:message key="muc.room.edit.form.room_name" />:</td>
<td><input type="text" name="roomconfig_roomname" value="<%= (naturalName == null ? "" : naturalName) %>"> <td><input type="text" name="roomconfig_roomname" value="<%= (naturalName == null ? "" : naturalName) %>">
<% if (errors.get("roomconfig_roomname") != null) { %> <% if (errors.get("roomconfig_roomname") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
Please enter a valid name. <fmt:message key="muc.room.edit.form.valid_hint_name" />
</span> </span>
<% } %> <% } %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Description:</td> <td><fmt:message key="muc.room.edit.form.description" />:</td>
<td><input name="roomconfig_roomdesc" value="<%= (description == null ? "" : description) %>" type="text" size="40"> <td><input name="roomconfig_roomdesc" value="<%= (description == null ? "" : description) %>" type="text" size="40">
<% if (errors.get("roomconfig_roomdesc") != null) { %> <% if (errors.get("roomconfig_roomdesc") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
Please enter a valid description. <fmt:message key="muc.room.edit.form.valid_hint_description" />
</span> </span>
<% } %> <% } %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Topic:</td> <td><fmt:message key="muc.room.edit.form.topic" />:</td>
<td><input name="room_topic" value="<%= (roomSubject == null ? "" : roomSubject) %>" type="text" size="40"> <td><input name="room_topic" value="<%= (roomSubject == null ? "" : roomSubject) %>" type="text" size="40">
<% if (errors.get("room_topic") != null) { %> <% if (errors.get("room_topic") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
Please enter a valid subject. <fmt:message key="muc.room.edit.form.valid_hint_subject" />
</span> </span>
<% } %> <% } %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Maximun Room Occupants:</td> <td><fmt:message key="muc.room.edit.form.max_room" />:</td>
<td><select name="roomconfig_maxusers"> <td><select name="roomconfig_maxusers">
<option value="10" <% if ("10".equals(maxUsers)) out.write("selected");%>>10</option> <option value="10" <% if ("10".equals(maxUsers)) out.write("selected");%>>10</option>
<option value="20" <% if ("20".equals(maxUsers)) out.write("selected");%>>20</option> <option value="20" <% if ("20".equals(maxUsers)) out.write("selected");%>>20</option>
<option value="30" <% if ("30".equals(maxUsers)) out.write("selected");%>>30</option> <option value="30" <% if ("30".equals(maxUsers)) out.write("selected");%>>30</option>
<option value="40" <% if ("40".equals(maxUsers)) out.write("selected");%>>40</option> <option value="40" <% if ("40".equals(maxUsers)) out.write("selected");%>>40</option>
<option value="50" <% if ("50".equals(maxUsers)) out.write("selected");%>>50</option> <option value="50" <% if ("50".equals(maxUsers)) out.write("selected");%>>50</option>
<option value="0" <% if ("0".equals(maxUsers)) out.write("selected");%>>None</option> <option value="0" <% if ("0".equals(maxUsers)) out.write("selected");%>><fmt:message key="muc.room.edit.form.none" /></option>
</select> </select>
<% if (errors.get("roomconfig_maxusers") != null) { %> <% if (errors.get("roomconfig_maxusers") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
Please select the maximun room occupants. <fmt:message key="muc.room.edit.form.valid_hint_max_room" />
</span> </span>
<% } %> <% } %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td valign="top">Roles for Which Presence is Broadcast:</td> <td valign="top"><fmt:message key="muc.room.edit.form.broadcast" />:</td>
<td><fieldset> <td><fieldset>
<input name="roomconfig_presencebroadcast" type="checkbox" value="true" id="moderator" <% if ("true".equals(broadcastModerator)) out.write("checked");%>> <input name="roomconfig_presencebroadcast" type="checkbox" value="true" id="moderator" <% if ("true".equals(broadcastModerator)) out.write("checked");%>>
<LABEL FOR="moderator">Moderator</LABEL> <LABEL FOR="moderator"><fmt:message key="muc.room.edit.form.moderator" /></LABEL>
<input name="roomconfig_presencebroadcast2" type="checkbox" value="true" id="participant" <% if ("true".equals(broadcastParticipant)) out.write("checked");%>> <input name="roomconfig_presencebroadcast2" type="checkbox" value="true" id="participant" <% if ("true".equals(broadcastParticipant)) out.write("checked");%>>
<LABEL FOR="participant">Participant</LABEL> <LABEL FOR="participant"><fmt:message key="muc.room.edit.form.participant" /></LABEL>
<input name="roomconfig_presencebroadcast3" type="checkbox" value="true" id="visitor" <% if ("true".equals(broadcastVisitor)) out.write("checked");%>> <input name="roomconfig_presencebroadcast3" type="checkbox" value="true" id="visitor" <% if ("true".equals(broadcastVisitor)) out.write("checked");%>>
<LABEL FOR="visitor">Visitor</LABEL> <LABEL FOR="visitor"><fmt:message key="muc.room.edit.form.visitor" /></LABEL>
</fieldset></td> </fieldset></td>
</tr> </tr>
<tr> <tr>
<td>Password required to enter:</td> <td><fmt:message key="muc.room.edit.form.required_password" />:</td>
<td><input type="password" name="roomconfig_roomsecret" <% if(password != null) { %> value="<%= password %>" <% } %>></td> <td><input type="password" name="roomconfig_roomsecret" <% if(password != null) { %> value="<%= password %>" <% } %>></td>
</tr> </tr>
<tr> <tr>
<td>Confirm password:</td> <td><fmt:message key="muc.room.edit.form.confirm_password" />:</td>
<td><input type="password" name="roomconfig_roomsecret2" <% if(confirmPassword != null) { %> value="<%= confirmPassword %>" <% } %>> <td><input type="password" name="roomconfig_roomsecret2" <% if(confirmPassword != null) { %> value="<%= confirmPassword %>" <% } %>>
<% if (errors.get("roomconfig_roomsecret2") != null) { %> <% if (errors.get("roomconfig_roomsecret2") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
Please make sure to enter the same new password. <fmt:message key="muc.room.edit.form.new_password" />
</span> </span>
<% } %> <% } %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Role that May Discover Real JIDs of Occupants:</td> <td><fmt:message key="muc.room.edit.form.discover_jid" />:</td>
<td><select name="roomconfig_whois"> <td><select name="roomconfig_whois">
<option value="moderator" <% if ("moderator".equals(whois)) out.write("selected");%>>Moderator</option> <option value="moderator" <% if ("moderator".equals(whois)) out.write("selected");%>><fmt:message key="muc.room.edit.form.moderator" /></option>
<option value="anyone" <% if ("anyone".equals(whois)) out.write("selected");%>>Anyone</option> <option value="anyone" <% if ("anyone".equals(whois)) out.write("selected");%>><fmt:message key="muc.room.edit.form.anyone" /></option>
</select> </select>
<% if (errors.get("roomconfig_whois") != null) { %> <% if (errors.get("roomconfig_whois") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
Please select a role. <fmt:message key="muc.room.edit.form.role" />
</span> </span>
<% } %> <% } %>
...@@ -492,32 +493,32 @@ ...@@ -492,32 +493,32 @@
</table></td> </table></td>
<td width="30%" valign="top" > <td width="30%" valign="top" >
<fieldset> <fieldset>
<legend>Room Options</legend> <legend><fmt:message key="muc.room.edit.form.room_options" /></legend>
<table width="100%" border="0"> <table width="100%" border="0">
<tbody> <tbody>
<tr> <tr>
<td><input type="checkbox" name="roomconfig_publicroom" value="true" id="public" <% if ("true".equals(publicRoom)) out.write("checked");%>> <td><input type="checkbox" name="roomconfig_publicroom" value="true" id="public" <% if ("true".equals(publicRoom)) out.write("checked");%>>
<LABEL FOR="public">List Room in Directory</LABEL></td> <LABEL FOR="public"><fmt:message key="muc.room.edit.form.list_room" /></LABEL></td>
</tr> </tr>
<tr> <tr>
<td><input type="checkbox" name="roomconfig_moderatedroom" value="true" id="moderated" <% if ("true".equals(moderatedRoom)) out.write("checked");%>> <td><input type="checkbox" name="roomconfig_moderatedroom" value="true" id="moderated" <% if ("true".equals(moderatedRoom)) out.write("checked");%>>
<LABEL FOR="moderated">Make Room Moderated</LABEL></td> <LABEL FOR="moderated"><fmt:message key="muc.room.edit.form.room_moderated" /></LABEL></td>
</tr> </tr>
<tr> <tr>
<td><input type="checkbox" name="roomconfig_membersonly" value="true" id="membersOnly" <% if ("true".equals(membersOnly)) out.write("checked");%>> <td><input type="checkbox" name="roomconfig_membersonly" value="true" id="membersOnly" <% if ("true".equals(membersOnly)) out.write("checked");%>>
<LABEL FOR="membersOnly">Make Room Members-only</LABEL></td> <LABEL FOR="membersOnly"><fmt:message key="muc.room.edit.form.moderated_member_only" /></LABEL></td>
</tr> </tr>
<tr> <tr>
<td><input type="checkbox" name="roomconfig_allowinvites" value="true" id="allowinvites" <% if ("true".equals(allowInvites)) out.write("checked");%>> <td><input type="checkbox" name="roomconfig_allowinvites" value="true" id="allowinvites" <% if ("true".equals(allowInvites)) out.write("checked");%>>
<LABEL FOR="allowinvites">Allow Occupants to invite Others</LABEL></td> <LABEL FOR="allowinvites"><fmt:message key="muc.room.edit.form.invite_other" /></LABEL></td>
</tr> </tr>
<tr> <tr>
<td><input type="checkbox" name="roomconfig_changesubject" value="true" id="changesubject" <% if ("true".equals(changeSubject)) out.write("checked");%>> <td><input type="checkbox" name="roomconfig_changesubject" value="true" id="changesubject" <% if ("true".equals(changeSubject)) out.write("checked");%>>
<LABEL FOR="changesubject">Allow Occupants to change Subject</LABEL></td> <LABEL FOR="changesubject"><fmt:message key="muc.room.edit.form.change_subject" /></LABEL></td>
</tr> </tr>
<tr> <tr>
<td><input type="checkbox" name="roomconfig_enablelogging" value="true" id="enablelogging" <% if ("true".equals(enableLog)) out.write("checked");%>> <td><input type="checkbox" name="roomconfig_enablelogging" value="true" id="enablelogging" <% if ("true".equals(enableLog)) out.write("checked");%>>
<LABEL FOR="enablelogging">Log Room Conversations</td> <LABEL FOR="enablelogging"><fmt:message key="muc.room.edit.form.log" /></td>
</tr> </tr>
</table> </table>
</fieldset> </fieldset>
......
src/web/muc-room-summary.jsp
View file @ 4e6e9efa
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Group Chat Rooms"; String title = LocaleUtils.getLocalizedString("muc.room.summary.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-room-summary.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-room-summary.jsp"));
...@@ -56,8 +56,7 @@ ...@@ -56,8 +56,7 @@
%> %>
<p> <p>
Below is an overview of the Group Chat Rooms in the system. From here you can view the rooms, edit their <fmt:message key="muc.room.summary.info" />
properties, and create new rooms.
</p> </p>
<% if (request.getParameter("deletesuccess") != null) { %> <% if (request.getParameter("deletesuccess") != null) { %>
...@@ -67,7 +66,7 @@ properties, and create new rooms. ...@@ -67,7 +66,7 @@ properties, and create new rooms.
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Room destroyed successfully. <fmt:message key="muc.room.summary.destroyed" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -76,19 +75,19 @@ properties, and create new rooms. ...@@ -76,19 +75,19 @@ properties, and create new rooms.
<% } %> <% } %>
<p> <p>
Total Rooms: <%= roomsCount %>, <fmt:message key="muc.room.summary.total_room" />: <%= roomsCount %>,
<% if (numPages > 1) { %> <% if (numPages > 1) { %>
Showing <%= (start+1) %>-<%= (maxRoomIndex) %>, <fmt:message key="muc.room.summary.showing" /> <%= (start+1) %>-<%= (maxRoomIndex) %>,
<% } %> <% } %>
Sorted by Room ID <fmt:message key="muc.room.summary.sorted_id" />
</p> </p>
<% if (numPages > 1) { %> <% if (numPages > 1) { %>
<p> <p>
Pages: <fmt:message key="muc.room.summary.page" />:
[ [
<% for (int i=0; i<numPages; i++) { <% for (int i=0; i<numPages; i++) {
String sep = ((i+1)<numPages) ? " " : ""; String sep = ((i+1)<numPages) ? " " : "";
...@@ -109,12 +108,12 @@ Sorted by Room ID ...@@ -109,12 +108,12 @@ Sorted by Room ID
<thead> <thead>
<tr> <tr>
<th>&nbsp;</th> <th>&nbsp;</th>
<th>Room</th> <th><fmt:message key="muc.room.summary.room" /></th>
<th>Description</th> <th><fmt:message key="muc.room.summary.description" /></th>
<th>Persistent</th> <th><fmt:message key="muc.room.summary.persistent" /></th>
<th>Users</th> <th><fmt:message key="muc.room.summary.users" /></th>
<th>Edit</th> <th><fmt:message key="muc.room.summary.edit" /></th>
<th>Destroy</th> <th><fmt:message key="muc.room.summary.destroy" /></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -125,7 +124,7 @@ Sorted by Room ID ...@@ -125,7 +124,7 @@ Sorted by Room ID
%> %>
<tr> <tr>
<td align="center" colspan="7"> <td align="center" colspan="7">
No rooms in the Group Chat service. <fmt:message key="muc.room.summary.no_room_in_group" />
</td> </td>
</tr> </tr>
...@@ -153,9 +152,9 @@ Sorted by Room ID ...@@ -153,9 +152,9 @@ Sorted by Room ID
</td> </td>
<td width="1%" align="center"> <td width="1%" align="center">
<% if (room.isPersistent()) { %> <% if (room.isPersistent()) { %>
<img src="images/tape.gif" width="16" height="16" border="0" alt="Room is persistent"> <img src="images/tape.gif" width="16" height="16" border="0" alt="<fmt:message key="muc.room.summary.alt_persistent" />">
<% } else { %> <% } else { %>
<img src="images/blank.gif" width="16" height="16" border="0" alt="Room is temporary"> <img src="images/blank.gif" width="16" height="16" border="0" alt="<fmt:message key="muc.room.summary.alt_temporary" />">
<% } %> <% } %>
</td> </td>
<td width="1%" align="center"> <td width="1%" align="center">
...@@ -163,12 +162,12 @@ Sorted by Room ID ...@@ -163,12 +162,12 @@ Sorted by Room ID
</td> </td>
<td width="1%" align="center"> <td width="1%" align="center">
<a href="muc-room-edit-form.jsp?roomName=<%= room.getName() %>" <a href="muc-room-edit-form.jsp?roomName=<%= room.getName() %>"
title="Click to edit..." title="<fmt:message key="muc.room.summary.click_edit" />"
><img src="images/edit-16x16.gif" width="17" height="17" border="0"></a> ><img src="images/edit-16x16.gif" width="17" height="17" border="0"></a>
</td> </td>
<td width="1%" align="center" style="border-right:1px #ccc solid;"> <td width="1%" align="center" style="border-right:1px #ccc solid;">
<a href="muc-room-delete.jsp?roomName=<%= room.getName() %>" <a href="muc-room-delete.jsp?roomName=<%= room.getName() %>"
title="Click to delete..." title="<fmt:message key="muc.room.summary.click_delete" />"
><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a> ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
</td> </td>
</tr> </tr>
...@@ -183,7 +182,7 @@ Sorted by Room ID ...@@ -183,7 +182,7 @@ Sorted by Room ID
<% if (numPages > 1) { %> <% if (numPages > 1) { %>
<p> <p>
Pages: <fmt:message key="muc.room.summary.page" />:
[ [
<% for (i=0; i<numPages; i++) { <% for (i=0; i<numPages; i++) {
String sep = ((i+1)<numPages) ? " " : ""; String sep = ((i+1)<numPages) ? " " : "";
......
src/web/muc-server-props-edit-form.jsp
View file @ 4e6e9efa
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
<fmt:message key="groupchat.service.properties.saved_successfully" /> <fmt:message key="groupchat.service.properties.saved_successfully" /> <b><fmt:message key="global.restart" /></b> <fmt:message key="groupchat.service.properties.saved_successfully2" /> <a href="index.jsp"><fmt:message key="global.server_status" /></a>).
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
......
src/web/muc-tasks.jsp
View file @ 4e6e9efa
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %> <% admin.init(request, response, session, application, out ); %>
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Other Settings"; String title = LocaleUtils.getLocalizedString("muc.tasks.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Other Settings", "muc-tasks.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Other Settings", "muc-tasks.jsp"));
...@@ -118,8 +118,7 @@ ...@@ -118,8 +118,7 @@
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<p> <p>
Use the forms below to configure settings for kicking idle users from group chat rooms and to <fmt:message key="muc.tasks.info" />
configure the task that logs room conversations to the database.
</p> </p>
<% if (kickSettingSuccess || logSettingSuccess) { %> <% if (kickSettingSuccess || logSettingSuccess) { %>
...@@ -131,11 +130,11 @@ configure the task that logs room conversations to the database. ...@@ -131,11 +130,11 @@ configure the task that logs room conversations to the database.
<td class="jive-icon-label"> <td class="jive-icon-label">
<% if (kickSettingSuccess) { %> <% if (kickSettingSuccess) { %>
Idle user settings updated successfully. <fmt:message key="muc.tasks.update" />
<% } else if (logSettingSuccess) { %> <% } else if (logSettingSuccess) { %>
Conversation logging settings updated successfully. <fmt:message key="muc.tasks.log" />
<% } %> <% } %>
</td></tr> </td></tr>
...@@ -152,13 +151,13 @@ configure the task that logs room conversations to the database. ...@@ -152,13 +151,13 @@ configure the task that logs room conversations to the database.
<td width="99%" class="jive-error-text"> <td width="99%" class="jive-error-text">
<% if (errors.get("idletime") != null) { %> <% if (errors.get("idletime") != null) { %>
Please enter a valid number for max idle minutes. <fmt:message key="muc.tasks.valid_idel_minutes" />
<% } <% }
else if (errors.get("logfreq") != null) { %> else if (errors.get("logfreq") != null) { %>
Please enter a valid number for the frequency. <fmt:message key="muc.tasks.valid_frequency" />
<% } <% }
else if (errors.get("logbatchsize") != null) { %> else if (errors.get("logbatchsize") != null) { %>
Please enter a valid number for the batch size. <fmt:message key="muc.tasks.valid_batch" />
<% } %> <% } %>
</td> </td>
</tr> </tr>
...@@ -169,7 +168,7 @@ configure the task that logs room conversations to the database. ...@@ -169,7 +168,7 @@ configure the task that logs room conversations to the database.
<form action="muc-tasks.jsp?kickSettings" method="post"> <form action="muc-tasks.jsp?kickSettings" method="post">
<fieldset> <fieldset>
<legend>Idle User Settings</legend> <legend><fmt:message key="muc.tasks.user_setting" /></legend>
<div> <div>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
...@@ -179,7 +178,7 @@ configure the task that logs room conversations to the database. ...@@ -179,7 +178,7 @@ configure the task that logs room conversations to the database.
<%= ((mucServer.getUserIdleTime() < 0) ? "checked" : "") %>> <%= ((mucServer.getUserIdleTime() < 0) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb01">Never kick idle users.</label> <label for="rb01"><fmt:message key="muc.tasks.never_kick" /></label>
</td> </td>
</tr> </tr>
<tr valign="middle"> <tr valign="middle">
...@@ -188,11 +187,11 @@ configure the task that logs room conversations to the database. ...@@ -188,11 +187,11 @@ configure the task that logs room conversations to the database.
<%= ((mucServer.getUserIdleTime() > -1) ? "checked" : "") %>> <%= ((mucServer.getUserIdleTime() > -1) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb02">Kick users after they have been idle for</label> <label for="rb02"><fmt:message key="muc.tasks.kick_user" /></label>
<input type="text" name="idletime" size="5" maxlength="5" <input type="text" name="idletime" size="5" maxlength="5"
onclick="this.form.kickEnabled[1].checked=true;" onclick="this.form.kickEnabled[1].checked=true;"
value="<%= mucServer.getUserIdleTime() == -1 ? 30 : mucServer.getUserIdleTime() / 1000 / 60 %>"> value="<%= mucServer.getUserIdleTime() == -1 ? 30 : mucServer.getUserIdleTime() / 1000 / 60 %>">
minutes. <fmt:message key="muc.tasks.minutes" />
</td> </td>
</tr> </tr>
</tbody> </tbody>
...@@ -211,12 +210,12 @@ configure the task that logs room conversations to the database. ...@@ -211,12 +210,12 @@ configure the task that logs room conversations to the database.
<form action="muc-tasks.jsp?logSettings" method="post"> <form action="muc-tasks.jsp?logSettings" method="post">
<fieldset> <fieldset>
<legend>Conversation Logging</legend> <legend><fmt:message key="muc.tasks.conversation.logging" /></legend>
<div> <div>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tr valign="middle"> <tr valign="middle">
<td width="1%" nowrap class="c1"> <td width="1%" nowrap class="c1">
Flush interval (seconds): <fmt:message key="muc.tasks.flush" />
</td> </td>
<td width="99%"> <td width="99%">
<input type="text" name="logfreq" size="15" maxlength="50" <input type="text" name="logfreq" size="15" maxlength="50"
...@@ -225,7 +224,7 @@ configure the task that logs room conversations to the database. ...@@ -225,7 +224,7 @@ configure the task that logs room conversations to the database.
</tr> </tr>
<tr valign="middle"> <tr valign="middle">
<td width="1%" nowrap class="c1"> <td width="1%" nowrap class="c1">
Batch size: <fmt:message key="muc.tasks.batch" />
</td> </td>
<td width="99%"> <td width="99%">
<input type="text" name="logbatchsize" size="15" maxlength="50" <input type="text" name="logbatchsize" size="15" maxlength="50"
......
src/web/offline-messages.jsp
View file @ 4e6e9efa
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Offline Messages"; String title = LocaleUtils.getLocalizedString("offline.messages.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "offline-messages.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "offline-messages.jsp"));
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Settings updated successfully. <fmt:message key="offline.messages.update" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -185,22 +185,18 @@ ...@@ -185,22 +185,18 @@
<% } %> <% } %>
<p> <p>
XMPP provides the option for servers to store-and-forward IM messages when they are sent to a <fmt:message key="offline.messages.info" />
user that is not logged in. Supporting store-and-forward of 'offline messages' can be a very convenient
feature of an XMPP deployment. However, offline messages, like email, can take up a significant
amount of space on a server. There are several options for handling offline messages; select
the policy that best suites your needs.
</p> </p>
<p> <p>
Current size of all offline message: <fmt:message key="offline.messages.size" />
<b><%= format.format(OfflineMessageStore.getInstance().getSize()/1024.0/1024.0) %> MB</b> <b><%= format.format(OfflineMessageStore.getInstance().getSize()/1024.0/1024.0) %> MB</b>
</p> </p>
<form action="offline-messages.jsp"> <form action="offline-messages.jsp">
<fieldset> <fieldset>
<legend>Offline Message Policy</legend> <legend><fmt:message key="offline.messages.policy" /></legend>
<div> <div>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
...@@ -210,8 +206,7 @@ Current size of all offline message: ...@@ -210,8 +206,7 @@ Current size of all offline message:
<%= ((strategy==BOUNCE) ? "checked" : "") %>> <%= ((strategy==BOUNCE) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb01"><b>Bounce</b></label> - Never store offline messages and bounce <label for="rb01"><b>Bounce</b></label> - <fmt:message key="offline.messages.never_back" />
messages back to the sender.
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
...@@ -220,8 +215,7 @@ Current size of all offline message: ...@@ -220,8 +215,7 @@ Current size of all offline message:
<%= ((strategy==DROP) ? "checked" : "") %>> <%= ((strategy==DROP) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb02"><b>Drop</b></label> - Never store offline messages and drop <label for="rb02"><b>Drop</b></label> - <fmt:message key="offline.messages.never_store" />
messages so the sender is not notified.
</td> </td>
</tr> </tr>
<tr valign="top" class=""> <tr valign="top" class="">
...@@ -230,9 +224,7 @@ Current size of all offline message: ...@@ -230,9 +224,7 @@ Current size of all offline message:
<%= ((strategy==STORE) ? "checked" : "") %>> <%= ((strategy==STORE) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb03"><b>Store</b></label> - Store offline messages for later <label for="rb03"><b>Store</b></label> - <fmt:message key="offline.messages.storage_messenger" />
retrieval. Messages will be delivered the next time the recipient logs in.
Choose a storage policy and storage store max size below.
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
...@@ -249,8 +241,7 @@ Current size of all offline message: ...@@ -249,8 +241,7 @@ Current size of all offline message:
<%= ((storeStrategy==ALWAYS_STORE) ? "checked" : "") %>> <%= ((storeStrategy==ALWAYS_STORE) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb05"><b>Always Store</b></label> - Always store messages, <label for="rb05"><b><fmt:message key="offline.messages.always_store" /></b></label> - <fmt:message key="offline.messages.always_store_info" />
even if the max storage size has been exceeded.
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
...@@ -260,9 +251,7 @@ Current size of all offline message: ...@@ -260,9 +251,7 @@ Current size of all offline message:
<%= ((storeStrategy==STORE_AND_BOUNCE) ? "checked" : "") %>> <%= ((storeStrategy==STORE_AND_BOUNCE) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb06"><b>Store or Bounce</b></label> - Store messages <label for="rb06"><b><fmt:message key="offline.messages.bounce" /></b></label> - <fmt:message key="offline.messages.bounce_info" />
up to the max storage size. After the max size has been exceeded, bounce
the message back to the sender.
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
...@@ -272,14 +261,12 @@ Current size of all offline message: ...@@ -272,14 +261,12 @@ Current size of all offline message:
<%= ((storeStrategy==STORE_AND_DROP) ? "checked" : "") %>> <%= ((storeStrategy==STORE_AND_DROP) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb07"><b>Store or Drop</b></label> - Store messages <label for="rb07"><b><fmt:message key="offline.messages.drop" /></b></label> - <fmt:message key="offline.messages.drop_info" />
for a user up to the max storage size. After the max size has been exceeded,
silently drop messages.
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
Per-user offline message storage limit: <fmt:message key="offline.messages.storage_limit" />
<input type="text" size="5" maxlength="12" name="quota" <input type="text" size="5" maxlength="12" name="quota"
value="<%= (quota>0 ? ""+format.format(quota) : "") %>" value="<%= (quota>0 ? ""+format.format(quota) : "") %>"
onclick="this.form.strategy[2].checked=true;"> onclick="this.form.strategy[2].checked=true;">
......
src/web/private-data-settings.jsp
View file @ 4e6e9efa
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %> <% admin.init(request, response, session, application, out ); %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Private Data"; String title = LocaleUtils.getLocalizedString("private.data.settings.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "private-data-settings.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "private-data-settings.jsp"));
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Settings updated successfully. <fmt:message key="private.data.settings.update" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -64,16 +64,13 @@ ...@@ -64,16 +64,13 @@
%> %>
<p> <p>
Private data storage allows XMPP clients to store settings, bookmarks, etc. on the server. Users <fmt:message key="private.data.settings.info" />
can log into their account and their settings will follow them around (as opposed to having the
clients store the settings on the local computer where their settings will not follow them). You
may enable or disable this feature.
</p> </p>
<form action="private-data-settings.jsp"> <form action="private-data-settings.jsp">
<fieldset> <fieldset>
<legend>Set Private Data Policy</legend> <legend><fmt:message key="private.data.settings.policy" /></legend>
<div> <div>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
...@@ -84,7 +81,8 @@ may enable or disable this feature. ...@@ -84,7 +81,8 @@ may enable or disable this feature.
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb01"> <label for="rb01">
<b>Enable Private Data Storage</b> - allow clients to store information on the server. <b><fmt:message key="private.data.settings.enable_storage" /></b> -
<fmt:message key="private.data.settings.enable_storage_info" />
</label> </label>
</td> </td>
</tr> </tr>
...@@ -95,7 +93,8 @@ may enable or disable this feature. ...@@ -95,7 +93,8 @@ may enable or disable this feature.
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb02"> <label for="rb02">
<b>Disable Private Data Storage</b> - do not allow server-side storage. <b><fmt:message key="private.data.settings.disable_storage" /></b> -
<fmt:message key="private.data.settings.disable_storage_info" />
</label> </label>
</td> </td>
</tr> </tr>
......
src/web/reg-settings.jsp
View file @ 4e6e9efa
...@@ -12,18 +12,19 @@ ...@@ -12,18 +12,19 @@
<%@ page import="org.jivesoftware.util.ParamUtils, <%@ page import="org.jivesoftware.util.ParamUtils,
org.jivesoftware.messenger.handler.IQRegisterHandler, org.jivesoftware.messenger.handler.IQRegisterHandler,
org.jivesoftware.messenger.handler.IQAuthHandler, org.jivesoftware.messenger.handler.IQAuthHandler,
org.jivesoftware.admin.AdminPageBean" org.jivesoftware.admin.AdminPageBean,
org.jivesoftware.util.LocaleUtils"
errorPage="error.jsp" errorPage="error.jsp"
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %> <% admin.init(request, response, session, application, out ); %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Registration Settings"; String title = LocaleUtils.getLocalizedString("reg.settings.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "reg-settings.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "reg-settings.jsp"));
...@@ -58,7 +59,7 @@ ...@@ -58,7 +59,7 @@
%> %>
<p> <p>
Use the forms below to change various aspects of user registration and login. <fmt:message key="reg.settings.info" />
</p> </p>
<form action="reg-settings.jsp"> <form action="reg-settings.jsp">
...@@ -70,7 +71,7 @@ Use the forms below to change various aspects of user registration and login. ...@@ -70,7 +71,7 @@ Use the forms below to change various aspects of user registration and login.
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Settings updated successfully. <fmt:message key="reg.settings.update" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -79,14 +80,10 @@ Use the forms below to change various aspects of user registration and login. ...@@ -79,14 +80,10 @@ Use the forms below to change various aspects of user registration and login.
</c:if> </c:if>
<fieldset> <fieldset>
<legend>Inband Account Registration</legend> <legend><fmt:message key="reg.settings.inband_account" /></legend>
<div> <div>
<p> <p>
Inband account registration allows users to create accounts on the server automatically using most <fmt:message key="reg.settings.inband_account_info" />
clients. It does not affect the ability to create new accounts through this web administration
interface. Administrators may want to disable this option so users are required to register by
other means (e.g. sending requests to the server administrator or through your own custom web
interface).
</p> </p>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
...@@ -96,7 +93,8 @@ Use the forms below to change various aspects of user registration and login. ...@@ -96,7 +93,8 @@ Use the forms below to change various aspects of user registration and login.
<%= ((inbandEnabled) ? "checked" : "") %>> <%= ((inbandEnabled) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb01"><b>Enabled</b></label> - Users can automatically create new accounts. <label for="rb01"><b><fmt:message key="reg.settings.enable" /></b></label> -
<fmt:message key="reg.settings.auto_create_user" />
</td> </td>
</tr> </tr>
<tr> <tr>
......
src/web/server-db.jsp
View file @ 4e6e9efa
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<%-- Define Administration Bean --%> <%-- Define Administration Bean --%>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<% admin.init(request, response, session, application, out ); %> <% admin.init(request, response, session, application, out ); %>
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Database Properties"; String title = LocaleUtils.getLocalizedString("server.db.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "server-db.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "server-db.jsp"));
...@@ -42,20 +42,20 @@ ...@@ -42,20 +42,20 @@
%> %>
<p> <p>
Below is a list of properties for your database and the JDBC driver. <fmt:message key="server.db.info" />
</p> </p>
<div class="jive-table"> <div class="jive-table">
<table cellpadding="0" cellspacing="0" border="0" width="100%"> <table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead> <thead>
<tr> <tr>
<th colspan="2">Database Connection Info</th> <th colspan="2"><fmt:message key="server.db.connect_info" /></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td class="c1"> <td class="c1">
Database and Version: <fmt:message key="server.db.version" />
</td> </td>
<td class="c2"> <td class="c2">
<%= metaData.getDatabaseProductName() %> <%= metaData.getDatabaseProductName() %>
...@@ -64,7 +64,7 @@ Below is a list of properties for your database and the JDBC driver. ...@@ -64,7 +64,7 @@ Below is a list of properties for your database and the JDBC driver.
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
JDBC Driver: <fmt:message key="server.db.jdbc" />
</td> </td>
<td class="c2"> <td class="c2">
<%= metaData.getDriverName() %> <%= metaData.getDriverName() %>
...@@ -72,7 +72,7 @@ Below is a list of properties for your database and the JDBC driver. ...@@ -72,7 +72,7 @@ Below is a list of properties for your database and the JDBC driver.
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
JDBC Driver Version: <fmt:message key="server.db.jdbc_driver" />
</td> </td>
<td class="c2"> <td class="c2">
<%= metaData.getDriverVersion() %> <%= metaData.getDriverVersion() %>
...@@ -80,7 +80,7 @@ Below is a list of properties for your database and the JDBC driver. ...@@ -80,7 +80,7 @@ Below is a list of properties for your database and the JDBC driver.
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
DB Connection URL: <fmt:message key="server.db.connect_url" />
</td> </td>
<td class="c2"> <td class="c2">
<%= metaData.getURL() %> <%= metaData.getURL() %>
...@@ -88,7 +88,7 @@ Below is a list of properties for your database and the JDBC driver. ...@@ -88,7 +88,7 @@ Below is a list of properties for your database and the JDBC driver.
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
DB User: <fmt:message key="server.db.user" />
</td> </td>
<td class="c2"> <td class="c2">
<%= metaData.getUserName() %> <%= metaData.getUserName() %>
...@@ -96,7 +96,7 @@ Below is a list of properties for your database and the JDBC driver. ...@@ -96,7 +96,7 @@ Below is a list of properties for your database and the JDBC driver.
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Transaction Support: <fmt:message key="server.db.transaction" />
</td> </td>
<td class="c2"> <td class="c2">
<%= (metaData.supportsTransactions()) ? "Yes" : "No" %> <%= (metaData.supportsTransactions()) ? "Yes" : "No" %>
...@@ -105,7 +105,7 @@ Below is a list of properties for your database and the JDBC driver. ...@@ -105,7 +105,7 @@ Below is a list of properties for your database and the JDBC driver.
<% if (metaData.supportsTransactions()) { %> <% if (metaData.supportsTransactions()) { %>
<tr> <tr>
<td class="c1"> <td class="c1">
Transaction Isolation Level: <fmt:message key="server.db.transaction_level" />
</td> </td>
<td class="c2"> <td class="c2">
<% if (con.getTransactionIsolation() == Connection.TRANSACTION_NONE) { %> <% if (con.getTransactionIsolation() == Connection.TRANSACTION_NONE) { %>
...@@ -134,7 +134,8 @@ Below is a list of properties for your database and the JDBC driver. ...@@ -134,7 +134,8 @@ Below is a list of properties for your database and the JDBC driver.
<% } %> <% } %>
<tr> <tr>
<td class="c1"> <td class="c1">
Supports multiple connections<br>open at once: <fmt:message key="server.db.multiple_connect" /><br>
<fmt:message key="server.db.multiple_connect2" />
</td> </td>
<td class="c2"> <td class="c2">
<%= (metaData.supportsMultipleTransactions()) ? "Yes" : "No" %> <%= (metaData.supportsMultipleTransactions()) ? "Yes" : "No" %>
...@@ -142,7 +143,7 @@ Below is a list of properties for your database and the JDBC driver. ...@@ -142,7 +143,7 @@ Below is a list of properties for your database and the JDBC driver.
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
In read-only mode: <fmt:message key="server.db.read_only_mode" />
</td> </td>
<td class="c2"> <td class="c2">
<%= (metaData.isReadOnly()) ? "Yes" : "No" %> <%= (metaData.isReadOnly()) ? "Yes" : "No" %>
......
src/web/server-properties.jsp
View file @ 4e6e9efa
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
org.jivesoftware.admin.AdminPageBean" org.jivesoftware.admin.AdminPageBean"
errorPage="error.jsp" errorPage="error.jsp"
%> %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<%! <%!
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
%> %>
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "System Properties"; String title = LocaleUtils.getLocalizedString("server.properties.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "server-properties.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "server-properties.jsp"));
...@@ -114,13 +114,10 @@ ...@@ -114,13 +114,10 @@
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<p> <p>
Below is a list of the system properties. Values for password sensitive fields are hidden. <fmt:message key="server.properties.info" />
Long property names and values are clipped. Hold your mouse over the property name to see
the full value or to see both the full name and value, click the edit icon next to the
property.
</p> </p>
<p><b>System Properties</b></p> <p><b><fmt:message key="server.properties.system" /></b></p>
<% if (errors.size() > 0) { %> <% if (errors.size() > 0) { %>
...@@ -129,7 +126,7 @@ property. ...@@ -129,7 +126,7 @@ property.
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Error -- creating the property failed, see below. <fmt:message key="server.properties.error" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -142,7 +139,7 @@ property. ...@@ -142,7 +139,7 @@ property.
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Property saved successfully. <fmt:message key="server.properties.saved" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -155,7 +152,7 @@ property. ...@@ -155,7 +152,7 @@ property.
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Property deleted successfully. <fmt:message key="server.properties.deleted" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -170,7 +167,7 @@ property. ...@@ -170,7 +167,7 @@ property.
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/info-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/info-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Use the form below this table to edit the property value. <fmt:message key="server.properties.edit_property" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -185,7 +182,7 @@ property. ...@@ -185,7 +182,7 @@ property.
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Error deleting the property. <fmt:message key="server.properties.error_deleting" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -231,10 +228,10 @@ function dodelete(propName) { ...@@ -231,10 +228,10 @@ function dodelete(propName) {
<table cellpadding="0" cellspacing="0" border="0" width="100%"> <table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead> <thead>
<tr> <tr>
<th nowrap>Property Name</th> <th nowrap><fmt:message key="server.properties.name" /></th>
<th nowrap>Property Value</th> <th nowrap><fmt:message key="server.properties.value" /></th>
<th style="text-align:center;">Edit</th> <th style="text-align:center;"><fmt:message key="server.properties.edit" /></th>
<th style="text-align:center;">Delete</th> <th style="text-align:center;"><fmt:message key="server.properties.delete" /></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -243,7 +240,7 @@ function dodelete(propName) { ...@@ -243,7 +240,7 @@ function dodelete(propName) {
<tr> <tr>
<td colspan="4"> <td colspan="4">
No properties set. <fmt:message key="server.properties.no_property" />
</td> </td>
</tr> </tr>
...@@ -273,11 +270,11 @@ function dodelete(propName) { ...@@ -273,11 +270,11 @@ function dodelete(propName) {
</div> </div>
</td> </td>
<td align="center"><a href="#" onclick="doedit('<%= StringUtils.replace(n,"'","''") %>');" <td align="center"><a href="#" onclick="doedit('<%= StringUtils.replace(n,"'","''") %>');"
><img src="images/edit-16x16.gif" width="16" height="16" alt="Click to edit this property" border="0"></a ><img src="images/edit-16x16.gif" width="16" height="16" alt="<fmt:message key="server.properties.alt_edit" />" border="0"></a
> >
</td> </td>
<td align="center"><a href="#" onclick="return dodelete('<%= StringUtils.replace(n,"'","''") %>');" <td align="center"><a href="#" onclick="return dodelete('<%= StringUtils.replace(n,"'","''") %>');"
><img src="images/delete-16x16.gif" width="16" height="16" alt="Click to delete this property" border="0"></a ><img src="images/delete-16x16.gif" width="16" height="16" alt="<fmt:message key="server.properties.alt_delete" />" border="0"></a
> >
</td> </td>
</tr> </tr>
...@@ -301,9 +298,9 @@ function dodelete(propName) { ...@@ -301,9 +298,9 @@ function dodelete(propName) {
<tr> <tr>
<th colspan="2"> <th colspan="2">
<% if (edit) { %> <% if (edit) { %>
Edit property <fmt:message key="server.properties.edit_property_title" />
<% } else { %> <% } else { %>
Add new property <fmt:message key="server.properties.new_property" />
<% } %> <% } %>
</th> </th>
</tr> </tr>
...@@ -311,7 +308,7 @@ function dodelete(propName) { ...@@ -311,7 +308,7 @@ function dodelete(propName) {
<tbody> <tbody>
<tr valign="top"> <tr valign="top">
<td> <td>
Property Name: <fmt:message key="server.properties.name" />:
</td> </td>
<td> <td>
<% if (edit) { %> <% if (edit) { %>
...@@ -325,7 +322,7 @@ function dodelete(propName) { ...@@ -325,7 +322,7 @@ function dodelete(propName) {
<% if (errors.containsKey("propName")) { %> <% if (errors.containsKey("propName")) { %>
<br><span class="jive-error-text">Please enter a property name.</span> <br><span class="jive-error-text"><fmt:message key="server.properties.enter_property_name" /></span>
<% } %> <% } %>
...@@ -334,18 +331,18 @@ function dodelete(propName) { ...@@ -334,18 +331,18 @@ function dodelete(propName) {
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td> <td>
Property Value: <fmt:message key="server.properties.value" />:
</td> </td>
<td> <td>
<textarea cols="45" rows="5" name="propValue" wrap="virtual"><%= (propValue != null ? StringUtils.escapeHTMLTags(propValue) : "") %></textarea> <textarea cols="45" rows="5" name="propValue" wrap="virtual"><%= (propValue != null ? StringUtils.escapeHTMLTags(propValue) : "") %></textarea>
<% if (errors.containsKey("propValue")) { %> <% if (errors.containsKey("propValue")) { %>
<br><span class="jive-error-text">Please enter a property value.</span> <br><span class="jive-error-text"><fmt:message key="server.properties.enter_property_value" /></span>
<% } else if (errors.containsKey("propValueLength")) { %> <% } else if (errors.containsKey("propValueLength")) { %>
<br><span class="jive-error-text">1000 character max.</span> <br><span class="jive-error-text"><fmt:message key="server.properties.max_character" /></span>
<% } %> <% } %>
</td> </td>
......
src/web/server-props.jsp
View file @ 4e6e9efa
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
%> %>
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Edit Server Properties"; String title = LocaleUtils.getLocalizedString("server.props.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Server Properties", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Server Properties", "index.jsp"));
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</style> </style>
<p> <p>
Use the form below to edit server properties. <fmt:message key="server.props.info" />
</p> </p>
<% if ("true".equals(request.getParameter("success"))) { %> <% if ("true".equals(request.getParameter("success"))) { %>
...@@ -121,8 +121,7 @@ Use the form below to edit server properties. ...@@ -121,8 +121,7 @@ Use the form below to edit server properties.
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Server properties updated successfully. You'll need to <b>restart</b> the server to have <fmt:message key="server.props.update" /> <b><fmt:message key="global.restart" /></b> <fmt:message key="server.props.update2" /> <a href="index.jsp"><fmt:message key="global.server_status" /></a>).
the changes take effect (see <a href="index.jsp">Server Status</a>).
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -137,14 +136,14 @@ Use the form below to edit server properties. ...@@ -137,14 +136,14 @@ Use the form below to edit server properties.
<thead> <thead>
<tr> <tr>
<th colspan="2"> <th colspan="2">
Server Properties <fmt:message key="server.props.property" />
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td class="c1"> <td class="c1">
Server Name: <fmt:message key="server.props.name" />
</td> </td>
<td class="c2"> <td class="c2">
<input type="text" name="serverName" value="<%= (serverName != null) ? serverName : "" %>" <input type="text" name="serverName" value="<%= (serverName != null) ? serverName : "" %>"
...@@ -152,16 +151,16 @@ Use the form below to edit server properties. ...@@ -152,16 +151,16 @@ Use the form below to edit server properties.
<% if (errors.containsKey("serverName")) { %> <% if (errors.containsKey("serverName")) { %>
<br> <br>
<span class="jive-error-text"> <span class="jive-error-text">
Please enter a valid server host name or <fmt:message key="server.props.valid_hostname" />
<a href="#" onclick="document.editform.serverName.value='<%= InetAddress.getLocalHost().getHostName() %>';" <a href="#" onclick="document.editform.serverName.value='<%= InetAddress.getLocalHost().getHostName() %>';"
>restore the default</a>. ><fmt:message key="server.props.valid_hostname1" /></a>.
</span> </span>
<% } %> <% } %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Port: <fmt:message key="server.props.port" />
</td> </td>
<td class="c2"> <td class="c2">
<input type="text" name="port" value="<%= (port > 0 ? String.valueOf(port) : "") %>" <input type="text" name="port" value="<%= (port > 0 ? String.valueOf(port) : "") %>"
...@@ -169,21 +168,21 @@ Use the form below to edit server properties. ...@@ -169,21 +168,21 @@ Use the form below to edit server properties.
<% if (errors.containsKey("port")) { %> <% if (errors.containsKey("port")) { %>
<br> <br>
<span class="jive-error-text"> <span class="jive-error-text">
Please enter a valid port number or <fmt:message key="server.props.valid_port" />
<a href="#" onclick="document.editform.port.value='5222';" <a href="#" onclick="document.editform.port.value='5222';"
>restore the default</a>. ><fmt:message key="server.props.valid_port1" /></a>.
</span> </span>
<% } else if (errors.containsKey("portsEqual")) { %> <% } else if (errors.containsKey("portsEqual")) { %>
<br> <br>
<span class="jive-error-text"> <span class="jive-error-text">
Error -- this port and the SSL port can not be equal. <fmt:message key="server.props.error_port" />
</span> </span>
<% } %> <% } %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
SSL Enabled: <fmt:message key="server.props.ssl" />
</td> </td>
<td class="c2"> <td class="c2">
<table cellpadding="0" cellspacing="0" border="0"> <table cellpadding="0" cellspacing="0" border="0">
...@@ -193,14 +192,14 @@ Use the form below to edit server properties. ...@@ -193,14 +192,14 @@ Use the form below to edit server properties.
<input type="radio" name="sslEnabled" value="true" <%= (sslEnabled ? "checked" : "") %> <input type="radio" name="sslEnabled" value="true" <%= (sslEnabled ? "checked" : "") %>
id="SSL01"> id="SSL01">
</td> </td>
<td><label for="SSL01">Enabled</label></td> <td><label for="SSL01"><fmt:message key="server.props.enable" /></label></td>
</tr> </tr>
<tr> <tr>
<td> <td>
<input type="radio" name="sslEnabled" value="false" <%= (!sslEnabled ? "checked" : "") %> <input type="radio" name="sslEnabled" value="false" <%= (!sslEnabled ? "checked" : "") %>
id="SSL02"> id="SSL02">
</td> </td>
<td><label for="SSL02">Disabled</label></td> <td><label for="SSL02"><fmt:message key="server.props.disable" /></label></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -216,16 +215,16 @@ Use the form below to edit server properties. ...@@ -216,16 +215,16 @@ Use the form below to edit server properties.
<% if (errors.containsKey("sslPort")) { %> <% if (errors.containsKey("sslPort")) { %>
<br> <br>
<span class="jive-error-text"> <span class="jive-error-text">
Please enter a valid SSL port number or <fmt:message key="server.props.ssl_valid" />
<a href="#" onclick="document.editform.sslPort.value='5223';" <a href="#" onclick="document.editform.sslPort.value='5223';"
>restore the default</a>. ><fmt:message key="server.props.ssl_valid1" /></a>.
</span> </span>
<% } %> <% } %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Admin Console Port: <fmt:message key="server.props.admin_port" />
</td> </td>
<td class="c2"> <td class="c2">
<input type="text" name="embeddedPort" value="<%= (embeddedPort > 0 ? String.valueOf(embeddedPort) : "") %>" <input type="text" name="embeddedPort" value="<%= (embeddedPort > 0 ? String.valueOf(embeddedPort) : "") %>"
...@@ -233,9 +232,9 @@ Use the form below to edit server properties. ...@@ -233,9 +232,9 @@ Use the form below to edit server properties.
<% if (errors.containsKey("embeddedPort")) { %> <% if (errors.containsKey("embeddedPort")) { %>
<br> <br>
<span class="jive-error-text"> <span class="jive-error-text">
Please enter a valid port number or <fmt:message key="server.props.valid_port" />
<a href="#" onclick="document.editform.embeddedPort.value='9090';" <a href="#" onclick="document.editform.embeddedPort.value='9090';"
>restore the default</a>. ><fmt:message key="server.props.valid_port1" /></a>.
</span> </span>
<% } %> <% } %>
</td> </td>
......
src/web/server-stopped.jsp
View file @ 4e6e9efa
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
- $Date$ - $Date$
--%> --%>
<%@ page import="org.jivesoftware.admin.AdminConsole"%> <%@ page import="org.jivesoftware.admin.AdminConsole,
org.jivesoftware.util.LocaleUtils"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
...@@ -20,14 +21,14 @@ ...@@ -20,14 +21,14 @@
String path = request.getContextPath(); String path = request.getContextPath();
// Title of this page // Title of this page
String title = restart ? "Restarting Server" : "Server stopped"; String title = restart ? LocaleUtils.getLocalizedString("server.stopped.title_restarting") : LocaleUtils.getLocalizedString("server.stopped.title_stopped");
pageinfo.setTitle(title); pageinfo.setTitle(title);
%> %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html> <html>
<head> <head>
<title><%= AdminConsole.getAppName() %> Admin Console<%= (pageinfo.getTitle() != null ? (": "+pageinfo.getTitle()) : "") %></title> <title><%= AdminConsole.getAppName() %> <fmt:message key="server.stopped.admin_console" /><%= (pageinfo.getTitle() != null ? (": "+pageinfo.getTitle()) : "") %></title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link rel="stylesheet" type="text/css" href="<%= path %>/style/global.css"> <link rel="stylesheet" type="text/css" href="<%= path %>/style/global.css">
</head> </head>
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
<tbody> <tbody>
<tr> <tr>
<td> <td>
<img src="<%= path %>/<%= AdminConsole.getLogoImage() %>" border="0" alt="<%= AdminConsole.getAppName() %> Admin Console"> <img src="<%= path %>/<%= AdminConsole.getLogoImage() %>" border="0" alt="<%= AdminConsole.getAppName() %> <fmt:message key="server.stopped.admin_console" />">
</td> </td>
<td align="right"> <td align="right">
<table cellpadding="0" cellspacing="0" border="0"> <table cellpadding="0" cellspacing="0" border="0">
...@@ -71,30 +72,28 @@ ...@@ -71,30 +72,28 @@
<% if (restart) { %> <% if (restart) { %>
<p> <p>
The server is being restarted. <fmt:message key="server.stopped.restarted" />
To continue:
</p> </p>
<ol> <ol>
<li> <li>
Wait a few seconds until the server has been restarted. <fmt:message key="server.stopped.wait_time" />
</li> </li>
<li> <li>
<a href="index.jsp">Login to the admin console</a>. <a href="index.jsp"><fmt:message key="server.stopped.login_console" /></a>.
</li> </li>
</ol> </ol>
<% } else { %> <% } else { %>
<p> <p>
The server is being stopped. <fmt:message key="server.stopped.stop" />
To continue:
</p> </p>
<ol> <ol>
<li> <li>
Wait a few seconds and then <b style="font-size:1.2em;">restart</b> the server. <fmt:message key="server.stopped.wait_restarted" /> <b style="font-size:1.2em;"><fmt:message key="global.restart" /></b> <fmt:message key="server.stopped.wait_restarted2" />
</li> </li>
<li> <li>
<a href="index.jsp">Login to the admin console</a>. <a href="index.jsp"><fmt:message key="server.stopped.login_console" /></a>.
</li> </li>
</ol> </ol>
<% } %> <% } %>
......
src/web/session-conflict.jsp
View file @ 4e6e9efa
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Conflict Policy"; String title = LocaleUtils.getLocalizedString("session.conflict.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Session Conflict", "session-conflict.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Session Conflict", "session-conflict.jsp"));
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Settings updated successfully. <fmt:message key="session.conflict.update" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -88,19 +88,13 @@ ...@@ -88,19 +88,13 @@
%> %>
<p> <p>
XMPP allows multiple logins to the same user account by assigning a unique "resource name" <fmt:message key="session.conflict.info" />
to each connection. If a connection requests a resource name that is already in use, the server must
decide how to handle the conflict. The options on this page allow you to determine if the server
always kicks off existing connections, never kicks off existing connections, or sets the number of
login attempts that should be rejected before kicking off an
existing connection. The last option allows users to receive an error when logging in that
allows them to request a different resource name.
</p> </p>
<form action="session-conflict.jsp" method="post"> <form action="session-conflict.jsp" method="post">
<fieldset> <fieldset>
<legend>Set Conflict Policy</legend> <legend><fmt:message key="session.conflict.policy" /></legend>
<div> <div>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
...@@ -110,8 +104,8 @@ allows them to request a different resource name. ...@@ -110,8 +104,8 @@ allows them to request a different resource name.
<%= ((kickPolicy==0) ? "checked" : "") %>> <%= ((kickPolicy==0) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb01"><b>Always kick</b></label> - If there is a resource conflict, <label for="rb01"><b><fmt:message key="session.conflict.always_kick" /></b></label> -
immediately kick the other resource. <fmt:message key="session.conflict.always_kick_info" />
</td> </td>
</tr> </tr>
<tr valign="middle"> <tr valign="middle">
...@@ -120,8 +114,8 @@ allows them to request a different resource name. ...@@ -120,8 +114,8 @@ allows them to request a different resource name.
<%= ((kickPolicy==SessionManager.NEVER_KICK) ? "checked" : "") %>> <%= ((kickPolicy==SessionManager.NEVER_KICK) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb02"><b>Never kick</b></label> - If there is a resource conflict, don't <label for="rb02"><b><fmt:message key="session.conflict.never_kick" /></b></label> -
allow the new resource to log in. <fmt:message key="session.conflict.never_kick_info" />
</td> </td>
</tr> </tr>
<tr valign="middle"> <tr valign="middle">
...@@ -130,8 +124,8 @@ allows them to request a different resource name. ...@@ -130,8 +124,8 @@ allows them to request a different resource name.
<%= ((kickPolicy==1) ? "checked" : "") %>> <%= ((kickPolicy==1) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb04"><b>Allow one login attempt</b></label> - If there is a resource conflict, <label for="rb04"><b><fmt:message key="session.conflict.allow_one" /></b></label> -
report an error one time but don't kick the existing connection. <fmt:message key="session.conflict.resource_conflict" />
</td> </td>
</tr> </tr>
<% // Figure out if the kick policy is neither 0 nor SessionManager.NEVER_KICK: <% // Figure out if the kick policy is neither 0 nor SessionManager.NEVER_KICK:
...@@ -147,9 +141,9 @@ allows them to request a different resource name. ...@@ -147,9 +141,9 @@ allows them to request a different resource name.
<%= ((assignedKickPolicy) ? "checked" : "") %>> <%= ((assignedKickPolicy) ? "checked" : "") %>>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb03"><b>Assign kick value</b></label> - Specify the number of login <label for="rb03"><b><fmt:message key="session.conflict.kick_value" /></b></label> -
attempts allowed before conflicting resources are kicked. You must specify a <fmt:message key="session.conflict.kick_value_info" />
number greater than one.
</td> </td>
</tr> </tr>
<tr valign="middle"> <tr valign="middle">
...@@ -159,7 +153,7 @@ allows them to request a different resource name. ...@@ -159,7 +153,7 @@ allows them to request a different resource name.
<td width="99%"> <td width="99%">
<% if (errors.get("kickValue") != null) { %> <% if (errors.get("kickValue") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
Please enter a value greater than 1. <fmt:message key="session.conflict.enter_value" />
</span><br> </span><br>
<% } %> <% } %>
<input type="text" name="kickValue" value="<%= ((assignedKickPolicy) ? ""+kickPolicy : "") %>" <input type="text" name="kickValue" value="<%= ((assignedKickPolicy) ? ""+kickPolicy : "") %>"
......
src/web/session-details.jsp
View file @ 4e6e9efa
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% // Get parameters <% // Get parameters
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Session Details"; String title = LocaleUtils.getLocalizedString("session.details.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "session-details.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "session-details.jsp"));
...@@ -82,8 +82,9 @@ ...@@ -82,8 +82,9 @@
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<p> <p>
Below are session details for the session <b><%= address.toString() %></b>. If the <fmt:message key="session.details.info" /> <b><%= address.toString() %></b>.
user <b><%= address.getNode() %></b> has multiple sessions open, they will appear below. <fmt:message key="session.details.info1" /> <b><%= address.getNode() %></b>
<fmt:message key="session.details.info2" />
</p> </p>
<div class="jive-table"> <div class="jive-table">
...@@ -91,14 +92,14 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea ...@@ -91,14 +92,14 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
<thead> <thead>
<tr> <tr>
<th colspan="2"> <th colspan="2">
Session Details <fmt:message key="session.details.title" />
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td class="c1"> <td class="c1">
Session ID: <fmt:message key="session.details.session_id" />
</td> </td>
<td> <td>
<%= address.toString() %> <%= address.toString() %>
...@@ -106,13 +107,13 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea ...@@ -106,13 +107,13 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
User Name &amp; Resource: <fmt:message key="session.details.username" />
</td> </td>
<td> <td>
<% String n = address.getNode(); %> <% String n = address.getNode(); %>
<% if (n == null || "".equals(n)) { %> <% if (n == null || "".equals(n)) { %>
<i>Anonymous</i> - <%= address.getResource()==null?"":address.getResource() %> <i> <fmt:message key="session.details.anonymous" /> </i> - <%= address.getResource()==null?"":address.getResource() %>
<% } else { %> <% } else { %>
...@@ -124,38 +125,38 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea ...@@ -124,38 +125,38 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Status: <fmt:message key="session.details.status" />:
</td> </td>
<td> <td>
<% <%
int status = currentSess.getStatus(); int status = currentSess.getStatus();
if (status == Session.STATUS_CLOSED) { if (status == Session.STATUS_CLOSED) {
%> %>
Closed <fmt:message key="session.details.close" />
<% <%
} else if (status == Session.STATUS_CONNECTED) { } else if (status == Session.STATUS_CONNECTED) {
%> %>
Connected <fmt:message key="session.details.connect" />
<% <%
} else if (status == Session.STATUS_STREAMING) { } else if (status == Session.STATUS_STREAMING) {
%> %>
Streaming <fmt:message key="session.details.streaming" />
<% <%
} else if (status == Session.STATUS_AUTHENTICATED) { } else if (status == Session.STATUS_AUTHENTICATED) {
%> %>
Authenticated <fmt:message key="session.details.authenticated" />
<% <%
} else { } else {
%> %>
Unknown <fmt:message key="session.details.unknown" />
<% <%
} }
...@@ -164,7 +165,7 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea ...@@ -164,7 +165,7 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Presence: <fmt:message key="session.details.presence" />:
</td> </td>
<td> <td>
<% <%
...@@ -180,39 +181,39 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea ...@@ -180,39 +181,39 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
%> %>
<img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0" title="Away"> <img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0" title="Away">
Away <%= statusTxt %> <fmt:message key="session.details.away" /> <%= statusTxt %>
<% <%
} else if (show == Presence.Show.chat) { } else if (show == Presence.Show.chat) {
%> %>
<img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Available to Chat"> <img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Available to Chat">
Available to Chat <%= statusTxt %> <fmt:message key="session.details.chat_available" /> <%= statusTxt %>
<% <%
} else if (show == Presence.Show.dnd) { } else if (show == Presence.Show.dnd) {
%> %>
<img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Do not Disturb"> <img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Do not Disturb">
Do Not Disturb <%= statusTxt %> <fmt:message key="session.details.not_disturb" /> <%= statusTxt %>
<% <%
} else if (show == null) { } else if (show == null) {
%> %>
<img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Online"> <img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Online">
Online <%= statusTxt %> <fmt:message key="session.details.online" /> <%= statusTxt %>
<% <%
} else if (show == Presence.Show.xa) { } else if (show == Presence.Show.xa) {
%> %>
<img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Extended Away"> <img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Extended Away">
Extended Away <%= statusTxt %> <fmt:message key="session.details.extended" /> <%= statusTxt %>
<% <%
} else { } else {
%> %>
Unknown/Not Recognized <fmt:message key="session.details.unknown" />
<% <%
} }
...@@ -221,7 +222,7 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea ...@@ -221,7 +222,7 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Session Created: <fmt:message key="session.details.session_created" />:
</td> </td>
<td> <td>
<%= dateFormatter.format(currentSess.getCreationDate()) %> <%= dateFormatter.format(currentSess.getCreationDate()) %>
...@@ -229,7 +230,7 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea ...@@ -229,7 +230,7 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Session Last Active: <fmt:message key="session.details.last_active" />:
</td> </td>
<td> <td>
<%= dateFormatter.format(currentSess.getLastActiveDate()) %> <%= dateFormatter.format(currentSess.getLastActiveDate()) %>
...@@ -237,16 +238,16 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea ...@@ -237,16 +238,16 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Session Statistics: <fmt:message key="session.details.statistics" />:
</td> </td>
<td> <td>
Packets Received/Sent: <fmt:message key="session.details.received" />:
<%= numFormatter.format(currentSess.getNumClientPackets()) %>/<%= numFormatter.format(currentSess.getNumServerPackets()) %> <%= numFormatter.format(currentSess.getNumClientPackets()) %>/<%= numFormatter.format(currentSess.getNumServerPackets()) %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Client IP / Hostname: <fmt:message key="session.details.hostname" />:
</td> </td>
<td> <td>
<%= currentSess.getConnection().getInetAddress().getHostAddress() %> <%= currentSess.getConnection().getInetAddress().getHostAddress() %>
...@@ -262,19 +263,19 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea ...@@ -262,19 +263,19 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
if (sessionCount > 1) { if (sessionCount > 1) {
%> %>
<p> <p>
<b>Multiple User Sessions</b> <b><fmt:message key="session.details.multiple_session" /></b>
</p> </p>
<div class="jive-table"> <div class="jive-table">
<table cellpadding="3" cellspacing="1" border="0" width="100%"> <table cellpadding="3" cellspacing="1" border="0" width="100%">
<tr> <tr>
<th>&nbsp;</th> <th>&nbsp;</th>
<th>Name</th> <th><fmt:message key="session.details.name" /></th>
<th>Resource</th> <th><fmt:message key="session.details.resource" /></th>
<th>Status</th> <th><fmt:message key="session.details.status" /></th>
<th nowrap colspan="2">Presence (if authenticated)</th> <th nowrap colspan="2"><fmt:message key="session.details.if_presence" /></th>
<th nowrap>Client IP</th> <th nowrap><fmt:message key="session.details.clientip" /></th>
<th nowrap>Close Connection</th> <th nowrap><fmt:message key="session.details.close_connect" /></th>
</tr> </tr>
<% int count = 0; <% int count = 0;
...@@ -305,7 +306,7 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea ...@@ -305,7 +306,7 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
</td> </td>
<td width="99%"> <td width="99%">
&nbsp; = Current session details above. &nbsp; = <fmt:message key="session.details.session_detail" />
</td> </td>
</tr> </tr>
......
src/web/session-filter.jsp
View file @ 4e6e9efa
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
org.jivesoftware.messenger.Session" %> org.jivesoftware.messenger.Session" %>
<%@ include file="global.jsp" %> <%@ include file="global.jsp" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<% // Check to see if the server is down. <% // Check to see if the server is down.
if (xmppServer == null) { if (xmppServer == null) {
response.sendRedirect("error-serverdown.jsp"); response.sendRedirect("error-serverdown.jsp");
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<jsp:include page="header.jsp" flush="true" /> <jsp:include page="header.jsp" flush="true" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Filter Session Summary by User"; String title = LocaleUtils.getLocalizedString("session.filter.title");
String[][] breadcrumbs = { String[][] breadcrumbs = {
{"Home", "index.jsp"}, {"Home", "index.jsp"},
{"Session Summary", "session-summary.jsp"}, {"Session Summary", "session-summary.jsp"},
...@@ -68,14 +68,13 @@ ...@@ -68,14 +68,13 @@
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<p> <p>
To filter the list of sessions by user, select the user from the list below or enter <fmt:message key="session.filter.info" />
their username in the box below.
</p> </p>
<% if (errors) { %> <% if (errors) { %>
<p class="jive-error-text"> <p class="jive-error-text">
Please enter a valid username or choose a username from the list. <fmt:message key="session.filter.enter_username" />
</p> </p>
<% } %> <% } %>
...@@ -89,7 +88,7 @@ their username in the box below. ...@@ -89,7 +88,7 @@ their username in the box below.
<input type="radio" name="choose" value="false"> <input type="radio" name="choose" value="false">
</td> </td>
<td width="1%" nowrap> <td width="1%" nowrap>
Specify username: <fmt:message key="session.filter.specify_username" />
</td> </td>
<td width="98%"> <td width="98%">
<input type="text" name="usernameTF" size="30" maxlength="100" <input type="text" name="usernameTF" size="30" maxlength="100"
...@@ -102,7 +101,7 @@ their username in the box below. ...@@ -102,7 +101,7 @@ their username in the box below.
<input type="radio" name="choose" value="true"> <input type="radio" name="choose" value="true">
</td> </td>
<td width="1%" nowrap> <td width="1%" nowrap>
Choose user: <fmt:message key="session.filter.choose_user" />
</td> </td>
<td width="98%"> <td width="98%">
<select size="1" name="usernameSEL" onfocus="this.form.choose[1].checked=true;"> <select size="1" name="usernameSEL" onfocus="this.form.choose[1].checked=true;">
......
src/web/session-row.jspf
View file @ 4e6e9efa
<%@ page import="org.jivesoftware.messenger.Session, <%@ page import="org.jivesoftware.messenger.Session,
org.xmpp.packet.Presence, org.xmpp.packet.Presence,
java.net.URLEncoder"%> java.net.URLEncoder,
org.jivesoftware.util.LocaleUtils"%>
<%-- <%--
- $RCSfile$ - $RCSfile$
- $Revision$ - $Revision$
...@@ -29,8 +30,8 @@ ...@@ -29,8 +30,8 @@
<td width="1%" nowrap><%= count %></td> <td width="1%" nowrap><%= count %></td>
<td width="10%" nowrap> <td width="10%" nowrap>
<% String name = sess.getAddress().getNode(); %> <% String name = sess.getAddress().getNode(); %>
<a href="session-details.jsp?jid=<%= URLEncoder.encode(sess.getAddress().toString(), "UTF-8") %>" title="Click for more info..." <a href="session-details.jsp?jid=<%= URLEncoder.encode(sess.getAddress().toString(), "UTF-8") %>" title="<fmt:message key="session.row.cliked" />"
><%= ((name != null && !"".equals(name)) ? name : "<i>Anonymous</i>") %></a> ><%= ((name != null && !"".equals(name)) ? name : "<i>"+LocaleUtils.getLocalizedString("session.details.anonymous")+"</i>") %></a>
</td> </td>
<td width="15%" nowrap> <td width="15%" nowrap>
<%= sess.getAddress().getResource() %> <%= sess.getAddress().getResource() %>
...@@ -39,30 +40,30 @@ ...@@ -39,30 +40,30 @@
<% int _status = sess.getStatus(); <% int _status = sess.getStatus();
if (_status == Session.STATUS_CLOSED) { if (_status == Session.STATUS_CLOSED) {
%> %>
Closed <fmt:message key="session.details.close" />
<% } else if (_status == Session.STATUS_CONNECTED) { %> <% } else if (_status == Session.STATUS_CONNECTED) { %>
Connected <fmt:message key="session.details.connect" />
<% } else if (_status == Session.STATUS_STREAMING) { %> <% } else if (_status == Session.STATUS_STREAMING) { %>
Streaming <fmt:message key="session.details.streaming" />
<% } else if (_status == Session.STATUS_AUTHENTICATED) { %> <% } else if (_status == Session.STATUS_AUTHENTICATED) { %>
Authenticated <fmt:message key="session.details.authenticated" />
<% } else { %> <% } else { %>
Unknown <fmt:message key="session.details.unknown" />
<% } %> <% } %>
</td> </td>
<% if (sess.getConnection().isSecure()) { %> <% if (sess.getConnection().isSecure()) { %>
<td width="1%"> <td width="1%">
<img src="images/lock.gif" width="16" height="16" border="0" <img src="images/lock.gif" width="16" height="16" border="0"
title="User is connected via SSL"> title="<fmt:message key="session.row.cliked_ssl" />">
</td> </td>
<% } else { %> <% } else { %>
<td width="1%"><img src="images/blank.gif" width="1" height="1"></td> <td width="1%"><img src="images/blank.gif" width="1" height="1"></td>
...@@ -73,7 +74,7 @@ ...@@ -73,7 +74,7 @@
if (_show == Presence.Show.away) { if (_show == Presence.Show.away) {
%> %>
<td width="1%" <td width="1%"
><img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0" title="Away" ><img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0" title="<fmt:message key="session.details.away" />"
></td> ></td>
<td width="46%"> <td width="46%">
<% if (_stat != null) { %> <% if (_stat != null) { %>
...@@ -82,7 +83,7 @@ ...@@ -82,7 +83,7 @@
<% } else { %> <% } else { %>
Away <fmt:message key="session.details.away" />
<% } %> <% } %>
</td> </td>
...@@ -90,16 +91,16 @@ ...@@ -90,16 +91,16 @@
<% } else if (_show == Presence.Show.chat) { %> <% } else if (_show == Presence.Show.chat) { %>
<td width="1%" <td width="1%"
><img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Available to Chat" ><img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="<fmt:message key="session.details.chat_available" />"
></td> ></td>
<td width="46%"> <td width="46%">
Available to Chat <fmt:message key="session.details.chat_available" />
</td> </td>
<% } else if (_show == Presence.Show.dnd) { %> <% } else if (_show == Presence.Show.dnd) { %>
<td width="1%" <td width="1%"
><img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Do Not Disturb" ><img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="<fmt:message key="session.details.not_disturb" />"
></td> ></td>
<td width="46%"> <td width="46%">
<% if (_stat != null) { %> <% if (_stat != null) { %>
...@@ -108,7 +109,7 @@ ...@@ -108,7 +109,7 @@
<% } else { %> <% } else { %>
Do Not Disturb <fmt:message key="session.details.not_disturb" />
<% } %> <% } %>
</td> </td>
...@@ -116,16 +117,16 @@ ...@@ -116,16 +117,16 @@
<% } else if (_show == null) { %> <% } else if (_show == null) { %>
<td width="1%" <td width="1%"
><img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Online" ><img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="<fmt:message key="session.details.online" />"
></td> ></td>
<td width="46%"> <td width="46%">
Online <fmt:message key="session.details.online" />
</td> </td>
<% } else if (_show == Presence.Show.xa) { %> <% } else if (_show == Presence.Show.xa) { %>
<td width="1%" <td width="1%"
><img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0" title="Extended Away" ><img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0" title="<fmt:message key="session.details.extended" />"
></td> ></td>
<td width="46%"> <td width="46%">
<% if (_stat != null) { %> <% if (_stat != null) { %>
...@@ -134,7 +135,7 @@ ...@@ -134,7 +135,7 @@
<% } else { %> <% } else { %>
Extended Away <fmt:message key="session.details.extended" />
<% } %> <% } %>
</td> </td>
...@@ -142,7 +143,7 @@ ...@@ -142,7 +143,7 @@
<% } else { %> <% } else { %>
<td colspan="2" width="46%"> <td colspan="2" width="46%">
Unknown/Not Recognized <fmt:message key="session.details.unknown" />
</td> </td>
<% } %> <% } %>
...@@ -153,8 +154,8 @@ ...@@ -153,8 +154,8 @@
<td width="1%" nowrap align="center" style="border-right:1px #ccc solid;"> <td width="1%" nowrap align="center" style="border-right:1px #ccc solid;">
<a href="session-summary.jsp?jid=<%= URLEncoder.encode(sess.getAddress().toString(), "UTF-8") %>&close=true" <a href="session-summary.jsp?jid=<%= URLEncoder.encode(sess.getAddress().toString(), "UTF-8") %>&close=true"
title="Click to kill session..." title="<fmt:message key="session.row.cliked_kill_session" />"
onclick="return confirm('Are you sure you want to close this connection?');" onclick="return confirm('<fmt:message key="session.row.confirm_close" />');"
><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a> ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
</td> </td>
</tr> </tr>
\ No newline at end of file
src/web/session-summary.jsp
View file @ 4e6e9efa
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% admin.init(request, response, session, application, out ); %> <% admin.init(request, response, session, application, out ); %>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Session Summary"; String title = LocaleUtils.getLocalizedString("session.summary.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "session-summary.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "session-summary.jsp"));
...@@ -75,16 +75,16 @@ ...@@ -75,16 +75,16 @@
<% if ("success".equals(request.getParameter("close"))) { %> <% if ("success".equals(request.getParameter("close"))) { %>
<p class="jive-success-text"> <p class="jive-success-text">
Session closed successfully. <fmt:message key="session.summary.close" />
</p> </p>
<% } %> <% } %>
Active Sessions: <b><%= sessionCount %></b> <fmt:message key="session.summary.active" />: <b><%= sessionCount %></b>
<% if (numPages > 1) { %> <% if (numPages > 1) { %>
- Showing <%= (start+1) %>-<%= (start+range) %> - <fmt:message key="session.summary.showing" /> <%= (start+1) %>-<%= (start+range) %>
<% } %> <% } %>
</p> </p>
...@@ -92,7 +92,7 @@ Active Sessions: <b><%= sessionCount %></b> ...@@ -92,7 +92,7 @@ Active Sessions: <b><%= sessionCount %></b>
<% if (numPages > 1) { %> <% if (numPages > 1) { %>
<p> <p>
Pages: <fmt:message key="session.summary.page" />:
[ [
<% for (int i=0; i<numPages; i++) { <% for (int i=0; i<numPages; i++) {
String sep = ((i+1)<numPages) ? " " : ""; String sep = ((i+1)<numPages) ? " " : "";
...@@ -109,7 +109,7 @@ Active Sessions: <b><%= sessionCount %></b> ...@@ -109,7 +109,7 @@ Active Sessions: <b><%= sessionCount %></b>
<% } %> <% } %>
<p> <p>
Below is a list of sessions on this server. <fmt:message key="session.summary.info" />
</p> </p>
<div class="jive-table"> <div class="jive-table">
...@@ -117,12 +117,12 @@ Below is a list of sessions on this server. ...@@ -117,12 +117,12 @@ Below is a list of sessions on this server.
<thead> <thead>
<tr> <tr>
<th>&nbsp;</th> <th>&nbsp;</th>
<th>Name</th> <th><fmt:message key="session.details.name" /></th>
<th>Resource</th> <th><fmt:message key="session.details.resource" /></th>
<th nowrap colspan="2">Status</th> <th nowrap colspan="2"><fmt:message key="session.details.status" /></th>
<th nowrap colspan="2">Presence</th> <th nowrap colspan="2"><fmt:message key="session.details.presence" /></th>
<th nowrap>Client IP</th> <th nowrap><fmt:message key="session.details.clientip" /></th>
<th nowrap>Close Connection</th> <th nowrap><fmt:message key="session.details.close_connect" /></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -136,7 +136,7 @@ Below is a list of sessions on this server. ...@@ -136,7 +136,7 @@ Below is a list of sessions on this server.
<tr> <tr>
<td colspan="9"> <td colspan="9">
No Sessions <fmt:message key="session.summary.not_session" />
</td> </td>
</tr> </tr>
...@@ -160,7 +160,7 @@ Below is a list of sessions on this server. ...@@ -160,7 +160,7 @@ Below is a list of sessions on this server.
<% if (numPages > 1) { %> <% if (numPages > 1) { %>
<p> <p>
Pages: <fmt:message key="session.summary.page" />:
[ [
<% for (int i=0; i<numPages; i++) { <% for (int i=0; i<numPages; i++) {
String sep = ((i+1)<numPages) ? " " : ""; String sep = ((i+1)<numPages) ? " " : "";
...@@ -178,7 +178,7 @@ Below is a list of sessions on this server. ...@@ -178,7 +178,7 @@ Below is a list of sessions on this server.
<br> <br>
<p> <p>
List last updated: <%= dateFormatter.format(new Date()) %> <fmt:message key="session.summary.last_update" />: <%= dateFormatter.format(new Date()) %>
</p> </p>
<jsp:include page="bottom.jsp" flush="true" /> <jsp:include page="bottom.jsp" flush="true" />
src/web/setup-admin-settings.jsp
View file @ 4e6e9efa
...@@ -107,14 +107,11 @@ ...@@ -107,14 +107,11 @@
<%@ include file="setup-header.jspf" %> <%@ include file="setup-header.jspf" %>
<p class="jive-setup-page-header"> <p class="jive-setup-page-header">
Administrator Account <fmt:message key="setup.admin.settings.account" />
</p> </p>
<p> <p>
Enter settings for the system administrator account (username of "admin") below. It is important to <fmt:message key="setup.admin.settings.info" />
choose a password for the account that cannot be easily guessed -- for example, at least six
characters long and containing a mix of letters and numbers. You can skip this step if you have
already setup your admin account (not for first time users).
</p> </p>
<% if (errors.size() > 0) { %> <% if (errors.size() > 0) { %>
...@@ -126,7 +123,7 @@ already setup your admin account (not for first time users). ...@@ -126,7 +123,7 @@ already setup your admin account (not for first time users).
<% } else { %> <% } else { %>
There were errors when updating the admin account. Please see below. <fmt:message key="setup.admin.settings.error" />
<% } %> <% } %>
</span> </span>
...@@ -156,36 +153,36 @@ function checkClick() { ...@@ -156,36 +153,36 @@ function checkClick() {
value="<%= ((password!=null) ? password : "") %>"> value="<%= ((password!=null) ? password : "") %>">
<span class="jive-description"> <span class="jive-description">
<br> <br>
If this is a new <fmt:message key="short.title" /> installation, the current password will be <b>admin</b>. <fmt:message key="setup.admin.settings.install" /><fmt:message key="short.title" /> <fmt:message key="setup.admin.settings.install1" /> <b><fmt:message key="setup.admin.settings.install2" /></b>.
</span> </span>
<% if (errors.get("password") != null) { %> <% if (errors.get("password") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
<br>Please enter the correct current password. <br><fmt:message key="setup.admin.settings.password" />
</span> </span>
<% } %> <% } %>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label"> <td class="jive-label">
Admin Email Address: <fmt:message key="setup.admin.settings.email" />
</td> </td>
<td> <td>
<input type="text" name="email" size="40" maxlength="150" <input type="text" name="email" size="40" maxlength="150"
value="<%= ((email!=null) ? email : "") %>"> value="<%= ((email!=null) ? email : "") %>">
<span class="jive-description"> <span class="jive-description">
<br> <br>
A valid email address for the admin account. <fmt:message key="setup.admin.settings.valid_email" />
</span> </span>
<% if (errors.get("email") != null) { %> <% if (errors.get("email") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
<br>Please enter a valid email address. <br><fmt:message key="setup.admin.settings.enter_email" />
</span> </span>
<% } %> <% } %>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label"> <td class="jive-label">
New Password: <fmt:message key="setup.admin.settings.new_password" />
</td> </td>
<td> <td>
<input type="password" name="newPassword" size="20" maxlength="50" <input type="password" name="newPassword" size="20" maxlength="50"
...@@ -195,18 +192,18 @@ function checkClick() { ...@@ -195,18 +192,18 @@ function checkClick() {
</span> </span>
<% if (errors.get("newPassword") != null) { %> <% if (errors.get("newPassword") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
<br>Please enter a valid new password. <br><fmt:message key="setup.admin.settings.valid_new_password" />
</span> </span>
<% } else if (errors.get("match") != null) { %> <% } else if (errors.get("match") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
<br>The new passwords do not match. <br><fmt:message key="setup.admin.settings.not_new_password" />
</span> </span>
<% } %> <% } %>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label"> <td class="jive-label">
Confirm Password: <fmt:message key="setup.admin.settings.confirm_password" />
</td> </td>
<td> <td>
<input type="password" name="newPasswordConfirm" size="20" maxlength="50" <input type="password" name="newPasswordConfirm" size="20" maxlength="50"
...@@ -216,7 +213,7 @@ function checkClick() { ...@@ -216,7 +213,7 @@ function checkClick() {
</span> </span>
<% if (errors.get("newPasswordConfirm") != null) { %> <% if (errors.get("newPasswordConfirm") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
<br>Please enter a valid new confirmation password. <br><fmt:message key="setup.admin.settings.valid_confirm" />
</span> </span>
<% } %> <% } %>
</td> </td>
......
src/web/setup-completed.jsp
View file @ 4e6e9efa
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<html> <html>
<head> <head>
<title><fmt:message key="short.title" /> Setup</title> <title><fmt:message key="short.title" /> <fmt:message key="setup.completed.setup" /></title>
<link rel="stylesheet" type="text/css" href="setup-style.css"> <link rel="stylesheet" type="text/css" href="setup-style.css">
</head> </head>
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
<table cellpadding="8" cellspacing="0" border="0" width="100%"> <table cellpadding="8" cellspacing="0" border="0" width="100%">
<tr> <tr>
<td width="99%"> <td width="99%">
<fmt:message key="short.title" /> Setup <fmt:message key="short.title" /> <fmt:message key="setup.completed.setup" />
</td> </td>
<td width="1%" nowrap> <td width="1%" nowrap>
<font size="-2" face="arial,helvetica,sans-serif" color="#ffffff"> <font size="-2" face="arial,helvetica,sans-serif" color="#ffffff">
<b> <b>
Jive Software <fmt:message key="setup.completed.jive" />
</b> </b>
</font> </font>
</td> </td>
...@@ -52,14 +52,13 @@ ...@@ -52,14 +52,13 @@
<td width="98%"> <td width="98%">
<p class="jive-setup-page-header"> <p class="jive-setup-page-header">
Setup Already Run <fmt:message key="setup.completed.run" />
</p> </p>
<p> <p>
It appears setup has already been run. To administer your community, please use the <fmt:message key="setup.completed.run_info" />
<a href="index.jsp"><fmt:message key="short.title" /> Admin Tool</a>. To re-run <a href="index.jsp"><fmt:message key="short.title" /> <fmt:message key="setup.completed.run_info1" /></a>.
setup, you need to stop your appserver, delete the "setup" property from the <fmt:message key="setup.completed.run_info2" />
jive-messenger.xml file, restart Messenger then reload the setup tool.
</p> </p>
<form action="index.jsp"> <form action="index.jsp">
......
src/web/setup-datasource-jndi.jsp
View file @ 4e6e9efa
...@@ -74,14 +74,12 @@ ...@@ -74,14 +74,12 @@
<%@ include file="setup-header.jspf" %> <%@ include file="setup-header.jspf" %>
<p class="jive-setup-page-header"> <p class="jive-setup-page-header">
Datasource Settings - JNDI Connection <fmt:message key="setup.datasource.jndi.setting" />
</p> </p>
<p> <p>
Choose a JNDI datasource below to connect to the <fmt:message key="short.title" /> database. <fmt:message key="setup.datasource.jndi.setting_info" /><fmt:message key="short.title" />
The name varies between application servers, but it is generally of the form: <fmt:message key="setup.datasource.jndi.setting_info1" /> <tt>java:comp/env/jdbc/[DataSourceName]</tt>. <fmt:message key="setup.datasource.jndi.setting_info2" />
<tt>java:comp/env/jdbc/[DataSourceName]</tt>. Please consult your application server's
documentation for more information.
</p> </p>
<% if (errors.size() > 0 && errors.get("jndiName") == null) { %> <% if (errors.size() > 0 && errors.get("jndiName") == null) { %>
...@@ -107,7 +105,7 @@ documentation for more information. ...@@ -107,7 +105,7 @@ documentation for more information.
<% if (!isLookupNames) { %> <% if (!isLookupNames) { %>
JNDI Datasource Name: <fmt:message key="setup.datasource.jndi.name" />
<input type="text" name="jndiName" size="30" maxlength="100" <input type="text" name="jndiName" size="30" maxlength="100"
value="<%= ((jndiName!=null) ? jndiName : "") %>"> value="<%= ((jndiName!=null) ? jndiName : "") %>">
...@@ -118,7 +116,7 @@ documentation for more information. ...@@ -118,7 +116,7 @@ documentation for more information.
<td><input type="radio" name="jndiNameMode" value="custom"></td> <td><input type="radio" name="jndiNameMode" value="custom"></td>
<td> <td>
<span onclick="document.jndiform.jndiName.focus();" <span onclick="document.jndiform.jndiName.focus();"
>Custom:</span> ><fmt:message key="setup.datasource.jndi.custom" /></span>
&nbsp; &nbsp;
<input type="text" name="jndiName" size="30" maxlength="100" <input type="text" name="jndiName" size="30" maxlength="100"
value="<%= ((jndiName!=null) ? jndiName : "") %>" value="<%= ((jndiName!=null) ? jndiName : "") %>"
...@@ -126,7 +124,7 @@ documentation for more information. ...@@ -126,7 +124,7 @@ documentation for more information.
<% if (errors.get("jndiName") != null) { %> <% if (errors.get("jndiName") != null) { %>
<span class="jive-error-text"><br> <span class="jive-error-text"><br>
Please enter a valid JNDI name. <fmt:message key="setup.datasource.jndi.valid_name" />
</span> </span>
<% } %> <% } %>
...@@ -159,7 +157,7 @@ documentation for more information. ...@@ -159,7 +157,7 @@ documentation for more information.
<div align="right"> <div align="right">
<input type="submit" name="continue" value=" Continue "> <input type="submit" name="continue" value=" Continue ">
<br> <br>
Note, it might take between 30-60 seconds to connect to your database. <fmt:message key="setup.datasource.jndi.note" />
</div> </div>
</form> </form>
......
src/web/setup-datasource-settings.jsp
View file @ 4e6e9efa
...@@ -74,11 +74,12 @@ ...@@ -74,11 +74,12 @@
<%@ include file="setup-header.jspf" %> <%@ include file="setup-header.jspf" %>
<p class="jive-setup-page-header"> <p class="jive-setup-page-header">
Datasource Settings <fmt:message key="setup.datasource.settings.title" />
</p> </p>
<p> <p>
Choose how you would like to connect to the <fmt:message key="short.title" /> database. <fmt:message key="setup.datasource.settings.info" /> <fmt:message key="short.title" />
<fmt:message key="setup.datasource.settings.info1" />
</p> </p>
<% if (errors.size() > 0) { %> <% if (errors.size() > 0) { %>
...@@ -99,8 +100,8 @@ Choose how you would like to connect to the <fmt:message key="short.title" /> da ...@@ -99,8 +100,8 @@ Choose how you would like to connect to the <fmt:message key="short.title" /> da
<%= ((STANDARD.equals(mode)) ? "checked" : "") %>> <%= ((STANDARD.equals(mode)) ? "checked" : "") %>>
</td> </td>
<td> <td>
<label for="rb02"><b>Standard Database Connection</b></label> - <label for="rb02"><b><fmt:message key="setup.datasource.settings.connect" /></b></label> -
Use an external database with the built-in connection pool. <fmt:message key="setup.datasource.settings.connect_info" />
</td> </td>
</tr> </tr>
...@@ -112,8 +113,8 @@ Choose how you would like to connect to the <fmt:message key="short.title" /> da ...@@ -112,8 +113,8 @@ Choose how you would like to connect to the <fmt:message key="short.title" /> da
<%= ((JNDI.equals(mode)) ? "checked" : "") %>> <%= ((JNDI.equals(mode)) ? "checked" : "") %>>
</td> </td>
<td> <td>
<label for="rb03"><b>JNDI Datasource</b></label> - <label for="rb03"><b><fmt:message key="setup.datasource.settings.jndi" /></b></label> -
Use a datasource defined by your application server via JNDI. <fmt:message key="setup.datasource.settings.jndi_info" />
</td> </td>
</tr> </tr>
...@@ -125,10 +126,8 @@ Choose how you would like to connect to the <fmt:message key="short.title" /> da ...@@ -125,10 +126,8 @@ Choose how you would like to connect to the <fmt:message key="short.title" /> da
<%= ((EMBEDDED.equals(mode)) ? "checked" : "") %>> <%= ((EMBEDDED.equals(mode)) ? "checked" : "") %>>
</td> </td>
<td> <td>
<label for="rb01"><b>Embedded Database</b></label> - <label for="rb01"><b><fmt:message key="setup.datasource.settings.embedded" /></b></label> -
Use an embedded database, powered by HSQLDB. This option requires no external database <fmt:message key="setup.datasource.settings.embedded_info" />
configuration and is an easy way to get running quickly. However, this is not recommended
for large installations.
</td> </td>
</tr> </tr>
</table> </table>
......
src/web/setup-datasource-standard.jsp
View file @ 4e6e9efa
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
%> %>
<%@ include file="setup-global.jspf" %> <%@ include file="setup-global.jspf" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<% // Get parameters <% // Get parameters
String driver = ParamUtils.getParameter(request,"driver"); String driver = ParamUtils.getParameter(request,"driver");
String serverURL = ParamUtils.getParameter(request,"serverURL"); String serverURL = ParamUtils.getParameter(request,"serverURL");
...@@ -149,17 +149,15 @@ ...@@ -149,17 +149,15 @@
<%@ include file="setup-header.jspf" %> <%@ include file="setup-header.jspf" %>
<p class="jive-setup-page-header"> <p class="jive-setup-page-header">
Datasource Settings - Standard Connection <fmt:message key="setup.datasource.standard.title" />
</p> </p>
<p> <p>
Specify a JDBC driver and connection properties to connect to your database. If you need more <fmt:message key="setup.datasource.standard.info" /><b><fmt:message key="setup.datasource.standard.info2" /> </b><fmt:message key="setup.datasource.standard.info3" /><tt>[MESSENGER_HOME]/resources/database</tt>.<fmt:message key="title" />.
information about this process please see the database documentation distributed with <fmt:message key="title" />.
</p> </p>
<p> <p>
<b>Note: </b> Database scripts for most popular databases are included in the Jive Messenger <fmt:message key="setup.datasource.standard.note" />
distribution at <tt>[MESSENGER_HOME]/resources/database</tt>.
</p> </p>
<% if (errors.size() > 0) { %> <% if (errors.size() > 0) { %>
...@@ -171,7 +169,7 @@ distribution at <tt>[MESSENGER_HOME]/resources/database</tt>. ...@@ -171,7 +169,7 @@ distribution at <tt>[MESSENGER_HOME]/resources/database</tt>.
<% } else { %> <% } else { %>
Failed to establish a database connection - please see specific errors listed below. <fmt:message key="setup.datasource.standard.failed_connect" />
<% } %> <% } %>
</span> </span>
...@@ -215,7 +213,7 @@ function checkSubmit() { ...@@ -215,7 +213,7 @@ function checkSubmit() {
<td colspan="2"> <td colspan="2">
Database Driver Presets: Database Driver Presets:
<select size="1" name="presets" onchange="populate(this.options[this.selectedIndex].value)"> <select size="1" name="presets" onchange="populate(this.options[this.selectedIndex].value)">
<option value="">Pick Database... <option value=""><fmt:message key="setup.datasource.standard.pick_database" />
<% for (int i=0; i<presets.size(); i++) { <% for (int i=0; i<presets.size(); i++) {
String[] data = (String[])presets.get(i); String[] data = (String[])presets.get(i);
%> %>
...@@ -227,14 +225,14 @@ function checkSubmit() { ...@@ -227,14 +225,14 @@ function checkSubmit() {
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label" nowrap> <td class="jive-label" nowrap>
JDBC Driver Class: <fmt:message key="setup.datasource.standard.jdbc" />
</td> </td>
<td> <td>
<input type="text" name="driver" size="50" maxlength="150" <input type="text" name="driver" size="50" maxlength="150"
value="<%= ((driver != null) ? driver : "") %>"> value="<%= ((driver != null) ? driver : "") %>">
<span class="jive-description"> <span class="jive-description">
<br> <br>
The valid classname of your JDBC driver, ie: com.mydatabase.driver.MyDriver. <fmt:message key="setup.datasource.standard.jdbc_info" />
</span> </span>
<% if (errors.get("driver") != null) { %> <% if (errors.get("driver") != null) { %>
...@@ -249,14 +247,14 @@ function checkSubmit() { ...@@ -249,14 +247,14 @@ function checkSubmit() {
<tr><td colspan="2">&nbsp;</td></tr> <tr><td colspan="2">&nbsp;</td></tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label" nowrap> <td class="jive-label" nowrap>
Database URL: <fmt:message key="setup.datasource.standard.url" />
</td> </td>
<td> <td>
<input type="text" name="serverURL" size="50" maxlength="250" <input type="text" name="serverURL" size="50" maxlength="250"
value="<%= ((serverURL != null) ? serverURL : "") %>"> value="<%= ((serverURL != null) ? serverURL : "") %>">
<span class="jive-description"> <span class="jive-description">
<br> <br>
The valid URL used to connect to your database, ie: jdbc:mysql://host:port/database <fmt:message key="setup.datasource.standard.valid_url" />
</span> </span>
<% if (errors.get("serverURL") != null) { %> <% if (errors.get("serverURL") != null) { %>
...@@ -271,15 +269,14 @@ function checkSubmit() { ...@@ -271,15 +269,14 @@ function checkSubmit() {
<tr><td colspan="2">&nbsp;</td></tr> <tr><td colspan="2">&nbsp;</td></tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label" nowrap> <td class="jive-label" nowrap>
Username: <fmt:message key="setup.datasource.standard.username" />
</td> </td>
<td> <td>
<input type="text" name="username" size="20" maxlength="50" <input type="text" name="username" size="20" maxlength="50"
value="<%= ((username != null) ? username : "") %>"> value="<%= ((username != null) ? username : "") %>">
<span class="jive-description"> <span class="jive-description">
<br> <br>
The user used to connect to your database - note, this may not be required and can be left <fmt:message key="setup.datasource.standard.username_info" />
blank.
</span> </span>
<% if (errors.get("username") != null) { %> <% if (errors.get("username") != null) { %>
...@@ -294,15 +291,14 @@ function checkSubmit() { ...@@ -294,15 +291,14 @@ function checkSubmit() {
<tr><td colspan="2">&nbsp;</td></tr> <tr><td colspan="2">&nbsp;</td></tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label" nowrap> <td class="jive-label" nowrap>
Password: <fmt:message key="setup.datasource.standard.password" />
</td> </td>
<td> <td>
<input type="password" name="password" size="20" maxlength="50" <input type="password" name="password" size="20" maxlength="50"
value="<%= ((password != null) ? password : "") %>"> value="<%= ((password != null) ? password : "") %>">
<span class="jive-description"> <span class="jive-description">
<br> <br>
The password for the user account used for this database - note, this may not be required <fmt:message key="setup.datasource.standard.password_info" />
and can be left blank.
</span> </span>
<% if (errors.get("password") != null) { %> <% if (errors.get("password") != null) { %>
...@@ -317,17 +313,17 @@ function checkSubmit() { ...@@ -317,17 +313,17 @@ function checkSubmit() {
<tr><td colspan="2">&nbsp;</td></tr> <tr><td colspan="2">&nbsp;</td></tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label" nowrap> <td class="jive-label" nowrap>
Connections: <fmt:message key="setup.datasource.standard.connect" />
</td> </td>
<td> <td>
Minimum: <input type="text" name="minConnections" size="5" maxlength="5" <fmt:message key="setup.datasource.standard.min" /> <input type="text" name="minConnections" size="5" maxlength="5"
value="<%= ((minConnections != -1) ? ""+minConnections : "") %>"> value="<%= ((minConnections != -1) ? ""+minConnections : "") %>">
&nbsp; &nbsp;
Maximum: <input type="text" name="maxConnections" size="5" maxlength="5" <fmt:message key="setup.datasource.standard.max" /> <input type="text" name="maxConnections" size="5" maxlength="5"
value="<%= ((maxConnections != -1) ? ""+maxConnections : "") %>"> value="<%= ((maxConnections != -1) ? ""+maxConnections : "") %>">
<span class="jive-description"> <span class="jive-description">
<br> <br>
The minimum and maximum number of database connections the connection pool should maintain. <fmt:message key="setup.datasource.standard.pool" />
</span> </span>
<% if (errors.get("minConnections") != null) { %> <% if (errors.get("minConnections") != null) { %>
...@@ -350,14 +346,14 @@ function checkSubmit() { ...@@ -350,14 +346,14 @@ function checkSubmit() {
<tr><td colspan="2">&nbsp;</td></tr> <tr><td colspan="2">&nbsp;</td></tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label" nowrap> <td class="jive-label" nowrap>
Connection Timeout: <fmt:message key="setup.datasource.standard.timeout" />
</td> </td>
<td> <td>
<input type="text" name="connectionTimeout" size="5" maxlength="5" <input type="text" name="connectionTimeout" size="5" maxlength="5"
value="<%= connectionTimeout %>"> value="<%= connectionTimeout %>">
<span class="jive-description"> <span class="jive-description">
<br> <br>
The time (in days) before connections in the connection pool are recycled. <fmt:message key="setup.datasource.standard.timeout_info" />
</span> </span>
<% if (errors.get("connectionTimeout") != null) { %> <% if (errors.get("connectionTimeout") != null) { %>
...@@ -378,7 +374,7 @@ function checkSubmit() { ...@@ -378,7 +374,7 @@ function checkSubmit() {
<div align="right"> <div align="right">
<input type="submit" name="continue" value=" Continue "> <input type="submit" name="continue" value=" Continue ">
<br> <br>
Note, it might take between 30-60 seconds to connect to your database. <fmt:message key="setup.datasource.standard.note" />
</div> </div>
</form> </form>
......
src/web/setup-env-check.jspf
View file @ 4e6e9efa
...@@ -67,22 +67,22 @@ ...@@ -67,22 +67,22 @@
%> %>
<html> <html>
<head> <head>
<title><fmt:message key="title" /> Setup</title> <title><fmt:message key="title" /> <fmt:message key="setup.env.check.setup" /></title>
<link rel="stylesheet" type="text/css" href="style.css"> <link rel="stylesheet" type="text/css" href="style.css">
</head> </head>
<body> <body>
<p class="jive-setup-page-header"> <p class="jive-setup-page-header">
<fmt:message key="title" /> Setup <fmt:message key="title" /> <fmt:message key="setup.env.check.setup" />
</p> </p>
<p class="jive-setup-error-text"> <p class="jive-setup-error-text">
Error: Can not proceed with <fmt:message key="title" /> setup. <fmt:message key="setup.env.check.error" /> <fmt:message key="title" /> <fmt:message key="setup.env.check.setup" />.
</p> </p>
<p> <p>
Your current installation fails to meet minimum <fmt:message key="title" /> requirements - please see <fmt:message key="setup.env.check.error_info" /> <fmt:message key="title" />
the checklist below: <fmt:message key="setup.env.check.error_info1" />
</p> </p>
<ul> <ul>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<tr> <tr>
<td><img src="images/check.gif" width="13" height="13" border="0"></td> <td><img src="images/check.gif" width="13" height="13" border="0"></td>
<td> <td>
At least JDK 1.5 <fmt:message key="setup.env.check.jdk" />
</td> </td>
</tr> </tr>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
<td><img src="images/x.gif" width="13" height="13" border="0"></td> <td><img src="images/x.gif" width="13" height="13" border="0"></td>
<td> <td>
<span class="jive-setup-error-text"> <span class="jive-setup-error-text">
At least JDK 1.5 <fmt:message key="setup.env.check.jdk" />
</span> </span>
</td> </td>
</tr> </tr>
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
<tr> <tr>
<td><img src="images/check.gif" width="13" height="13" border="0"></td> <td><img src="images/check.gif" width="13" height="13" border="0"></td>
<td> <td>
Servlet 2.2 Support <fmt:message key="setup.env.check.servlet" />
</td> </td>
</tr> </tr>
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<td><img src="images/x.gif" width="13" height="13" border="0"></td> <td><img src="images/x.gif" width="13" height="13" border="0"></td>
<td> <td>
<span class="jive-setup-error-text"> <span class="jive-setup-error-text">
Servlet 2.2 Support <fmt:message key="setup.env.check.servlet" />
</span> </span>
</td> </td>
</tr> </tr>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<tr> <tr>
<td><img src="images/check.gif" width="13" height="13" border="0"></td> <td><img src="images/check.gif" width="13" height="13" border="0"></td>
<td> <td>
JSP 1.1 Support <fmt:message key="setup.env.check.jsp" />
</td> </td>
</tr> </tr>
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
<td><img src="images/x.gif" width="13" height="13" border="0"></td> <td><img src="images/x.gif" width="13" height="13" border="0"></td>
<td> <td>
<span class="jive-setup-error-text"> <span class="jive-setup-error-text">
JSP 1.1 Support <fmt:message key="setup.env.check.jsp" />
</span> </span>
</td> </td>
</tr> </tr>
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
<tr> <tr>
<td><img src="images/check.gif" width="13" height="13" border="0"></td> <td><img src="images/check.gif" width="13" height="13" border="0"></td>
<td> <td>
<fmt:message key="title" /> Classes <fmt:message key="title" /> <fmt:message key="setup.env.check.class" />
</td> </td>
</tr> </tr>
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
<td><img src="images/x.gif" width="13" height="13" border="0"></td> <td><img src="images/x.gif" width="13" height="13" border="0"></td>
<td> <td>
<span class="jive-setup-error-text"> <span class="jive-setup-error-text">
<fmt:message key="title" /> Classes <fmt:message key="title" /> <fmt:message key="setup.env.check.class" />
</span> </span>
</td> </td>
</tr> </tr>
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
<td><img src="images/x.gif" width="13" height="13" border="0"></td> <td><img src="images/x.gif" width="13" height="13" border="0"></td>
<td> <td>
<span class="jive-setup-error-text"> <span class="jive-setup-error-text">
Jive Home Directory (<%= messengerHome.toString() %>) <fmt:message key="setup.env.check.jive" /> (<%= messengerHome.toString() %>)
</span> </span>
</td> </td>
</tr> </tr>
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
<td><img src="images/x.gif" width="13" height="13" border="0"></td> <td><img src="images/x.gif" width="13" height="13" border="0"></td>
<td> <td>
<span class="jive-setup-error-text"> <span class="jive-setup-error-text">
Messenger Home Directory - Not Set <fmt:message key="setup.env.check.not_home" />
</span> </span>
</td> </td>
</tr> </tr>
...@@ -198,8 +198,7 @@ ...@@ -198,8 +198,7 @@
</ul> </ul>
<p> <p>
Please read the installation documentation and try setting up your environment again. After making <fmt:message key="setup.env.check.doc" />
changes, restart your appserver and load this page again.
</p> </p>
</body> </body>
......
src/web/setup-finished.jsp
View file @ 4e6e9efa
...@@ -33,24 +33,23 @@ ...@@ -33,24 +33,23 @@
<%@ include file="setup-header.jspf" %> <%@ include file="setup-header.jspf" %>
<p class="jive-setup-page-header"> <p class="jive-setup-page-header">
<fmt:message key="title" /> Setup Complete! <fmt:message key="title" /> <fmt:message key="setup.finished.title" />
</p> </p>
<p> <p>
This installation of <fmt:message key="title" /> is now complete. <fmt:message key="setup.finished.info" /> <fmt:message key="title" /> <fmt:message key="setup.finished.info1" />
To continue:
</p> </p>
<ol> <ol>
<li> <li>
Please <b style="font-size:1.2em;">restart</b> the server. <fmt:message key="setup.finished.restart" /> <b style="font-size:1.2em;"><fmt:message key="global.restart" /></b> <fmt:message key="setup.finished.restart2" />
</li> </li>
<li> <li>
<% <%
String server = request.getServerName(); String server = request.getServerName();
String port = JiveGlobals.getProperty("adminConsole.port"); String port = JiveGlobals.getProperty("adminConsole.port");
%> %>
<a href="http://<%= server %>:<%= port %>/login.jsp?username=admin">Login to the admin console</a>. <a href="http://<%= server %>:<%= port %>/login.jsp?username=admin"><fmt:message key="setup.finished.login" /></a>.
</li> </li>
</ol> </ol>
......
src/web/setup-header.jspf
View file @ 4e6e9efa
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<html> <html>
<head> <head>
<title><fmt:message key="title" /> Setup</title> <title><fmt:message key="title" /> <fmt:message key="setup.env.check.setup" /></title>
<link rel="stylesheet" type="text/css" href="setup-style.css"> <link rel="stylesheet" type="text/css" href="setup-style.css">
</head> </head>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<table cellpadding="8" cellspacing="0" border="0" width="100%"> <table cellpadding="8" cellspacing="0" border="0" width="100%">
<tr> <tr>
<td> <td>
<fmt:message key="title" /> Setup <fmt:message key="title" /> <fmt:message key="setup.env.check.setup" />
</td> </td>
</tr> </tr>
</table> </table>
......
src/web/setup-host-settings.jsp
View file @ 4e6e9efa
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
java.net.InetAddress" %> java.net.InetAddress" %>
<%@ include file="setup-global.jspf" %> <%@ include file="setup-global.jspf" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<% // Get parameters <% // Get parameters
String domain = ParamUtils.getParameter(request,"domain"); String domain = ParamUtils.getParameter(request,"domain");
int embeddedPort = ParamUtils.getIntParameter(request,"embeddedPort",-1); int embeddedPort = ParamUtils.getIntParameter(request,"embeddedPort",-1);
...@@ -67,12 +67,11 @@ ...@@ -67,12 +67,11 @@
<%@ include file="setup-header.jspf" %> <%@ include file="setup-header.jspf" %>
<p class="jive-setup-page-header"> <p class="jive-setup-page-header">
Server Settings <fmt:message key="setup.host.settings.title" />
</p> </p>
<p> <p>
Below are host settings for this server. Note: the suggested value for the <fmt:message key="setup.host.settings.info" />
domain is based on the network settings of this machine.
</p> </p>
<style type="text/css"> <style type="text/css">
...@@ -84,11 +83,11 @@ LABEL { font-weight : normal; } ...@@ -84,11 +83,11 @@ LABEL { font-weight : normal; }
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
Domain: <fmt:message key="setup.host.settings.domain" />
<% if (errors.get("domain") != null) { %> <% if (errors.get("domain") != null) { %>
<span class="jive-error-text"><br> <span class="jive-error-text"><br>
Invalid domain. <fmt:message key="setup.host.settings.invalid_domain" />
</span> </span>
<% } %> <% } %>
...@@ -98,17 +97,17 @@ LABEL { font-weight : normal; } ...@@ -98,17 +97,17 @@ LABEL { font-weight : normal; }
value="<%= ((domain != null) ? domain : "") %>"> value="<%= ((domain != null) ? domain : "") %>">
<span class="jive-description"> <span class="jive-description">
<br> <br>
Hostname or IP address of this server. <fmt:message key="setup.host.settings.hostname" />
</span> </span>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
Admin Console Port: <fmt:message key="setup.host.settings.port" />
<% if (errors.get("embeddedPort") != null) { %> <% if (errors.get("embeddedPort") != null) { %>
<span class="jive-error-text"><br> <span class="jive-error-text"><br>
Invalid port number. <fmt:message key="setup.host.settings.invalid_port" />
</span> </span>
<% } %> <% } %>
...@@ -118,25 +117,25 @@ LABEL { font-weight : normal; } ...@@ -118,25 +117,25 @@ LABEL { font-weight : normal; }
value="<%= ((embeddedPort != -1) ? ""+embeddedPort : "9090") %>"> value="<%= ((embeddedPort != -1) ? ""+embeddedPort : "9090") %>">
<span class="jive-description"> <span class="jive-description">
<br> <br>
Port number for the web-based admin console (default is 9090). <fmt:message key="setup.host.settings.port_number" />
</span> </span>
</td> </td>
</tr> </tr>
<tr valign="middle"> <tr valign="middle">
<td width="1%" nowrap> <td width="1%" nowrap>
SSL Connections Enabled: <fmt:message key="setup.host.settings.ssl" />
</td> </td>
<td width="99%"> <td width="99%">
<input type="radio" name="sslEnabled" value="true" id="rb01" <input type="radio" name="sslEnabled" value="true" id="rb01"
<%= ((sslEnabled) ? " checked" : "") %>> <%= ((sslEnabled) ? " checked" : "") %>>
<label for="rb01">Yes</label> <label for="rb01"><fmt:message key="setup.host.settings.yes" /></label>
&nbsp; &nbsp;
<input type="radio" name="sslEnabled" value="false" id="rb02" <input type="radio" name="sslEnabled" value="false" id="rb02"
<%= ((!sslEnabled) ? " checked" : "") %>> <%= ((!sslEnabled) ? " checked" : "") %>>
<label for="rb02">No</label> <label for="rb02"><fmt:message key="setup.host.settings.no" /></label>
<span class="jive-description"> <span class="jive-description">
<br> <br>
Enables or disables secure XMPP connections. <fmt:message key="setup.host.settings.secure" />
</span> </span>
</td> </td>
</tr> </tr>
......
src/web/setup-index.jsp
View file @ 4e6e9efa
...@@ -57,15 +57,14 @@ ...@@ -57,15 +57,14 @@
<%@ include file="setup-header.jspf" %> <%@ include file="setup-header.jspf" %>
<p class="jive-setup-page-header"> <p class="jive-setup-page-header">
Setup Checklist <fmt:message key="setup.index.title" />
</p> </p>
<p> <p>
Welcome to <fmt:message key="title" /> Setup. This tool will lead you through the initial setup or <fmt:message key="setup.index.info" /><fmt:message key="title" />
upgrade process. Before continuing, verify that your environment meets all the requirements <fmt:message key="setup.index.info1" />
below.
</p> </p>
<% if (errors.size() > 0) { %> <% if (errors.size() > 0) { %>
...@@ -77,20 +76,20 @@ below. ...@@ -77,20 +76,20 @@ below.
<table cellpadding="3" cellspacing="2" border="0" width="100%"> <table cellpadding="3" cellspacing="2" border="0" width="100%">
<tr> <tr>
<th width="98%">&nbsp;</th> <th width="98%">&nbsp;</th>
<th width="1%" nowrap class="jive-setup-checklist-box">Success</th> <th width="1%" nowrap class="jive-setup-checklist-box"><fmt:message key="setup.index.success" /> </th>
<th width="1%" nowrap class="jive-setup-checklist-box">Error</th> <th width="1%" nowrap class="jive-setup-checklist-box"><fmt:message key="setup.index.error" /></th>
</tr> </tr>
<tr> <tr>
<td colspan="3" class="jive-setup-category-header"> <td colspan="3" class="jive-setup-category-header">
Java VM Support <fmt:message key="setup.index.vm" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="jive-setup-category"> <td class="jive-setup-category">
At least JDK 1.5 <fmt:message key="setup.index.jdk" />
<br> <br>
<span class="jive-info"> <span class="jive-info">
Found: JVM <%= System.getProperty("java.version") %> - <%= System.getProperty("java.vendor") %> <fmt:message key="setup.index.found" /> <%= System.getProperty("java.version") %> - <%= System.getProperty("java.vendor") %>
</span> </span>
</td> </td>
<td align="center" class="jive-setup-checklist-box"><img src="images/check.gif" width="13" height="13" border="0"></td> <td align="center" class="jive-setup-checklist-box"><img src="images/check.gif" width="13" height="13" border="0"></td>
...@@ -98,7 +97,7 @@ below. ...@@ -98,7 +97,7 @@ below.
</tr> </tr>
<tr> <tr>
<td colspan="3" class="jive-setup-category-header"> <td colspan="3" class="jive-setup-category-header">
<fmt:message key="title" /> Classes <fmt:message key="title" /> <fmt:message key="setup.index.class" />
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -106,7 +105,7 @@ below. ...@@ -106,7 +105,7 @@ below.
messenger.jar messenger.jar
<br> <br>
<span class="jive-info"> <span class="jive-info">
<fmt:message key="title" /> classes. <fmt:message key="title" /> <fmt:message key="setup.index.class" />.
</span> </span>
</td> </td>
<td align="center" class="jive-setup-checklist-box"><img src="images/check.gif" width="13" height="13" border="0"></td> <td align="center" class="jive-setup-checklist-box"><img src="images/check.gif" width="13" height="13" border="0"></td>
...@@ -114,19 +113,19 @@ below. ...@@ -114,19 +113,19 @@ below.
</tr> </tr>
<tr> <tr>
<td colspan="3" class="jive-setup-category-header"> <td colspan="3" class="jive-setup-category-header">
<fmt:message key="title" /> Configuration Files <fmt:message key="title" /> <fmt:message key="setup.index.con_file" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="jive-setup-category"> <td class="jive-setup-category">
conf Directory <fmt:message key="setup.index.dir" />
<br> <br>
<span class="jive-info"> <span class="jive-info">
<% boolean messengerHomeOK = true; <% boolean messengerHomeOK = true;
if (messengerHomeErrors.size() == 0) { if (messengerHomeErrors.size() == 0) {
%> %>
Valid conf directory. <fmt:message key="setup.index.valid_conf" />
<% } else { <% } else {
messengerHomeOK = false; messengerHomeOK = false;
...@@ -134,18 +133,15 @@ below. ...@@ -134,18 +133,15 @@ below.
<% if (messengerHomeErrors.get("exists") != null) { %> <% if (messengerHomeErrors.get("exists") != null) { %>
Unable to locate valid conf directory. Please refer to the installation <fmt:message key="setup.index.unable_locate_dir" />
documentation for the correct way to set the conf directory.
<% } else if (messengerHomeErrors.get("read") != null) { %> <% } else if (messengerHomeErrors.get("read") != null) { %>
Setup was able to find your conf directory but does not have read <fmt:message key="setup.index.not_permission" />
permission on it. Please alter the directory permissions.
<% } else if (messengerHomeErrors.get("write") != null) { %> <% } else if (messengerHomeErrors.get("write") != null) { %>
Setup was able to find your conf directory but does not have write permission <fmt:message key="setup.index.not_write_permission" />
on it. Please alter the directory permissions.
......
src/web/setup-pause.jsp
View file @ 4e6e9efa
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
<div align=center> <div align=center>
<p> <p>
Please restart your server and close this window. Launch the admin using either the launcher or start as a service to enter the admin tool. <fmt:message key="setup.pause.title" />
</p> </p>
<a href="javascript:window.close();">Close Window</a> <a href="javascript:window.close();"><fmt:message key="setup.pause.close" /></a>
</div> </div>
<%@ include file="setup-footer.jsp" %> <%@ include file="setup-footer.jsp" %>
......
src/web/setup-sidebar.jsp
View file @ 4e6e9efa
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
--%> --%>
<%@ page import="org.jivesoftware.util.*" %> <%@ page import="org.jivesoftware.util.*" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<%! <%!
final String INCOMPLETE = "incomplete"; final String INCOMPLETE = "incomplete";
final String IN_PROGRESS = "in_progress"; final String IN_PROGRESS = "in_progress";
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<tr bgcolor="#eeeeee"> <tr bgcolor="#eeeeee">
<td align="center"> <td align="center">
<span style="padding:6px"> <span style="padding:6px">
<b>Setup Progress</b> <b><fmt:message key="setup.sidebar.title" /></b>
</span> </span>
</td> </td>
</tr> </tr>
......
src/web/ssl-settings.jsp
View file @ 4e6e9efa
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<% try { %> <% try { %>
<%-- Define Administration Bean --%> <%-- Define Administration Bean --%>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "SSL Security Settings"; String title = LocaleUtils.getLocalizedString("ssl.settings.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "ssl-settings.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "ssl-settings.jsp"));
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Settings updated successfully. <fmt:message key="ssl.settings.update" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Certificate uninstalled successfully. <fmt:message key="ssl.settings.uninstalled" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -135,9 +135,9 @@ ...@@ -135,9 +135,9 @@
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Error uninstalling the certificate. <fmt:message key="ssl.settings.error" />
<% if (e != null && e.getMessage() != null) { %> <% if (e != null && e.getMessage() != null) { %>
Error message: <%= e.getMessage() %> <fmt:message key="ssl.settings.error_messenge" />: <%= e.getMessage() %>
<% } %> <% } %>
</td></tr> </td></tr>
</tbody> </tbody>
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Error installing the certificate, please see the form below. <fmt:message key="ssl.settings.error_certificate" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -160,12 +160,10 @@ ...@@ -160,12 +160,10 @@
<% } %> <% } %>
<p> <p>
SSL/TLS allows secure connections to be made between the server and clients. <fmt:message key="ssl.settings.info" />
This page displays installed certificates. Use the form at the bottom of the page to
install a new certificate.
</p> </p>
<p><b>Installed Certificates</b></p> <p><b><fmt:message key="ssl.settings.certificate" /></b></p>
<div class="jive-table"> <div class="jive-table">
<table cellpadding="0" cellspacing="0" border="0" width="100%"> <table cellpadding="0" cellspacing="0" border="0" width="100%">
...@@ -173,13 +171,13 @@ install a new certificate. ...@@ -173,13 +171,13 @@ install a new certificate.
<tr> <tr>
<th width="1%">&nbsp;</th> <th width="1%">&nbsp;</th>
<th> <th>
Alias (host) <fmt:message key="ssl.settings.alias" />
</th> </th>
<th> <th>
Certificate Type <fmt:message key="ssl.settings.type" />
</th> </th>
<th width="1%"> <th width="1%">
Uninstall <fmt:message key="ssl.settings.uninstall" />
</th> </th>
</tr> </tr>
</thead> </thead>
...@@ -201,15 +199,15 @@ install a new certificate. ...@@ -201,15 +199,15 @@ install a new certificate.
</td> </td>
<td width="1" align="center"> <td width="1" align="center">
<a href="ssl-settings.jsp?alias=<%= a %>&type=server&uninstall=true" <a href="ssl-settings.jsp?alias=<%= a %>&type=server&uninstall=true"
title="Click to uninstall..." title="<fmt:message key="ssl.settings.click_uninstall" />"
onclick="return confirm('Are you sure you want to uninstall this certificate?');" onclick="return confirm('<fmt:message key="ssl.settings.confirm_uninstall" />');"
><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a> ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="3"> <td colspan="3">
<span class="jive-description"> <span class="jive-description">
Public Key: <fmt:message key="ssl.settings.key" />
</span> </span>
<textarea cols="40" rows="3" style="width:100%;font-size:8pt;" wrap="virtual"> <textarea cols="40" rows="3" style="width:100%;font-size:8pt;" wrap="virtual">
<%= c.getPublicKey() %></textarea> <%= c.getPublicKey() %></textarea>
...@@ -223,7 +221,7 @@ install a new certificate. ...@@ -223,7 +221,7 @@ install a new certificate.
<tr> <tr>
<td colspan="4"> <td colspan="4">
<p> <p>
No certificates installed. Use the form below to install one. <fmt:message key="ssl.settings.no_installed" />
</p> </p>
</td> </td>
</tr> </tr>
...@@ -239,12 +237,10 @@ install a new certificate. ...@@ -239,12 +237,10 @@ install a new certificate.
<form action="ssl-settings.jsp" method="post"> <form action="ssl-settings.jsp" method="post">
<fieldset> <fieldset>
<legend>Install Certificate</legend> <legend><fmt:message key="ssl.settings.install_certificate" /></legend>
<div> <div>
<p> <p>
New X.509 certificates can be added to the system by pasting in the certificate <fmt:message key="ssl.settings.install_certificate_info" />
data sent to you by a Certificate Authority (e.g. Verisign) or you can
generate your own self-signed certificates.
</p> </p>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
...@@ -252,7 +248,7 @@ install a new certificate. ...@@ -252,7 +248,7 @@ install a new certificate.
<tr><td>&nbsp;</td> <tr><td>&nbsp;</td>
<td> <td>
<span class="jive-error-text"> <span class="jive-error-text">
Please enter a valid alias. <fmt:message key="ssl.settings.enter_alias" />
</span> </span>
</td> </td>
</tr> </tr>
...@@ -260,7 +256,7 @@ install a new certificate. ...@@ -260,7 +256,7 @@ install a new certificate.
<tr><td>&nbsp;</td> <tr><td>&nbsp;</td>
<td> <td>
<span class="jive-error-text"> <span class="jive-error-text">
Please enter a valid certificate. <fmt:message key="ssl.settings.enter_certificate" />
</span> </span>
</td> </td>
</tr> </tr>
...@@ -270,34 +266,34 @@ install a new certificate. ...@@ -270,34 +266,34 @@ install a new certificate.
<tr><td>&nbsp;</td> <tr><td>&nbsp;</td>
<td> <td>
<span class="jive-error-text"> <span class="jive-error-text">
Error installing the certificate. <fmt:message key="ssl.settings.error_installing" />
<% if (error != null && !"".equals(error.trim())) { %> <% if (error != null && !"".equals(error.trim())) { %>
Error reported: <%= error %>. <fmt:message key="ssl.settings.error_reported" />: <%= error %>.
<% } %> <% } %>
</span> </span>
</td> </td>
</tr> </tr>
<% } %> <% } %>
<tr> <tr>
<td nowrap>Certificate Type:</td> <td nowrap><fmt:message key="ssl.settings.type" />:</td>
<td> <td>
<select name="type" size="1"> <select name="type" size="1">
<option value="server">Server Certificate</option> <option value="server"><fmt:message key="ssl.settings.server" /></option>
<option value="client">Client Certificate</option> <option value="client"><fmt:message key="ssl.settings.client" /></option>
</select> </select>
</td> </td>
</tr> </tr>
<tr> <tr>
<td nowrap>Alias:</td> <td nowrap><fmt:message key="ssl.settings.alias" />:</td>
<td> <td>
<input name="alias" type="text" size="50" maxlength="255" value="<%= (alias != null ? alias : "") %>"> <input name="alias" type="text" size="50" maxlength="255" value="<%= (alias != null ? alias : "") %>">
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td nowrap>Certificate:</td> <td nowrap><fmt:message key="ssl.settings.a_certificate" />:</td>
<td> <td>
<span class="jive-description"> <span class="jive-description">
Paste in the certificate sent to you by the CA or the self-signed certificate generated via the keytool.<br> <fmt:message key="ssl.settings.paste_certificate" /><br>
</span> </span>
<textarea name="cert" cols="55" rows="7" wrap="virtual" style="font-size:8pt;"></textarea> <textarea name="cert" cols="55" rows="7" wrap="virtual" style="font-size:8pt;"></textarea>
</td> </td>
......
src/web/top.jsp
View file @ 4e6e9efa
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
%> %>
<%@ taglib uri="admin" prefix="admin" %> <%@ taglib uri="admin" prefix="admin" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="info" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="info" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
...@@ -27,7 +28,7 @@ ...@@ -27,7 +28,7 @@
<html> <html>
<head> <head>
<title><%= AdminConsole.getAppName() %> Admin Console<%= (info.getTitle() != null ? (": "+info.getTitle()) : "") %></title> <title><%= AdminConsole.getAppName() %> <fmt:message key="login.title" /><%= (info.getTitle() != null ? (": "+info.getTitle()) : "") %></title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link rel="stylesheet" type="text/css" href="<%= path %>/style/global.css"> <link rel="stylesheet" type="text/css" href="<%= path %>/style/global.css">
</head> </head>
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
<tbody> <tbody>
<tr> <tr>
<td> <td>
<img src="<%= path %>/<%= AdminConsole.getLogoImage() %>" border="0" alt="<%= AdminConsole.getAppName() %> Admin Console"> <img src="<%= path %>/<%= AdminConsole.getLogoImage() %>" border="0" alt="<%= AdminConsole.getAppName() %> <fmt:message key="login.title" />">
</td> </td>
<td align="right"> <td align="right">
<table cellpadding="0" cellspacing="0" border="0"> <table cellpadding="0" cellspacing="0" border="0">
......
src/web/user-create.jsp
View file @ 4e6e9efa
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<jsp:useBean id="errors" class="java.util.HashMap" /> <jsp:useBean id="errors" class="java.util.HashMap" />
<% webManager.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean"/> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean"/>
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Create User"; String title = LocaleUtils.getLocalizedString("user.create.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-create.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-create.jsp"));
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<jsp:include page="top.jsp" flush="true"/> <jsp:include page="top.jsp" flush="true"/>
<jsp:include page="title.jsp" flush="true"/> <jsp:include page="title.jsp" flush="true"/>
<p>Use the form below to create a new user.</p> <p><fmt:message key="user.create.info" /></p>
<c:set var="submit" value="${param.create}"/> <c:set var="submit" value="${param.create}"/>
<c:set var="errors" value="${errors}"/> <c:set var="errors" value="${errors}"/>
...@@ -118,21 +118,21 @@ ...@@ -118,21 +118,21 @@
<td class="jive-icon-label"> <td class="jive-icon-label">
<% if (errors.get("general") != null) { %> <% if (errors.get("general") != null) { %>
Error creating the user account. Please check your error logs. <fmt:message key="user.create.error_creating_account" />
<% } else if (errors.get("username") != null) { %> <% } else if (errors.get("username") != null) { %>
Invalid username. <fmt:message key="user.create.invalid_username" />
<% } else if (errors.get("usernameAlreadyExists") != null) { %> <% } else if (errors.get("usernameAlreadyExists") != null) { %>
Username already exists - please choose a different one. <fmt:message key="user.create.user_exist" />
<% } else if (errors.get("name") != null) { %> <% } else if (errors.get("name") != null) { %>
Invalid name. <fmt:message key="user.create.invalid_name" />
<% } else if (errors.get("email") != null) { %> <% } else if (errors.get("email") != null) { %>
Invalid email. <fmt:message key="user.create.invalid_email" />
<% } else if (errors.get("password") != null) { %> <% } else if (errors.get("password") != null) { %>
Invalid password. <fmt:message key="user.create.invalid_password" />
<% } else if (errors.get("passwordMatch") != null) { %> <% } else if (errors.get("passwordMatch") != null) { %>
Passwords don't match. <fmt:message key="user.create.invalid_match_password" />
<% } else if (errors.get("passwordConfirm") != null) { %> <% } else if (errors.get("passwordConfirm") != null) { %>
Invalid password confirmation. <fmt:message key="user.create.invalid_password_confirm" />
<% } %> <% } %>
</td> </td>
</tr> </tr>
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
New user created successfully. <fmt:message key="user.create.created_success" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -159,12 +159,12 @@ ...@@ -159,12 +159,12 @@
<form name="f" action="user-create.jsp" method="get"> <form name="f" action="user-create.jsp" method="get">
<fieldset> <fieldset>
<legend>Create New User</legend> <legend><fmt:message key="user.create.new_user" /></legend>
<div> <div>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
<tr> <tr>
<td width="1%" nowrap><label for="usernametf">Username:</label> *</td> <td width="1%" nowrap><label for="usernametf"><fmt:message key="user.create.username" />:</label> *</td>
<td width="99%"> <td width="99%">
<input type="text" name="username" size="30" maxlength="75" value="<%= ((username!=null) ? username : "") %>" <input type="text" name="username" size="30" maxlength="75" value="<%= ((username!=null) ? username : "") %>"
id="usernametf" autocomplete="off"> id="usernametf" autocomplete="off">
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
</tr> </tr>
<tr> <tr>
<td width="1%" nowrap> <td width="1%" nowrap>
<label for="nametf">Name:</label> <label for="nametf"><fmt:message key="user.create.name" />:</label>
</td> </td>
<td width="99%"> <td width="99%">
<input type="text" name="name" size="30" maxlength="75" value="<%= ((name!=null) ? name : "") %>" <input type="text" name="name" size="30" maxlength="75" value="<%= ((name!=null) ? name : "") %>"
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
</tr> </tr>
<tr> <tr>
<td width="1%" nowrap> <td width="1%" nowrap>
<label for="emailtf">Email:</label></td> <label for="emailtf"><fmt:message key="user.create.email" />:</label></td>
<td width="99%"> <td width="99%">
<input type="text" name="email" size="30" maxlength="75" value="<%= ((email!=null) ? email : "") %>" <input type="text" name="email" size="30" maxlength="75" value="<%= ((email!=null) ? email : "") %>"
id="emailtf"> id="emailtf">
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
</tr> </tr>
<tr> <tr>
<td nowrap> <td nowrap>
<label for="passtf">Password:</label> * <label for="passtf"><fmt:message key="user.create.pwd" />:</label> *
</td> </td>
<td width="99%"> <td width="99%">
<input type="password" name="password" value="" size="20" maxlength="75" <input type="password" name="password" value="" size="20" maxlength="75"
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
</tr> </tr>
<tr> <tr>
<td width="1%" nowrap> <td width="1%" nowrap>
<label for="confpasstf">Confirm Password:</label> * <label for="confpasstf"><fmt:message key="user.create.confirm_pwd" />:</label> *
</td> </td>
<td width="99%"> <td width="99%">
<input type="password" name="passwordConfirm" value="" size="20" maxlength="75" <input type="password" name="passwordConfirm" value="" size="20" maxlength="75"
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
</table> </table>
<br> <br>
<span class="jive-description"> <span class="jive-description">
* Required fields * <fmt:message key="user.create.requied" />
</span> </span>
</div> </div>
</fieldset> </fieldset>
......
src/web/user-delete.jsp
View file @ 4e6e9efa
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Delete User"; String title = LocaleUtils.getLocalizedString("user.delete.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title,
...@@ -74,15 +74,14 @@ ...@@ -74,15 +74,14 @@
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<p> <p>
Are you sure you want to delete the user <fmt:message key="user.delete.info" />
<b><a href="user-properties.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>"><%= user.getUsername() %></a></b> <b><a href="user-properties.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>"><%= user.getUsername() %></a></b>
from the system? <fmt:message key="user.delete.info1" />
</p> </p>
<c:if test="${admin.user.username == param.username}"> <c:if test="${admin.user.username == param.username}">
<p class="jive-warning-text"> <p class="jive-warning-text">
Warning! You are about to delete your <b>own</b> user account. Are you sure you want to <fmt:message key="user.delete.warning" /> <b><fmt:message key="user.delete.warning2" /></b> <fmt:message key="user.delete.warning3" />
do this? Doing so will log you out of the system immediately.
</p> </p>
</c:if> </c:if>
......
src/web/user-edit-form.jsp
View file @ 4e6e9efa
...@@ -16,12 +16,13 @@ ...@@ -16,12 +16,13 @@
org.jivesoftware.admin.*, org.jivesoftware.admin.*,
java.util.HashMap, java.util.HashMap,
java.util.Map, java.util.Map,
java.net.URLEncoder" java.net.URLEncoder,
org.jivesoftware.util.LocaleUtils"
errorPage="error.jsp" errorPage="error.jsp"
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% // Get parameters <% // Get parameters
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Edit User"; String title = LocaleUtils.getLocalizedString("user.edit.form.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title,
...@@ -81,7 +82,7 @@ ...@@ -81,7 +82,7 @@
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
User edited successfully. <fmt:message key="user.edit.form.update" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -90,7 +91,7 @@ ...@@ -90,7 +91,7 @@
<% } %> <% } %>
<p> <p>
Use the form below to edit user properties. <fmt:message key="user.edit.form.info" />
</p> </p>
<form action="user-edit-form.jsp"> <form action="user-edit-form.jsp">
...@@ -99,13 +100,13 @@ Use the form below to edit user properties. ...@@ -99,13 +100,13 @@ Use the form below to edit user properties.
<input type="hidden" name="save" value="true"> <input type="hidden" name="save" value="true">
<fieldset> <fieldset>
<legend>User Properties</legend> <legend><fmt:message key="user.edit.form.property" /></legend>
<div> <div>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
<tr> <tr>
<td class="c1"> <td class="c1">
Username: <fmt:message key="user.create.username" />:
</td> </td>
<td> <td>
<%= user.getUsername() %> <%= user.getUsername() %>
...@@ -113,7 +114,7 @@ Use the form below to edit user properties. ...@@ -113,7 +114,7 @@ Use the form below to edit user properties.
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Name: <fmt:message key="user.create.name" />:
</td> </td>
<td> <td>
<input type="text" size="30" maxlength="150" name="name" <input type="text" size="30" maxlength="150" name="name"
...@@ -122,7 +123,7 @@ Use the form below to edit user properties. ...@@ -122,7 +123,7 @@ Use the form below to edit user properties.
<% if (errors.get("name") != null) { %> <% if (errors.get("name") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
Please enter a valid name. <fmt:message key="user.edit.form.enter_name" />
</span> </span>
<% } %> <% } %>
...@@ -130,7 +131,7 @@ Use the form below to edit user properties. ...@@ -130,7 +131,7 @@ Use the form below to edit user properties.
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Email: <fmt:message key="user.create.email" />:
</td> </td>
<td> <td>
<input type="text" size="30" maxlength="150" name="email" <input type="text" size="30" maxlength="150" name="email"
...@@ -139,7 +140,7 @@ Use the form below to edit user properties. ...@@ -139,7 +140,7 @@ Use the form below to edit user properties.
<% if (errors.get("email") != null) { %> <% if (errors.get("email") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
Please enter a valid email address. fmt:message key="user.edit.form.enter_mail" />
</span> </span>
<% } %> <% } %>
......
src/web/user-message.jsp
View file @ 4e6e9efa
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<% // Get parameters <% // Get parameters
String username = ParamUtils.getParameter(request,"username"); String username = ParamUtils.getParameter(request,"username");
boolean send = ParamUtils.getBooleanParameter(request,"send"); boolean send = ParamUtils.getBooleanParameter(request,"send");
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Send Administrative Message"; String title = LocaleUtils.getLocalizedString("user.message.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-message.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-message.jsp"));
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Message sent successfully. <fmt:message key="user.message.send" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -172,27 +172,26 @@ function updateSelect(el) { ...@@ -172,27 +172,26 @@ function updateSelect(el) {
<% } %> <% } %>
<table cellpadding="3" cellspacing="1" border="0" width="600"> <table cellpadding="3" cellspacing="1" border="0" width="600">
<tr class="tableHeader"><td colspan="3" align="left">Send Administrative Message</td></tr> <tr class="tableHeader"><td colspan="3" align="left"><fmt:message key="user.message.send_admin_msg" /></td></tr>
<tr><td colspan=3 class="text"> <tr><td colspan=3 class="text">
<% if (user == null) { %> <% if (user == null) { %>
Use the form below to send an administrative message to all users. <fmt:message key="user.message.info" />
<% } else { %> <% } else { %>
User the form below to send an administrative message to the specified user. If the user is <fmt:message key="user.message.specified_user_info" />
connected from multiple sessions you will need to choose which session to message.
<% } %> <% } %>
</td></tr> </td></tr>
<tr> <tr>
<td class="jive-label"> <td class="jive-label">
To: <fmt:message key="user.message.to" />:
</td> </td>
<td> <td>
<% if (user == null) { %> <% if (user == null) { %>
All Online Users <fmt:message key="user.message.all_online_user" />
<% } else { %> <% } else { %>
...@@ -217,7 +216,7 @@ function updateSelect(el) { ...@@ -217,7 +216,7 @@ function updateSelect(el) {
<input type="checkbox" name="sendToAll" value="true" id="cb01" <input type="checkbox" name="sendToAll" value="true" id="cb01"
onfocus="updateSelect(this);" onclick="updateSelect(this);"> onfocus="updateSelect(this);" onclick="updateSelect(this);">
<label for="cb01">Send to all user sessions</label> <label for="cb01"><fmt:message key="user.message.send_session" /></label>
<% } %> <% } %>
...@@ -225,7 +224,7 @@ function updateSelect(el) { ...@@ -225,7 +224,7 @@ function updateSelect(el) {
<br> <br>
<span class="jive-error-text"> <span class="jive-error-text">
Please choose a valid address. <fmt:message key="user.message.valid_address" />
</span> </span>
<% } %> <% } %>
...@@ -235,13 +234,13 @@ function updateSelect(el) { ...@@ -235,13 +234,13 @@ function updateSelect(el) {
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td class="jive-label"> <td class="jive-label">
Message: <fmt:message key="user.message.message" />:
</td> </td>
<td> <td>
<% if (errors.get("message") != null) { %> <% if (errors.get("message") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
Please enter a valid message. <fmt:message key="user.message.valid_message" />
</span> </span>
<br> <br>
......
src/web/user-password.jsp
View file @ 4e6e9efa
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
<% // Get parameters // <% // Get parameters //
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Change Password"; String title = LocaleUtils.getLocalizedString("user.password.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title,
...@@ -75,8 +75,7 @@ ...@@ -75,8 +75,7 @@
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Error setting the password. Please make sure the password you enter is valid and <fmt:message key="user.password.error_set_pwd" />
matches the confirmation password.
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -89,7 +88,7 @@ ...@@ -89,7 +88,7 @@
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Password updated successfully. <fmt:message key="user.password.update" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -98,20 +97,20 @@ ...@@ -98,20 +97,20 @@
<% } %> <% } %>
<p> <p>
Use the form below to change the user's password. <fmt:message key="user.password.info" />
</p> </p>
<form action="user-password.jsp" name="passform" method="post"> <form action="user-password.jsp" name="passform" method="post">
<input type="hidden" name="username" value="<%= username %>"> <input type="hidden" name="username" value="<%= username %>">
<fieldset> <fieldset>
<legend>Change Password</legend> <legend><fmt:message key="user.password.change" /></legend>
<div> <div>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
<tr> <tr>
<td class="c1"> <td class="c1">
Username: <fmt:message key="user.create.username" />:
</td> </td>
<td class="c2"> <td class="c2">
<%= user.getUsername() %> <%= user.getUsername() %>
...@@ -119,7 +118,7 @@ Use the form below to change the user's password. ...@@ -119,7 +118,7 @@ Use the form below to change the user's password.
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
New Password: <fmt:message key="user.password.new_pwd" />:
</td> </td>
<td clas="c2"> <td clas="c2">
<input type="password" name="password" value="" size="20" maxlength="50"> <input type="password" name="password" value="" size="20" maxlength="50">
...@@ -127,7 +126,7 @@ Use the form below to change the user's password. ...@@ -127,7 +126,7 @@ Use the form below to change the user's password.
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Confirm New Password: <fmt:message key="user.password.confirm_new_pwd" />:
</td> </td>
<td class="c2"> <td class="c2">
<input type="password" name="passwordConfirm" value="" size="20" maxlength="50"> <input type="password" name="passwordConfirm" value="" size="20" maxlength="50">
......
src/web/user-properties.jsp
View file @ 4e6e9efa
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% // Get parameters // <% // Get parameters //
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "User Properties"; String title = LocaleUtils.getLocalizedString("user.properties.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title,
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true" />
<p> <p>
Below is a summary of user properties. To edit properties, click the "Edit" button below. <fmt:message key="user.properties.info" />
</p> </p>
<% if (request.getParameter("success") != null) { %> <% if (request.getParameter("success") != null) { %>
...@@ -88,7 +88,7 @@ Below is a summary of user properties. To edit properties, click the "Edit" butt ...@@ -88,7 +88,7 @@ Below is a summary of user properties. To edit properties, click the "Edit" butt
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
New user created successfully. <fmt:message key="user.properties.created" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -101,7 +101,7 @@ Below is a summary of user properties. To edit properties, click the "Edit" butt ...@@ -101,7 +101,7 @@ Below is a summary of user properties. To edit properties, click the "Edit" butt
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
User properties updated successfully. <fmt:message key="user.properties.update" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -114,14 +114,14 @@ Below is a summary of user properties. To edit properties, click the "Edit" butt ...@@ -114,14 +114,14 @@ Below is a summary of user properties. To edit properties, click the "Edit" butt
<thead> <thead>
<tr> <tr>
<th colspan="2"> <th colspan="2">
User Properties <fmt:message key="user.properties.title" />
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td class="c1"> <td class="c1">
Username: <fmt:message key="user.create.username" />:
</td> </td>
<td> <td>
<%= user.getUsername() %> <%= user.getUsername() %>
...@@ -129,49 +129,49 @@ Below is a summary of user properties. To edit properties, click the "Edit" butt ...@@ -129,49 +129,49 @@ Below is a summary of user properties. To edit properties, click the "Edit" butt
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Status: <fmt:message key="session.details.status" />:
</td> </td>
<td> <td>
<% if (presenceManager.isAvailable(user)) { <% if (presenceManager.isAvailable(user)) {
Presence presence = presenceManager.getPresence(user); Presence presence = presenceManager.getPresence(user);
%> %>
<% if (presence.getShow() == null) { %> <% if (presence.getShow() == null) { %>
<img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="Available"> <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.available" />">
Available <fmt:message key="user.properties.available" />
<% } %> <% } %>
<% if (presence.getShow() == Presence.Show.chat) { %> <% if (presence.getShow() == Presence.Show.chat) { %>
<img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="Available to Chat"> <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.chat_available" />">
Available to Chat <fmt:message key="session.details.chat_available" />
<% } %> <% } %>
<% if (presence.getShow() == Presence.Show.away) { %> <% if (presence.getShow() == Presence.Show.away) { %>
<img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="Away"> <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.away" />">
Away <fmt:message key="session.details.away" />
<% } %> <% } %>
<% if (presence.getShow() == Presence.Show.xa) { %> <% if (presence.getShow() == Presence.Show.xa) { %>
<img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="Extended Away"> <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.extended" />">
Extended Away <fmt:message key="session.details.extended" />
<% } %> <% } %>
<% if (presence.getShow() == Presence.Show.dnd) { %> <% if (presence.getShow() == Presence.Show.dnd) { %>
<img src="images/user-red-16x16.gif" width="16" height="16" border="0" alt="Do not Disturb"> <img src="images/user-red-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.not_disturb" />">
Do not Disturb <fmt:message key="session.details.not_disturb" />
<% } %> <% } %>
<% } else { %> <% } else { %>
<img src="images/user-clear-16x16.gif" width="16" height="16" border="0" alt="Offline"> <img src="images/user-clear-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.offline" />">
(Offline) (<fmt:message key="user.properties.offline" />)
<% } %> <% } %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Name: <fmt:message key="user.create.name" />:
</td> </td>
<td> <td>
<% if ("".equals(user.getName())) { %> <% if ("".equals(user.getName())) { %>
<span style="color:#999"> <span style="color:#999">
<i>Not set.</i> <i><fmt:message key="user.properties.not_set" /></i>
</span> </span>
<% } else { %> <% } else { %>
...@@ -182,12 +182,12 @@ Below is a summary of user properties. To edit properties, click the "Edit" butt ...@@ -182,12 +182,12 @@ Below is a summary of user properties. To edit properties, click the "Edit" butt
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Email: <fmt:message key="user.create.email" />:
</td> </td>
<td> <td>
<% if (user.getEmail() == null) { %> <% if (user.getEmail() == null) { %>
<span style="color:#999"> <span style="color:#999">
<i>Not set.</i> <i><fmt:message key="user.properties.not_set" /></i>
</span> </span>
<% } else { %> <% } else { %>
...@@ -199,7 +199,7 @@ Below is a summary of user properties. To edit properties, click the "Edit" butt ...@@ -199,7 +199,7 @@ Below is a summary of user properties. To edit properties, click the "Edit" butt
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
Registered: <fmt:message key="user.properties.registered" />:
</td> </td>
<td> <td>
<%= formatter.format(user.getCreationDate()) %> <%= formatter.format(user.getCreationDate()) %>
......
src/web/user-search.jsp
View file @ 4e6e9efa
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<%-- Define Administration Bean --%> <%-- Define Administration Bean --%>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"/> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"/>
<% webManager.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
%> %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean"/> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean"/>
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "User Search"; String title = LocaleUtils.getLocalizedString("user.search.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-search.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-search.jsp"));
...@@ -57,15 +57,15 @@ ...@@ -57,15 +57,15 @@
<jsp:include page="top.jsp" flush="true"/> <jsp:include page="top.jsp" flush="true"/>
<jsp:include page="title.jsp" flush="true"/> <jsp:include page="title.jsp" flush="true"/>
<% if (errors.size() > 0) { %> <% if (errors.size() > 0) { %>
<p class="jive-error-text">User not found. Please try a different search.</p> <p class="jive-error-text"><fmt:message key="user.search.not_found" /></p>
<% } %> <% } %>
<form name="f" action="user-search.jsp"> <form name="f" action="user-search.jsp">
<input type="hidden" name="search" value="true"/> <input type="hidden" name="search" value="true"/>
<fieldset> <fieldset>
<legend>Search For User</legend> <legend><fmt:message key="user.search.search_user" /></legend>
<table cellpadding="3" cellspacing="1" border="0" width="600"> <table cellpadding="3" cellspacing="1" border="0" width="600">
<tr class="c1"> <tr class="c1">
<td width="1%">Username:</td> <td width="1%"><fmt:message key="user.create.username" />:</td>
<td class="c2"> <td class="c2">
<input type="text" name="username" value="<%= ((username!=null) ? username : "") %>" size="30" maxlength="75"/> <input type="text" name="username" value="<%= ((username!=null) ? username : "") %>" size="30" maxlength="75"/>
</td> </td>
......
src/web/user-summary.jsp
View file @ 4e6e9efa
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<% webManager.init(request, response, session, application, out ); %> <% webManager.init(request, response, session, application, out ); %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "User Summary"; String title = LocaleUtils.getLocalizedString("User.Summary.title");
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-summary.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-summary.jsp"));
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
%> %>
<p> <p>
Below is a list of users in the system. <fmt:message key="User.Summary.info" />
</p> </p>
<% if (request.getParameter("deletesuccess") != null) { %> <% if (request.getParameter("deletesuccess") != null) { %>
...@@ -65,7 +65,7 @@ Below is a list of users in the system. ...@@ -65,7 +65,7 @@ Below is a list of users in the system.
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
User deleted successfully. <fmt:message key="User.Summary.deleted" />
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
...@@ -74,19 +74,19 @@ Below is a list of users in the system. ...@@ -74,19 +74,19 @@ Below is a list of users in the system.
<% } %> <% } %>
<p> <p>
Total Users: <%= webManager.getUserManager().getUserCount() %>, <fmt:message key="User.Summary.total_user" />: <%= webManager.getUserManager().getUserCount() %>,
<% if (numPages > 1) { %> <% if (numPages > 1) { %>
Showing <%= (start+1) %>-<%= (start+range) %>, <fmt:message key="User.Summary.showing" /> <%= (start+1) %>-<%= (start+range) %>,
<% } %> <% } %>
Sorted by Username <fmt:message key="User.Summary.sorted" />
</p> </p>
<% if (numPages > 1) { %> <% if (numPages > 1) { %>
<p> <p>
Pages: <fmt:message key="User.Summary.pages" />:
[ [
<% for (int i=0; i<numPages; i++) { <% for (int i=0; i<numPages; i++) {
String sep = ((i+1)<numPages) ? " " : ""; String sep = ((i+1)<numPages) ? " " : "";
...@@ -107,12 +107,12 @@ Sorted by Username ...@@ -107,12 +107,12 @@ Sorted by Username
<thead> <thead>
<tr> <tr>
<th>&nbsp;</th> <th>&nbsp;</th>
<th>Online</th> <th><fmt:message key="session.details.online" /></th>
<th>Username</th> <th><fmt:message key="user.create.username" /></th>
<th>Name</th> <th><fmt:message key="user.create.name" /></th>
<th>Created</th> <th><fmt:message key="User.Summary.created" /></th>
<th>Edit</th> <th><fmt:message key="User.Summary.edit" /></th>
<th>Delete</th> <th><fmt:message key="User.Summary.delete" /></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -123,7 +123,7 @@ Sorted by Username ...@@ -123,7 +123,7 @@ Sorted by Username
%> %>
<tr> <tr>
<td align="center" colspan="7"> <td align="center" colspan="7">
No users in the system. <fmt:message key="User.Summary.not_user" />
</td> </td>
</tr> </tr>
...@@ -142,24 +142,24 @@ Sorted by Username ...@@ -142,24 +142,24 @@ Sorted by Username
Presence presence = presenceManager.getPresence(user); Presence presence = presenceManager.getPresence(user);
%> %>
<% if (presence.getShow() == null) { %> <% if (presence.getShow() == null) { %>
<img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="Available"> <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.available" />">
<% } %> <% } %>
<% if (presence.getShow() == Presence.Show.chat) { %> <% if (presence.getShow() == Presence.Show.chat) { %>
<img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="Available to Chat"> <img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.chat_available" />">
<% } %> <% } %>
<% if (presence.getShow() == Presence.Show.away) { %> <% if (presence.getShow() == Presence.Show.away) { %>
<img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="Away"> <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.away" />">
<% } %> <% } %>
<% if (presence.getShow() == Presence.Show.xa) { %> <% if (presence.getShow() == Presence.Show.xa) { %>
<img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="Extended Away"> <img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.extended" />">
<% } %> <% } %>
<% if (presence.getShow() == Presence.Show.dnd) { %> <% if (presence.getShow() == Presence.Show.dnd) { %>
<img src="images/user-red-16x16.gif" width="16" height="16" border="0" alt="Do not Disturb"> <img src="images/user-red-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.not_disturb" />">
<% } %> <% } %>
<% } else { %> <% } else { %>
<img src="images/user-clear-16x16.gif" width="16" height="16" border="0" alt="Offline"> <img src="images/user-clear-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.offline" />">
<% } %> <% } %>
</td> </td>
...@@ -174,12 +174,12 @@ Sorted by Username ...@@ -174,12 +174,12 @@ Sorted by Username
</td> </td>
<td width="1%" align="center"> <td width="1%" align="center">
<a href="user-edit-form.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>" <a href="user-edit-form.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>"
title="Click to edit..." title="<fmt:message key="User.Summary.click_edit" />"
><img src="images/edit-16x16.gif" width="17" height="17" border="0"></a> ><img src="images/edit-16x16.gif" width="17" height="17" border="0"></a>
</td> </td>
<td width="1%" align="center" style="border-right:1px #ccc solid;"> <td width="1%" align="center" style="border-right:1px #ccc solid;">
<a href="user-delete.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>" <a href="user-delete.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>"
title="Click to delete..." title="<fmt:message key="User.Summary.click_delete" />"
><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a> ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
</td> </td>
</tr> </tr>
...@@ -194,7 +194,7 @@ Sorted by Username ...@@ -194,7 +194,7 @@ Sorted by Username
<% if (numPages > 1) { %> <% if (numPages > 1) { %>
<p> <p>
Pages: <fmt:message key="User.Summary.pages" />:
[ [
<% for (i=0; i<numPages; i++) { <% for (i=0; i<numPages; i++) {
String sep = ((i+1)<numPages) ? " " : ""; String sep = ((i+1)<numPages) ? " " : "";
......
src/web/user-tabs.jsp
View file @ 4e6e9efa
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
org.jivesoftware.messenger.user.*" org.jivesoftware.messenger.user.*"
%> %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<%-- Define Administration Bean --%> <%-- Define Administration Bean --%>
<jsp:useBean id="ad" class="org.jivesoftware.util.WebManager" /> <jsp:useBean id="ad" class="org.jivesoftware.util.WebManager" />
<% ad.init(request, response, session, application, out ); %> <% ad.init(request, response, session, application, out ); %>
...@@ -35,14 +36,14 @@ ...@@ -35,14 +36,14 @@
<c:set var="tabCount" value="1" /> <c:set var="tabCount" value="1" />
<td class="jive-<%= (("props".equals(tabName)) ? "selected-" : "") %>tab" width="1%" nowrap> <td class="jive-<%= (("props".equals(tabName)) ? "selected-" : "") %>tab" width="1%" nowrap>
<a href="user-properties.jsp?username=<c:out value="${username}"/>">User Properties</a> <a href="user-properties.jsp?username=<c:out value="${username}"/>"><fmt:message key="user.tabs.properties" /></a>
</td> </td>
<td class="jive-tab-spacer" width="1%"><img src="images/blank.gif" width="5" height="1" border="0"></td> <td class="jive-tab-spacer" width="1%"><img src="images/blank.gif" width="5" height="1" border="0"></td>
<c:set var="tabCount" value="${tabCount + 1}" /> <c:set var="tabCount" value="${tabCount + 1}" />
<td class="jive-<%= (("edit".equals(tabName)) ? "selected-" : "") %>tab" width="1%" nowrap> <td class="jive-<%= (("edit".equals(tabName)) ? "selected-" : "") %>tab" width="1%" nowrap>
<a href="user-edit-form.jsp?username=<c:out value="${username}"/>">Edit User</a> <a href="user-edit-form.jsp?username=<c:out value="${username}"/>"><fmt:message key="user.tabs.edit" /></a>
</td> </td>
<td class="jive-tab-spacer" width="1%"><img src="images/blank.gif" width="5" height="1" border="0"></td> <td class="jive-tab-spacer" width="1%"><img src="images/blank.gif" width="5" height="1" border="0"></td>
...@@ -53,7 +54,7 @@ ...@@ -53,7 +54,7 @@
%> %>
<td class="jive-<%= (("message".equals(tabName)) ? "selected-" : "") %>tab" width="1%" nowrap> <td class="jive-<%= (("message".equals(tabName)) ? "selected-" : "") %>tab" width="1%" nowrap>
<a href="user-message.jsp?username=<c:out value="${username}"/>">Send Message</a> <a href="user-message.jsp?username=<c:out value="${username}"/>"><fmt:message key="user.tabs.send" /></a>
</td> </td>
<td class="jive-tab-spacer" width="1%"><img src="images/blank.gif" width="5" height="1" border="0"></td> <td class="jive-tab-spacer" width="1%"><img src="images/blank.gif" width="5" height="1" border="0"></td>
...@@ -63,14 +64,14 @@ ...@@ -63,14 +64,14 @@
<% } %> <% } %>
<td class="jive-<%= (("pass".equals(tabName)) ? "selected-" : "") %>tab" width="1%" nowrap> <td class="jive-<%= (("pass".equals(tabName)) ? "selected-" : "") %>tab" width="1%" nowrap>
<a href="user-password.jsp?username=<c:out value="${username}"/>">Change Password</a> <a href="user-password.jsp?username=<c:out value="${username}"/>"><fmt:message key="user.tabs.change_pwd" /></a>
</td> </td>
<td class="jive-tab-spacer" width="1%"><img src="images/blank.gif" width="5" height="1" border="0"></td> <td class="jive-tab-spacer" width="1%"><img src="images/blank.gif" width="5" height="1" border="0"></td>
<c:set var="tabCount" value="${tabCount + 1}" /> <c:set var="tabCount" value="${tabCount + 1}" />
<td class="jive-<%= (("delete".equals(tabName)) ? "selected-" : "") %>tab" width="1%" nowrap> <td class="jive-<%= (("delete".equals(tabName)) ? "selected-" : "") %>tab" width="1%" nowrap>
<a href="user-delete.jsp?username=<c:out value="${username}"/>">Delete User</a> <a href="user-delete.jsp?username=<c:out value="${username}"/>"><fmt:message key="user.tabs.delete_user" /></a>
</td> </td>
<td class="jive-tab-spacer" width="1%"><img src="images/blank.gif" width="5" height="1" border="0"></td> <td class="jive-tab-spacer" width="1%"><img src="images/blank.gif" width="5" height="1" border="0"></td>
<c:set var="width" value="${100-(tabCount*2)}" /> <c:set var="width" value="${100-(tabCount*2)}" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023