JBoss Portal SVN: r12916 - in branches/JBoss_Portal_Branch_2_7: theme/src/bin/portal-ajax-war/dyna and 1 other directory.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2009-02-28 17:01:48 -0500 (Sat, 28 Feb 2009)
New Revision: 12916
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/style.css
Log:
JBPORTAL-2226 - fails in IE testing, made some improvements (em doesn't really help in this layout since height is px based, actually the whole layout is :/ )
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-28 21:31:41 UTC (rev 12915)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-28 22:01:48 UTC (rev 12916)
@@ -481,6 +481,9 @@
.portlet-mode-container {
white-space: nowrap;
float: right;
+ padding: 2px 0 0 0;
+ position: relative;
+ z-index: 1;
}
.mode-button {
@@ -496,10 +499,10 @@
font-size: 12px;
font-weight: bold;
white-space: nowrap;
- line-height: 100%;
+ line-height: 20px;
float: left;
text-indent: 5px;
- padding-top: 5px;
+ padding-top: 4px;
padding-bottom: 6px;
display: block;
margin-right: 10px;
Modified: branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/style.css 2009-02-28 21:31:41 UTC (rev 12915)
+++ branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/style.css 2009-02-28 22:01:48 UTC (rev 12916)
@@ -8,18 +8,17 @@
}
/*
-Add height to handle div so that we can drag from the whole bar instead of just the title. Should work in IE as well,
-though it hasn't been tested.
+Add height to handle div so that we can drag from the whole bar instead of just the title.
*/
.dnd-handle {
cursor: move;
position: relative;
- min-height: 1.2em;
+ min-height: 21px;
height: auto !important;
- height: 1.2em;
+ height: 21px;
}
.dnd-droppable {
- border: red 1px dashed;
+ border: green 1px dashed;
background-color: Transparent;
}
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r12915 - branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles.
by portal-commits＠lists.jboss.org
Author: jpviragine
Date: 2009-02-28 16:31:41 -0500 (Sat, 28 Feb 2009)
New Revision: 12915
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties
Log:
minor changes
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties 2009-02-28 18:53:32 UTC (rev 12914)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties 2009-02-28 21:31:41 UTC (rev 12915)
@@ -1,188 +1,187 @@
-################################################################################
-# JBoss, a division of Red Hat #
-# Copyright 2006, Red Hat Middleware, LLC, and individual #
-# contributors as indicated by the @authors tag. See the #
-# copyright.txt in the distribution for a full listing of #
-# individual contributors. #
-# #
-# This is free software; you can redistribute it and/or modify it #
-# under the terms of the GNU Lesser General Public License as #
-# published by the Free Software Foundation; either version 2.1 of #
-# the License, or (at your option) any later version. #
-# #
-# This software is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
-# Lesser General Public License for more details. #
-# #
-# You should have received a copy of the GNU Lesser General Public #
-# License along with this software; if not, write to the Free #
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA #
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
-################################################################################
-
-IDENTITY_APPLICATION_NOT_AVAILABLE=Portlet n\u00e3o dispon\u00edvel. Verifique sua configura\u00e7\u00e3o e log de erro para mais informa\u00e7\u00f5es.
-
-IDENTITY_WELCOME=Bem-vindo
-IDENTITY_REGISTER=Registro
-IDENTITY_LOST_PASSWORD=Senha Perdida
-IDENTITY_NOT_LOGGED_IN=Voc\u00ea n\u00e3o est\u00e1 atualmente logado.
-IDENTITY_CREATE_ACCOUNT=Voc\u00ea pode criar uma conta.
-IDENTITY_BUTTON_SUBMIT=Confirmar
-IDENTITY_BUTTON_EDIT=Editar
-IDENTITY_BUTTON_CANCEL=Cancelar
-
-IDENTITY_REGISTER_TITLE=Informa\u00e7\u00f5es B\u00e1sicas do Usu\u00e1rio
-IDENTITY_REGISTER_TITLE_CONFIRM=Confirma\u00e7\u00e3o
-IDENTITY_REGISTER_PASSWORD_CONFIRM=Confirme sua senha
-IDENTITY_REGISTER_STATUS_TITLE=Estado do Registro
-IDENTITY_REGISTER_SUCCESS_TITLE=Sua conta foi criada com sucesso. Voc\u00ea pode logar.
-IDENTITY_REGISTER_PENDING_TITLE=Um e-mail foi enviado para o seu endere\u00e7o de e-mail para verificar seu registro.
-IDENTITY_REGISTER_REQUIRED_INFORMATION=indica um campo obrigat\u00f3rio.
-
-IDENTITY_LOST_PASSWORD_TITLE=Esqueceu seus dados de login?
-IDENTITY_LOST_PASSWORD_DESCRIPTION=Por favor, informe seu usu\u00e1rio para resetar sua senha.
-IDENTITY_LOST_PASSWORD_ERROR=Falha ao atualizar a senha.
-IDENTITY_LOST_PASSWORD_STATUS_SUCCESSFUL=Voc\u00ea receber\u00e1 um e-mail com a sua nova senha.
-IDENTITY_LOST_PASSWORD_STATUS_404=Conta n\u00e3o encontrada.
-IDENTITY_LOST_PASSWORD_STATUS_TITLE=Senha n\u00e3o encontrada
-
-IDENTITY_EDIT_PROFILE_ERROR=Erro durante a atualiza\u00e7\u00e3o do perfil.
-IDENTITY_EDIT_PASSWORD_TITLE=Alterar sua senha
-IDENTITY_EDIT_PASSWORD_CURRENT=Senha atual
-IDENTITY_EDIT_CHANGE_PASSWORD=Alterar senha
-IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=Senha n\u00e3o pode ser alterada.
-IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=Senha atualizada.
-
-IDENTITY_EDIT_EMAIL_TITLE=Altere seu endere\u00e7o de e-mail
-IDENTITY_EDIT_EMAIL_NEW=Novo endere\u00e7o de e-mail
-IDENTITY_EDIT_CHANGE_EMAIL=Alterar e-mail
-IDENTITY_EDIT_CHANGE_EMAIL_ERROR=E-mail n\u00e3o alterado
-IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING=Um e-mail de valida\u00e7\u00e3o foi encaminhado ao seu endere\u00e7o.
-IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED=Endere\u00e7o de E-mail alterado.
-
-IDENTITY_EDIT_PROFILE_TITLE=Editar perfil
-IDENTITY_VIEW_PROFILE_TITLE=Ver perfil
-
-IDENTITY_USERNAME=Usu\u00e1rio
-IDENTITY_PASSWORD=Senha
-IDENTITY_EMAIL=E-Mail
-IDENTITY_GIVENNAME=Primeiro nome
-IDENTITY_FAMILYNAME=\u00daltimo nome
-IDENTITY_SKYPE=ID Skype
-IDENTITY_LOCATION=Localiza\u00e7\u00e3o
-IDENTITY_OCCUPATION=Ocupa\u00e7\u00e3o
-IDENTITY_EXTRA=Extra
-IDENTITY_SIGNATURE=Assinatura
-IDENTITY_INTERESTS=Interesses
-IDENTITY_LOCALE=Localidade
-IDENTITY_ICQ=ID ICQ
-IDENTITY_AIM=ID AIM
-IDENTITY_MSNM=ID MSN
-IDENTITY_YIM=ID Yahoo!
-IDENTITY_XMMP=ID XMNP
-IDENTITY_HOMEPAGE=P\u00e1gina Inicial
-IDENTITY_TIMEZONE=Fuso hor\u00e1rio
-IDENTITY_THEME=Tema
-IDENTITY_SECURITY_QUESTION=Pergunta
-IDENTITY_SECURITY_ANSWER=Resposta
-IDENTITY_LAST_LOGIN=\u00daltimo login
-IDENTITY_REIGSTRATION_DATE=Data de registro
-IDENTITY_ENABLED=Habilitado
-IDENTITY_SICKCODE=C\u00f3digo SICK
-
-IDENTITY_CATEGORY_GENERAL=Prefer\u00eancias Gerais
-IDENTITY_CATEGORY_PERSONAL=Informa\u00e7\u00f5es Pessoais
-IDENTITY_CATEGORY_INSTANT=Identidades de Mensagem Instant\u00e2nea
-IDENTITY_CATEGORY_ADDITIONAL=Informa\u00e7\u00f5es Adicionais
-
-IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE=(Assinatura de 255 caracteres no m\u00e1ximo)
-IDENTITY_CATEGORY_ADDITIONAL_EXTRA=(255 caracteres no m\u00e1ximo.)
-
-IDENTITY_MANAGEMENT_ACTION=A\u00e7\u00f5es
-IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=Editar usu\u00e1rio
-IDENTITY_MANAGEMENT_ACTION_ROLES=Pap\u00e9is
-IDENTITY_MANAGEMENT_ACTION_DELETE=Deletar
-IDENTITY_MANAGEMENT_USER_MANAGEMENT=Gerenciamento de Usu\u00e1rio
-IDENTITY_MANAGEMENT_ROLE_MANAGEMENT=Gerenciamento de Pap\u00e9is
-IDENTITY_MANAGEMENT_SEARCH_USER=Pesquisar usu\u00e1rios
-IDENTITY_MANAGEMENT_CREATE_USER=Criar uma nova conta de usu\u00e1rio
-IDENTITY_MANAGEMENT_CREATE_USER_CREATED=Usu\u00e1rio criado
-IDENTITY_MANAGEMENT_USER_DELETED=Usu\u00e1rio deletado
-IDENTITY_MANAGEMENT_ROLE=Papel
-IDENTITY_MANAGEMENT_ROLE_DISPLAY=Exibir nome
-IDENTITY_MANAGEMENT_ROLE_MEMBERS=Membros
-IDENTITY_MANAGEMENT_ROLE_ASSIGNED=Pap\u00e9is atribu\u00eddos
-IDENTITY_MANAGEMENT_CREATE_ROLE=Criar novo papel
-IDENTITY_MANAGEMENT_EDIT_ROLE=Editar papel
-IDENTITY_MANAGEMENT_CREATE_ROLE=Criar papel
-IDENTITY_MANAGEMENT_DISABLE=Desabilitar
-IDENTITY_MANAGEMENT_DISABLE_USER_DISABLED=Usu\u00e1rio desabilitado
-IDENTITY_MANAGEMENT_ENABLE=habilitado
-IDENTITY_MANAGEMENT_ENABLE_USER_ENABLED=Usu\u00e1rio habilitado
-IDENTITY_MANAGEMENT_RESET_PASSWORD=Reiniciar senha
-IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Redefinir a senha para o usu\u00e1rio
-IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=O usu\u00e1rio receber\u00e1 uma senha aleat\u00f3ria em seu endere\u00e7o de e-mail.
-IDENTITY_MANAGEMENT_ASSIGN_ROLES=Atribuir pap\u00e9is
-IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Usu\u00e1rios pendentes
-IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Usu\u00e1rios registrados
-IDENTITY_MANAGEMENT_APPROVE_ALL=Aprovar selecionados
-IDENTITY_MANAGEMENT_REJECT_ALL=Rejeitar selecionados
-IDENTITY_MANAGEMENT_SELECT_ALL=selecionar todos
-IDENTITY_MANAGEMENT_UNSELECT_ALL=desmarcar todos
-IDENTITY_MANAGEMENT_MATRIX=Matriz
-IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES=Modos de Assinatura
-
-IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS=Registros pendentes
-IDENTITY_MANAGEMENT_PENDING_BPM_ID=Id
-IDENTITY_MANAGEMENT_PENDING_APPROVE=aprovar
-IDENTITY_MANAGEMENT_PENDING_REJECT=rejeitar
-
-IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE=Modo de Assinatura
-IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE=Modo de Administra\u00e7\u00e3o de Assinaturas
-IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM=Personalizar modo de assinatura
-IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC=Autom\u00e1tico - sem valida\u00e7\u00e3o de e-mail, sem aprova\u00e7\u00e3o administrativa.
-IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL=Valida\u00e7\u00e3o de email, sem aprova\u00e7\u00e3o administrativa.
-IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN=Valida\u00e7\u00e3o de e-mail e aprova\u00e7\u00e3o administrativa.
-
-IDENTITY_REGISTER_VERIFY_CAPTCHA=Verificar imagem
-IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirma\u00e7\u00e3o: Deletar
-IDENTITY_WARNING_CONFIRM_DELETE_USER=Warning! Voc\u00ea est\u00e1 prestes a eliminar o usu\u00e1rio
-IDENTITY_WARNING_CONFIRM_DELETE_ROLE=Aviso! Voc\u00ea est\u00e1 prestes a eliminar o papel
-IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirme a sua assinatura
-
-IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=Reiniciar sua senha
-IDENTITY_MAIL_SUBJECT_REGISTER=Confirmar assinatura
-IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=Confirmar endere\u00e7o de e-mail
-
-IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE=N\u00e3o foi poss\u00edvel executar a a\u00e7\u00e3o do papel. Por favor, d\u00ea uma olhada no seu arquivo de log para mais informa\u00e7\u00f5es.
-IDENTITY_MANAGEMENT_ERROR_ACTION_USER=N\u00e3o \u00e9 poss\u00edvel executar a a\u00e7\u00e3o do usu\u00e1rio. Por favor, d\u00ea uma olhada no seu arquivo de log para mais informa\u00e7\u00f5es.
-
-IDENTITY_VERIFICATION_RETURN=Retornar ao portal
-IDENTITY_VERIFICATION_LOGIN=Login
-IDENTITY_VERIFICATION_STATUS_EROOR=Erro durante a valida\u00e7\u00e3o de endere\u00e7o de e-mail.
-IDENTITY_VERIFICATION_STATUS_FAILED=N\u00e3o \u00e9 poss\u00edvel validar o endere\u00e7o de e-mail.
-IDENTITY_VERIFICATION_STATUS_VALIDATED=Endere\u00e7o de e-mail validado.
-IDENTITY_VERIFICATION_STATUS_REGISTER_SUCCESS=Sua conta foi ativada. Voc\u00ea pode logar.
-IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL=Seu endere\u00e7o de e-mail foi verificado, mas a conta precisa ser aprovada pelo administrador.
-IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM=Sua conta foi ativada. Voc\u00ea pode logar.
-
-IDENTITY_VALIDATION_ERROR_REGISTRATION=Falha ao registrar usu\u00e1rio
-IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=Este nome de usu\u00e1rio ja existe.
-IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Erro durante a valida\u00e7\u00e3o do nome de usu\u00e1rio.
-IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN=O nome do papel j\u00e1 existe.
-IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR=Erro durante a valida\u00e7\u00e3o do nome do papel.
-IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=As senhas n\u00e3o correspondem.
-IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=Erro durante a valida\u00e7\u00e3o do nome da senha.
-IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=Endere\u00e7o de e-mail inv\u00e1lido.
-IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=Senha invalida
-IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=C\u00f3digo incorreto
-
-# Example usage for dynamic values
-IDENTITY_DYNAMIC_VALUE_TEST=r\u00f3tulo de teste
-IDENTITY_DYNAMIC_VALUE_TEST2=r\u00f3tulo2 de teste
-
-javax.portlet.title=Perfil de usu\u00e1rio
-javax.portlet.keywords=gerenciamento,usu\u00e1rio
-
-javax.faces.component.UIInput.REQUIRED=Valor \u00e9 obrigat\u00f3rio
\ No newline at end of file
+################################################################################
+# JBoss, a division of Red Hat #
+# Copyright 2006, Red Hat Middleware, LLC, and individual #
+# contributors as indicated by the @authors tag. See the #
+# copyright.txt in the distribution for a full listing of #
+# individual contributors. #
+# #
+# This is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU Lesser General Public License as #
+# published by the Free Software Foundation; either version 2.1 of #
+# the License, or (at your option) any later version. #
+# #
+# This software is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
+# Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public #
+# License along with this software; if not, write to the Free #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
+################################################################################
+
+IDENTITY_APPLICATION_NOT_AVAILABLE=Porlet n\u00e3o dispon\u00edvel. Verifique sua configura\u00e7\u00e3o e log de erro para mais informa\u00e7\u00f5es.
+
+IDENTITY_WELCOME=Bem-vindo
+IDENTITY_REGISTER=Registrar
+IDENTITY_LOST_PASSWORD=Esqueceu Senha
+IDENTITY_NOT_LOGGED_IN=Voc\u00ea n\u00e3o est\u00e1 autenticado no portal.
+IDENTITY_CREATE_ACCOUNT=Voc\u00ea pode criar uma conta.
+IDENTITY_BUTTON_SUBMIT=Enviar
+IDENTITY_BUTTON_EDIT=Editar
+IDENTITY_BUTTON_CANCEL=Cancelar
+
+IDENTITY_REGISTER_TITLE=Informa\u00e7\u00f5es b\u00e1sicas do usu\u00e1rio
+IDENTITY_REGISTER_TITLE_CONFIRM=Confirma\u00e7\u00e3o
+IDENTITY_REGISTER_PASSWORD_CONFIRM=Confirme a Senha
+IDENTITY_REGISTER_STATUS_TITLE=Status do registro
+IDENTITY_REGISTER_SUCCESS_TITLE=Sua conta foi criada com \u00eaxito. Voc\u00ea pode autenticar-se agora.
+IDENTITY_REGISTER_PENDING_TITLE=Um e-mail foi enviado ao seu endere\u00e7o de e-mail para confirmar o seu registro.
+IDENTITY_REGISTER_REQUIRED_INFORMATION=indica um campo obrigat\u00f3rio.
+
+IDENTITY_LOST_PASSWORD_TITLE=Esqueceu seu dados de login?
+IDENTITY_LOST_PASSWORD_DESCRIPTION=Digite seu nome de usu\u00e1rio para redefinir sua senha.
+IDENTITY_LOST_PASSWORD_ERROR=Falha na redefini\u00e7\u00e3o de senha.
+IDENTITY_LOST_PASSWORD_STATUS_SUCCESSFUL=Voc\u00ea receber\u00e1 um e-mail com sua nova senha.
+IDENTITY_LOST_PASSWORD_STATUS_404=Nenhuma conta encontrada.
+IDENTITY_LOST_PASSWORD_STATUS_TITLE=Esqueceu senha
+
+IDENTITY_EDIT_PROFILE_ERROR=Erro ao atualizar o perfil.
+IDENTITY_EDIT_PASSWORD_TITLE=Altere a sua senha
+IDENTITY_EDIT_PASSWORD_CURRENT=Senha atual
+IDENTITY_EDIT_CHANGE_PASSWORD=Alterar senha
+IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=N\u00e3o foi poss\u00edvel alterar a senha.
+IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=A senha foi atualizada.
+
+IDENTITY_EDIT_EMAIL_TITLE=Alterar o seu endere\u00e7o de e-mail
+IDENTITY_EDIT_EMAIL_NEW=Novo endere\u00e7o de e-mail
+IDENTITY_EDIT_CHANGE_EMAIL=Mudar e-mail
+IDENTITY_EDIT_CHANGE_EMAIL_ERROR=N\u00e3o foi poss\u00edvel mudar o endere\u00e7o de e-mail
+IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING=Uma valida\u00e7\u00e3o de e-mail foi enviada ao seu endere\u00e7o.
+IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED=Seu endere\u00e7o de e-mail foi alterado.
+
+IDENTITY_EDIT_PROFILE_TITLE=Editar o perfil
+IDENTITY_VIEW_PROFILE_TITLE=Ver perfil
+
+IDENTITY_USERNAME=Nome de usu\u00e1rio
+IDENTITY_PASSWORD=Senha
+IDENTITY_EMAIL=E-Mail
+IDENTITY_GIVENNAME=Primeiro Nome
+IDENTITY_FAMILYNAME=\u00daltimo Nome
+IDENTITY_SKYPE=Identificador Skype
+IDENTITY_LOCATION=Local
+IDENTITY_OCCUPATION=Ocupa\u00e7\u00e3o
+IDENTITY_EXTRA=Adicional
+IDENTITY_SIGNATURE=Assinatura
+IDENTITY_INTERESTS=Interesses
+IDENTITY_LOCALE=Localidade
+IDENTITY_ICQ=Identificador Icq
+IDENTITY_AIM=Identificador Aim
+IDENTITY_MSNM=Identificador MSN messenger
+IDENTITY_YIM=Identificador Yahoo
+IDENTITY_XMMP=Identificador Xmmp
+IDENTITY_HOMEPAGE=P\u00e1gina inicial
+IDENTITY_TIMEZONE=Fuso hor\u00e1rio
+IDENTITY_THEME=Tema
+IDENTITY_SECURITY_QUESTION=Pergunta de seguran\u00e7a
+IDENTITY_SECURITY_ANSWER=Resposta de seguran\u00e7a
+IDENTITY_LAST_LOGIN=\u00daltimo acesso
+IDENTITY_REIGSTRATION_DATE=Data de Registro
+IDENTITY_ENABLED=Ativado
+
+IDENTITY_CATEGORY_GENERAL=Prefer\u00eancias Gerais
+IDENTITY_CATEGORY_PERSONAL=Informa\u00e7\u00f5es Pessoais
+IDENTITY_CATEGORY_INSTANT=Identidades de Mensagens Instant\u00e2neas
+IDENTITY_CATEGORY_ADDITIONAL=Informa\u00e7\u00f5es Adicionais
+
+IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE=(Assinatura de ,no m\u00e1ximo, 255 caracteres)
+IDENTITY_CATEGORY_ADDITIONAL_EXTRA=(m\u00e1ximo de 255 caracteres)
+
+IDENTITY_MANAGEMENT_ACTION=A\u00e7\u00f5es
+IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=Editar usu\u00e1rio
+IDENTITY_MANAGEMENT_ACTION_ROLES=Perfis
+IDENTITY_MANAGEMENT_ACTION_DELETE=Excluir
+IDENTITY_MANAGEMENT_USER_MANAGEMENT=Gerenciamento de usu\u00e1rios
+IDENTITY_MANAGEMENT_ROLE_MANAGEMENT=Gerenciamento de perfis
+IDENTITY_MANAGEMENT_SEARCH_USER=Pesquisar usu\u00e1rios
+IDENTITY_MANAGEMENT_CREATE_USER=Criar uma nova conta de usu\u00e1rio
+IDENTITY_MANAGEMENT_CREATE_USER_CREATED=Usu\u00e1rio criado
+IDENTITY_MANAGEMENT_USER_DELETED=Usu\u00e1rio exclu\u00eddo
+IDENTITY_MANAGEMENT_ROLE=Perfil
+IDENTITY_MANAGEMENT_ROLE_DISPLAY=Nome de exibi\u00e7\u00e3o
+IDENTITY_MANAGEMENT_ROLE_MEMBERS=Usu\u00e1rios
+IDENTITY_MANAGEMENT_ROLE_ASSIGNED=Perfis atribu\u00eddos
+IDENTITY_MANAGEMENT_CREATE_ROLE=Criar novo perfil
+IDENTITY_MANAGEMENT_EDIT_ROLE=Editar perfil
+IDENTITY_MANAGEMENT_CREATE_ROLE=Criar perfil
+IDENTITY_MANAGEMENT_DISABLE=Desabilitar
+IDENTITY_MANAGEMENT_DISABLE_USER_DISABLED=Usua\u0155io desabilitado
+IDENTITY_MANAGEMENT_ENABLE=Habilitar
+IDENTITY_MANAGEMENT_ENABLE_USER_ENABLED=Usu\u00e1rio habilitado
+IDENTITY_MANAGEMENT_RESET_PASSWORD=Redefinir senha
+IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Redefinir senha para o usu\u00e1rio
+IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=O usu\u00e1rio receber\u00e1 uma senha aleat\u00f3ria enviada ao seu endere\u00e7o de e-mail.
+IDENTITY_MANAGEMENT_ASSIGN_ROLES=Atribuir perfis
+IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Usu\u00e1rios pendentes
+IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Usu\u00e1rios registrados
+IDENTITY_MANAGEMENT_APPROVE_ALL=Aprovar selecionados
+IDENTITY_MANAGEMENT_REJECT_ALL=Rejeitar selecionados
+IDENTITY_MANAGEMENT_SELECT_ALL=Selecionar todos
+IDENTITY_MANAGEMENT_UNSELECT_ALL=Deselecionar todos
+IDENTITY_MANAGEMENT_MATRIX=Matrix
+IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES=Modos de Assinatura
+
+IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS=Registros pendentes
+IDENTITY_MANAGEMENT_PENDING_BPM_ID=Id
+IDENTITY_MANAGEMENT_PENDING_APPROVE=Aprovar
+IDENTITY_MANAGEMENT_PENDING_REJECT=Rejeitar
+
+IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE=Modo de assinatura
+IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE=Administrador Modo de assinatura
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM=Modo de assinatura personalizado.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC=Autom\u00e1tica - nenhuma valida\u00e7\u00e3o de e-mail, nenhuma aprova\u00e7\u00e3o do administrador.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL=Valida\u00e7\u00e3o de E-Mail, nenhuma aprova\u00e7\u00e3o do administrador.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN=Valida\u00e7\u00e3o de E-Mail, e aprova\u00e7\u00e3o do administrador.
+
+IDENTITY_REGISTER_VERIFY_CAPTCHA=Verifique a imagem de seguran\u00e7a
+IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirma\u00e7\u00e3o: Excluir
+IDENTITY_WARNING_CONFIRM_DELETE_USER=Aten\u00e7\u00e3o! Deseja excluir usu\u00e1rio
+IDENTITY_WARNING_CONFIRM_DELETE_ROLE=Aten\u00e7\u00e3o! Deseja excluir perfil
+IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirme a sua inscri\u00e7\u00e3o
+
+IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=Redefinir a sua senha
+IDENTITY_MAIL_SUBJECT_REGISTER=Confirmar inscri\u00e7\u00e3o
+IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=Confirmar endere\u00e7o de e-mail
+
+IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE=N\u00e3o foi poss\u00edvel executar nesse perfil. Por favor, d\u00ea uma olhada no arquivo de log para mais informa\u00e7\u00f5es.
+IDENTITY_MANAGEMENT_ERROR_ACTION_USER=N\u00e3o foi poss\u00edvel executar nesse usu\u00e1rio. Por favor, d\u00ea uma olhada no arquivo de log para mais informa\u00e7\u00f5es.
+
+IDENTITY_VERIFICATION_RETURN=Voltar ao portal
+IDENTITY_VERIFICATION_LOGIN=Entrar
+IDENTITY_VERIFICATION_STATUS_EROOR=Erro durante a valida\u00e7\u00e3o de endere\u00e7o de e-mail.
+IDENTITY_VERIFICATION_STATUS_FAILED=N\u00e3o \u00e9 poss\u00edvel validar o endere\u00e7o de e-mail.
+IDENTITY_VERIFICATION_STATUS_VALIDATED=E-mail validado.
+IDENTITY_VERIFICATION_STATUS_REGISTER_SUCCESS=Sua conta foi ativada. Voc\u00ea poder\u00e1 entrar agora.
+IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL=Seu endere\u00e7o de e-mail foi validado, mas sua conta precisa ser aprovada pelo administrador.
+IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM=Sua conta foi ativada. Voc\u00ea poder\u00e1 entrar agora.
+
+IDENTITY_VALIDATION_ERROR_REGISTRATION=Falha no registro do usu\u00e1rio.
+IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=Esse nome de usu\u00e1rio j\u00e1 est\u00e1 em uso.
+IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Erro ao validar o nome de usu\u00e1rio.
+IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN=Esse nome de perfil j\u00e1 est\u00e1 em uso.
+IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR=Erro ao validar o nome do perfil.
+IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=As senhas n\u00e3o conferem.
+IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=Erro durante a valida\u00e7\u00e3o de senha.
+IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=E-mail inv\u00e1lido.
+IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=Senha inv\u00e1lida
+IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=Imagem de seguran\u00e7a inv\u00e1lida
+
+# Example usage for dynamic values
+IDENTITY_DYNAMIC_VALUE_TEST=test label
+IDENTITY_DYNAMIC_VALUE_TEST2=test label2
+
+javax.portlet.title=Perfil de Usu\u00e1rio
+javax.portlet.keywords=management,user
+
+javax.faces.component.UIInput.REQUIRED=Value is required
\ No newline at end of file
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r12914 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2009-02-28 13:53:32 -0500 (Sat, 28 Feb 2009)
New Revision: 12914
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml
Log:
This attribute doesn't validate per w3c, thanks for the header though!
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2009-02-28 17:02:15 UTC (rev 12913)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2009-02-28 18:53:32 UTC (rev 12914)
@@ -21,7 +21,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+<div xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core">
<h:form id="common-edit-theme-form">
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r12913 - in tags/JBoss_Portal_2_7_2: core/src/bin/portal-core-war/images and 6 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-02-28 12:02:15 -0500 (Sat, 28 Feb 2009)
New Revision: 12913
Added:
tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/images/logo-small-blue.gif
Modified:
tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/css/login.css
tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_left.gif
tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_left_admin.gif
tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_left_current.gif
tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_left_hover2.gif
tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_right.gif
tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_right_admin.gif
tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_right_current.gif
tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_right_hover2.gif
tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css
tags/JBoss_Portal_2_7_2/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp
tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java
tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java
Log:
Forgot to merge changes from 12904 and 12905: JBPORTAL-2227, JBPORTAL-2285, JBPORTAL-2277
Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/css/login.css
===================================================================
--- tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/css/login.css 2009-02-28 16:37:59 UTC (rev 12912)
+++ tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/css/login.css 2009-02-28 17:02:15 UTC (rev 12913)
@@ -33,14 +33,16 @@
}
div.login-container div.login-header {
- background-image: url( ../images/modal/login-header-bg.gif );
- background-position: top left;
- background-repeat: repeat-x;
+ background: url(../themes/renewal/images/header-bg-left-shadow2.gif) repeat-x top left;
width: 255px;
- height: 27px;
+ height: 30px;
text-align: left;
}
+div.login-container div.login-header img {
+ margin: 5px 0 0 5px;
+}
+
div.login-container div.login-header h2 {
color: #fff;
font-weight: bold;
Copied: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/images/logo-small-blue.gif (from rev 12904, branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/logo-small-blue.gif)
===================================================================
(Binary files differ)
Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_left.gif
===================================================================
(Binary files differ)
Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_left_admin.gif
===================================================================
(Binary files differ)
Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_left_current.gif
===================================================================
(Binary files differ)
Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_left_hover2.gif
===================================================================
(Binary files differ)
Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_right.gif
===================================================================
(Binary files differ)
Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_right_admin.gif
===================================================================
(Binary files differ)
Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_right_current.gif
===================================================================
(Binary files differ)
Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renaissance/images/tab_right_hover2.gif
===================================================================
(Binary files differ)
Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css
===================================================================
--- tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-28 16:37:59 UTC (rev 12912)
+++ tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-28 17:02:15 UTC (rev 12913)
@@ -248,7 +248,7 @@
bottom: -5px;
left: 0;
min-width: 550px;
- z-index: 1;
+ z-index: 10;
}
ul#tabsHeader li {
Modified: tags/JBoss_Portal_2_7_2/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
===================================================================
--- tags/JBoss_Portal_2_7_2/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2009-02-28 16:37:59 UTC (rev 12912)
+++ tags/JBoss_Portal_2_7_2/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2009-02-28 17:02:15 UTC (rev 12913)
@@ -29,7 +29,7 @@
document.write('<a href=\"<%= loginURL %>\">Login</a>');
}
//set the iframe src for login modal to requested URL
- var iframeSrc = '<%= loginURL %>' + '?loginheight=0';
+ var iframeSrc = '<%= loginURL %>';
document.getElementById('loginIframe').src = iframeSrc;
/* ]]> */
</script>
Modified: tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp
===================================================================
--- tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp 2009-02-28 16:37:59 UTC (rev 12912)
+++ tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp 2009-02-28 17:02:15 UTC (rev 12913)
@@ -21,36 +21,37 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
<%@ page pageEncoding="utf-8" %>
-<%@page import="org.jboss.portal.common.util.ParameterValidation" %>
<%@page import="org.jboss.portal.identity.UserStatus" %>
<%@page import="java.util.ResourceBundle" %>
<%
ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale());
- String loginheight = request.getParameter("loginheight");
- boolean paramPresent = loginheight != null;
- loginheight = ParameterValidation.sanitizeFromPattern(loginheight, ParameterValidation.CSS_DISTANCE, "300px");
%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title><%= rb.getString("LOGIN_TITLE") %>
- </title>
- <style type="text/css">
- /* <![CDATA[ */
- body {
- margin: 0;
- padding: 0;
- border: 0;
- padding-top: <%=loginheight%>;
- }
+ <title><%= rb.getString("LOGIN_TITLE")%></title>
- /* ]]> */
- </style>
-
<script>
+ var isModal = true;
+ function displayStatus(){
+ if(window.parent.frames.length > 0){
+ //loaded as modal
+ }else{
+ try{
+ //normal page
+ isModal = false;
+ document.body.style.paddingTop = ((window.innerHeight / 2) - document.getElementById('login-content').offsetHeight) + 'px';
+ //document.getElementById('login-cancel').value = "<< Back";
+ document.getElementById('login-cancel').onclick = function(){self.history.go(-1)};
+ document.getElementById('login-submit').style.right = '';
+ }catch(e){
+ //swallow
+ }
+ }
+ }
function setFocusOnLoginForm()
{
try
@@ -61,21 +62,23 @@
{
}
}
+
</script>
<link rel="stylesheet" href="/portal-core/css/login.css" type="text/css"/>
</head>
-<body onload="setFocusOnLoginForm();">
+<body onload="displayStatus();setFocusOnLoginForm();">
<div class="login-container">
<div class="login-header">
- <h2><%= rb.getString("LOGIN_TITLE") %>
- </h2>
+ <%--text title--%>
+ <%--<h2><%= rb.getString("LOGIN_TITLE") %></h2>--%>
+ <%--img title--%>
+ <img src="/portal-core/images/logo-small-blue.gif" width="118px" height="17px"alt=""/>
</div>
- <div class="login-content">
-
+ <div class="login-content" id="login-content">
<div class="error-message"
style="<%=(request.getAttribute(!UserStatus.OK.equals("org.jboss.portal.userStatus") ? "" : "display:none"))%>;">
<%
@@ -110,11 +113,11 @@
<div class="button-container">
<br class="clear"/>
- <input style="<%=paramPresent ? "" : "display:none"%>;" type="button" name="cancel"
+ <input type="button" name="cancel" id="login-cancel"
value="<%= rb.getString("LOGIN_CANCEL") %>" class="cancel-button"
onclick="window.parent.hideContentModal('login-modal');"/>
<br class="clear"/>
- <input style="<%=paramPresent ? "" : "right:10px"%>;" type="submit" name="login"
+ <input type="submit" name="login" id="login-submit"
value="<%= rb.getString("LOGIN_SUBMIT") %>" class="login-button"/>
</div>
<br class="clear"/>
Modified: tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java
===================================================================
--- tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2009-02-28 16:37:59 UTC (rev 12912)
+++ tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2009-02-28 17:02:15 UTC (rev 12913)
@@ -119,6 +119,7 @@
markup.print("<script type='text/javascript' src='");
markup.print(jsBase);
markup.print("/dyna.js'></script>\n");
+ markup.print("<link rel=\"stylesheet\" id=\"dyna_css\" href=\"" + jsBase + "/style.css\" type=\"text/css\"/>\n");
markup.print("<script type='text/javascript'>\n");
// Async server URL needed for callbacks
Modified: tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java
===================================================================
--- tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java 2009-02-28 16:37:59 UTC (rev 12912)
+++ tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java 2009-02-28 17:02:15 UTC (rev 12913)
@@ -86,13 +86,14 @@
PortalTheme theme = themeContext.getTheme();
// Hard code here for now
- // todo remove that hack
- String jsBase = rendererContext.getProperty(DynaConstants.RESOURCE_BASE_URL);
+
+ //JBPORTAL-2285 - move to render with other dyna scripts in DynaRegionRenderer
+ /*String jsBase = rendererContext.getProperty(DynaConstants.RESOURCE_BASE_URL);
if (jsBase != null)
{
out.print("<link rel=\"stylesheet\" id=\"dyna_css\" href=\"" + jsBase + "/style.css\" type=\"text/css\"/>\n");
}
-
+ */
// If no theme provided we use what may be on the tag
if (theme == null && themeName != null && themeName.length() > 0)
{
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r12912 - in tags/JBoss_Portal_2_7_2: core/src/main/org/jboss/portal/core/controller/portlet and 5 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-02-28 11:37:59 -0500 (Sat, 28 Feb 2009)
New Revision: 12912
Modified:
tags/JBoss_Portal_2_7_2/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml
tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css
tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java
tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java
tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/style.css
tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
Log:
Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css
===================================================================
--- tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-28 16:27:59 UTC (rev 12911)
+++ tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-28 16:37:59 UTC (rev 12912)
@@ -1,6 +1,5 @@
-
@import url("/portal-core/themes/common/portlet-editor.css");
-@import url( "../common/tooltip.css" );
+@import url("../common/tooltip.css");
/* *************************************************** */
/* Default for JBoss Portal */
@@ -13,11 +12,10 @@
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
color: #656565;
- background-image: url( images/header-bg2.gif );
+ background-image: url(images/header-bg2.gif);
background-repeat: repeat-x;
}
-
/*****************
* Portal Header *
******************/
@@ -42,8 +40,7 @@
/* Header background */
#header {
- height: 64px;
- /*background-image: url( 'images/header-bg-left-shadow.gif' );*/
+ height: 64px; /*background-image: url( 'images/header-bg-left-shadow.gif' );*/
background-position: top left;
background-repeat: no-repeat;
width: 100%;
@@ -54,7 +51,7 @@
}
#logoName {
- background-image: url( images/JBP-logo-white.gif );
+ background-image: url(images/JBP-logo-white.gif);
background-repeat: no-repeat;
float: left;
width: 250px;
@@ -73,8 +70,8 @@
#portal-container {
/* part of below IE hack to preserve min-width for portlet regions */
/*width: 100%;*/
- /*margin: 4px 2% 0px 2%;*/
- background-image: url( 'images/header-bg-left-shadow2.gif' );
+/*margin: 4px 2% 0px 2%;*/
+ background-image: url('images/header-bg-left-shadow2.gif');
background-position: top left;
background-repeat: no-repeat;
padding: 0 350px 0 350px;
@@ -175,8 +172,7 @@
width: 35%;
float: left;
margin: 0px;
- padding: 0px;
-/*height: 300px;*/
+ padding: 0px; /*height: 300px;*/
}
#regionB {
@@ -228,7 +224,7 @@
*****************************/
div#navigation {
- position:relative;
+ position: relative;
width: 100%;
height: 64px;
}
@@ -237,7 +233,7 @@
list-style: none;
margin: 0 0 -5px 0;
padding: 0;
- position:absolute;
+ position: absolute;
bottom: 0px;
left: 0;
min-width: 550px;
@@ -248,7 +244,7 @@
list-style: none;
margin: 0 0 -5px 0;
padding: 0;
- position:absolute;
+ position: absolute;
bottom: -5px;
left: 0;
min-width: 550px;
@@ -267,12 +263,12 @@
}
ul#tabsHeader li,
-ul#tabsHeader li#current{
+ ul#tabsHeader li#current {
background-position: top right;
background-repeat: no-repeat;
}
-ul#tabsHeader li a{
+ul#tabsHeader li a {
background-position: top left;
background-repeat: no-repeat;
padding: 5px 15px 0 15px;
@@ -283,8 +279,7 @@
white-space: nowrap;
}
-
-ul#tabsHeader li#current a{
+ul#tabsHeader li#current a {
background-position: top left;
background-repeat: no-repeat;
padding: 5px 15px 0 15px;
@@ -294,23 +289,21 @@
white-space: nowrap;
}
-
-
ul#tabsHeader li#current {
- background-image: url( 'images/nav-active-right2.gif' );
+ background-image: url('images/nav-active-right2.gif');
}
-ul#tabsHeader li#current a{
- background-image: url( 'images/nav-active-left.gif' );
+ul#tabsHeader li#current a {
+ background-image: url('images/nav-active-left.gif');
color: #2c2c2c;
}
ul#tabsHeader li {
- background-image: url( 'images/nav-inactive-right2.gif' );
+ background-image: url('images/nav-inactive-right2.gif');
}
-ul#tabsHeader li a{
- background-image: url( 'images/nav-inactive-left.gif' );
+ul#tabsHeader li a {
+ background-image: url('images/nav-inactive-left.gif');
color: #113266;
}
@@ -382,14 +375,13 @@
background: #C0D3DC;
}
-
/* End Submenu selectors */
/* -------- These are new selectors for the admin and add page styles ------- */
ul#tabsHeader #admin {
display: inline;
- background-image: url( images/tab_right_admin.gif );
+ background-image: url(images/tab_right_admin.gif);
background-repeat: no-repeat;
background-position: right top;
padding-top: -3px;
@@ -454,9 +446,9 @@
*****************************/
#dashboardnav {
- /*float: right;*/
- position:absolute;
- top:0;
+/*float: right;*/
+ position: absolute;
+ top: 0;
right: 15px;
font-size: 10px;
padding: 6px 12px 0px 0px;
@@ -469,7 +461,7 @@
}
#dashboardnav .addcontent {
- background-image: url( images/ico_addcontent.gif );
+ background-image: url(images/ico_addcontent.gif);
background-repeat: no-repeat;
background-position: left;
height: 20px;
@@ -488,16 +480,14 @@
/* wrapper for floating portlet window modes */
.portlet-mode-container {
white-space: nowrap;
- float:right;
- position:relative;
- z-index:1;
+ float: right;
}
.mode-button {
- /*position:absolute;*/
+/*position:absolute;*/
margin-right: 3px;
- /*padding-top:5px;*/
- float:left;
+ padding-top: 5px;
+ float: left;
}
.portlet-titlebar-title {
@@ -506,65 +496,47 @@
font-size: 12px;
font-weight: bold;
white-space: nowrap;
- line-height: 3px;
+ line-height: 100%;
float: left;
text-indent: 5px;
padding-top: 5px;
padding-bottom: 6px;
- display:block;
- margin-right:10px;
+ display: block;
+ margin-right: 10px;
}
-.portlet-titlebar-dyna {
- color: #656565;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- font-weight: bold;
- white-space: nowrap;
- line-height: 3px;
- float: left;
- text-indent: 5px;
- padding-top: 5px;
- padding-bottom: 6px;
- display:block;
- margin-right:10px;
- position:absolute;
- width: 100%;
- z-index: 1;
-}
-
/* ------ NOT CURRENTLY IN USE FOR NEW 2.6 FUNCTIONALITY -------
.portlet-titlebar-decoration {}
*/
.portlet-titlebar-left {
- background-image: url( images/portlet-top-left2.gif );
+ background-image: url(images/portlet-top-left2.gif);
background-repeat: no-repeat;
width: 9px;
height: 29px;
min-width: 9px;
- background-position: 0 0;
+ background-position: 0 1px;
}
.portlet-titlebar-center {
- background-image: url( images/portlet-top-middle2.gif );
+ background-image: url(images/portlet-top-middle2.gif);
background-repeat: repeat-x;
height: 29px;
- background-position: top;
- /*position:relative;*/
+ background-position: bottom;
+ position: relative;
}
.portlet-titlebar-right {
- background-image: url( images/portlet-top-right2.gif );
+ background-image: url(images/portlet-top-right2.gif);
background-repeat: no-repeat;
width: 10px;
height: 30px;
min-width: 10px;
- background-position: -1px 0;
+ background-position: -1px 1px;
}
.portlet-content-left {
- background-image: url( images/portlet-left-vertical.gif );
+ background-image: url(images/portlet-left-vertical.gif);
background-repeat: repeat-y;
width: 9px;
min-width: 9px;
@@ -588,7 +560,7 @@
}
.portlet-content-right {
- background-image: url( images/portlet-right-vertical.gif );
+ background-image: url(images/portlet-right-vertical.gif);
height: 100%;
background-repeat: repeat-y;
background-position: left;
@@ -604,7 +576,7 @@
}
.portlet-footer-left {
- background-image: url( images/portlet-bottom-left.gif );
+ background-image: url(images/portlet-bottom-left.gif);
width: 9px;
height: 4px;
background-repeat: no-repeat;
@@ -621,7 +593,7 @@
}
.portlet-footer-center {
- background-image: url( images/portlet-bottom-middle.gif );
+ background-image: url(images/portlet-bottom-middle.gif);
height: 4px;
background-repeat: repeat-x;
/* background-color:#FFFFFF;
@@ -631,7 +603,7 @@
}
.portlet-footer-right {
- background-image: url( images/portlet-bottom-right.gif );
+ background-image: url(images/portlet-bottom-right.gif);
width: 5px;
height: 4px;
background-repeat: no-repeat;
@@ -648,7 +620,7 @@
* Portlet Window Modes *
************************/
.portlet-mode-maximized {
- background-image: url( images/ico_16_maximize.gif );
+ background-image: url(images/ico_16_maximize.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -663,7 +635,7 @@
}
.portlet-mode-minimized {
- background-image: url( images/ico_16_minimize.gif );
+ background-image: url(images/ico_16_minimize.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -678,7 +650,7 @@
}
.portlet-mode-normal {
- background-image: url( images/ico_16_normal.gif );
+ background-image: url(images/ico_16_normal.gif);
width: 16px;
height: 16px;
background-repeat: no-repeat;
@@ -693,7 +665,7 @@
}
.portlet-mode-help {
- background-image: url( images/ico_16_help.gif );
+ background-image: url(images/ico_16_help.gif);
width: 16px;
height: 16px;
background-repeat: no-repeat;
@@ -708,7 +680,7 @@
}
.portlet-mode-edit {
- background-image: url( images/ico_edit.gif );
+ background-image: url(images/ico_edit.gif);
background-repeat: no-repeat;
width: 28px;
height: 16px;
@@ -723,7 +695,7 @@
}
.portlet-mode-admin {
- background-image: url( images/ico_admin.gif );
+ background-image: url(images/ico_admin.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -738,7 +710,7 @@
}
.portlet-mode-remove {
- background-image: url( images/ico_16_remove.gif );
+ background-image: url(images/ico_16_remove.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -753,7 +725,7 @@
}
.portlet-mode-view {
- background-image: url( images/ico_cancel.gif );
+ background-image: url(images/ico_cancel.gif);
background-repeat: no-repeat;
width: 28px;
height: 16px;
@@ -769,7 +741,7 @@
}
.portlet-mode-reload {
- background-image: url( images/ico_16_reload.gif );
+ background-image: url(images/ico_16_reload.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -784,7 +756,7 @@
}
.portlet-mode-hide {
- background-image: url( images/ico_16_swizzleclosed.gif );
+ background-image: url(images/ico_16_swizzleclosed.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -955,14 +927,14 @@
}
/* Text for form field labels */
-.portlet-form-field-label{
+.portlet-form-field-label {
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
color: #000;
white-space: nowrap
}
-.provider-menu-container{
- padding:10px;
+.provider-menu-container {
+ padding: 10px;
}
/* Text for a form field */
@@ -1255,7 +1227,7 @@
a.addicon {
font-weight: bold;
- background-image: url( images/ico_addcontent.gif );
+ background-image: url(images/ico_addcontent.gif);
background-repeat: no-repeat;
background-position: left;
padding-left: 16px;
@@ -1330,7 +1302,7 @@
.pagination li.nextpage {
font-weight: bold;
- background-image: url( images/ico_arrow_blue_right.gif );
+ background-image: url(images/ico_arrow_blue_right.gif);
background-repeat: no-repeat;
background-position: left;
margin-left: 3px;
@@ -1340,7 +1312,7 @@
.pagination li.nextpagedisabled {
color: #656565;
font-weight: bold;
- background-image: url( images/ico_arrow_grey_right.gif );
+ background-image: url(images/ico_arrow_grey_right.gif);
background-repeat: no-repeat;
background-position: left;
margin-left: 3px;
@@ -1350,7 +1322,7 @@
.pagination li.previouspage {
font-weight: bold;
- background-image: url( images/ico_arrow_blue_left.gif );
+ background-image: url(images/ico_arrow_blue_left.gif);
background-repeat: no-repeat;
background-position: right;
padding-left: 10px;
@@ -1361,7 +1333,7 @@
.pagination li.previouspagedisabled {
font-weight: bold;
color: #656565;
- background-image: url( images/ico_arrow_grey_left.gif );
+ background-image: url(images/ico_arrow_grey_left.gif);
background-repeat: no-repeat;
background-position: right;
padding-left: 12px;
Modified: tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java
===================================================================
--- tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2009-02-28 16:27:59 UTC (rev 12911)
+++ tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2009-02-28 16:37:59 UTC (rev 12912)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -22,24 +22,24 @@
******************************************************************************/
package org.jboss.portal.core.controller.portlet;
+import org.jboss.portal.core.CoreConstants;
+import org.jboss.portal.core.controller.coordination.CoordinationManager;
+import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.core.navstate.NavigationalStateContext;
import org.jboss.portal.portlet.ParametersStateString;
import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState;
import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState;
import org.jboss.portal.portlet.info.NavigationInfo;
import org.jboss.portal.portlet.info.ParameterInfo;
import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.core.CoreConstants;
-import org.jboss.portal.core.navstate.NavigationalStateContext;
-import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.controller.coordination.CoordinationManager;
-import javax.xml.namespace.QName;
import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import java.util.Collection;
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
@@ -102,12 +102,10 @@
this.implicitMode = getCoordinationManager().resolveParameterBindingImplicitModeEnabled(controllerContext.getPage());
}
- /**
- * Flush all updates to the navigational state context.
- */
+ /** Flush all updates to the navigational state context. */
public void flushUpdates()
{
-
+
if (windowPublicNavigationalStateUpdate != null && updates != null)
{
for (Map.Entry<String, HashMap<QName, String[]>> entry : windowPublicNavigationalStateUpdate.entrySet())
@@ -125,7 +123,7 @@
{
Map<String, String[]> parameters = new HashMap<String, String[]>();
-
+
for (Map.Entry<QName, String[]> value : entry.getValue().entrySet())
{
parameters.put(value.getKey().toString(), value.getValue());
@@ -140,7 +138,7 @@
windowPublicNavigationalStateUpdate.clear();
}
-
+
if (updates != null)
{
for (Map.Entry<String, org.jboss.portal.core.model.portal.navstate.WindowNavigationalState> entry : updates.entrySet())
@@ -195,11 +193,10 @@
}
-
}
/**
- *
+ *
*/
public Set<String> getPortletWindowIds()
{
@@ -207,7 +204,7 @@
}
/**
- *
+ *
*/
public PortletWindowNavigationalState getPortletWindowNavigationalState(String windowName) throws IllegalArgumentException
{
@@ -250,7 +247,7 @@
}
/**
- *
+ *
*/
public void setPortletWindowNavigationalState(String windowName, PortletWindowNavigationalState windowNavigationalState) throws IllegalArgumentException, IllegalStateException
{
@@ -286,13 +283,11 @@
initiateWindowPublicNavigationalStateUpdate();
}
- //
if (windowPublicNavigationalStateUpdate.get(windowName) == null)
{
windowPublicNavigationalStateUpdate.put(windowName, new HashMap<QName, String[]>());
}
- //
windowPublicNavigationalStateUpdate.get(windowName).put(name, value);
}
@@ -307,13 +302,13 @@
{
value = windowPublicNavigationalStateUpdate.get(windowName).get(name);
}
-
+
}
-
+
//
if (value == null)
{
-
+
Window window = controllerContext.getWindow(windowName);
org.jboss.portal.core.model.portal.navstate.WindowNavigationalState wns = navigationalStateContext.getWindowNavigationalState(window.getId().toString());
@@ -332,9 +327,7 @@
return value != null && value.length > 0 ? value : null;
}
- /**
- * For now we do not implement any kind of mapping between qnames, it's the basic straightforward 1-1 mapping.
- */
+ /** For now we do not implement any kind of mapping between qnames, it's the basic straightforward 1-1 mapping. */
public Map<String, String[]> getPortletPublicNavigationalState(String windowName) throws IllegalArgumentException
{
PortletInfo info = controllerContext.getPortletInfo(windowName);
@@ -347,70 +340,77 @@
initiateWindowPublicNavigationalStateUpdate();
}
- //
- if (info != null && info.getNavigation() != null)
+ if (info != null)
{
- Map<String, String[]> publicNavigationalState = new HashMap<String, String[]>();
- for (ParameterInfo parameterInfo : info.getNavigation().getPublicParameters())
+ NavigationInfo navigation = info.getNavigation();
+ if (navigation != null)
{
-
- Collection<String> bindings = manager.getBindingNames(getWindow(windowName), parameterInfo.getName());
-
- // Don't store the URI as a page scoped public render parameter but window scoped
- // Also for explicit and parameter with no bindings
- if (CoreConstants.JBOSS_PORTAL_CONTENT_URI.equals(parameterInfo.getName()) || (!implicitMode && bindings.size() == 0))
+ Map<String, String[]> publicNavigationalState = new HashMap<String, String[]>();
+ for (ParameterInfo parameterInfo : navigation.getPublicParameters())
{
- String[] parameterValue = getWindowPublicNavigationalState(windowName, parameterInfo.getName());
- //
- if (parameterValue != null)
+ QName parameterName = parameterInfo.getName();
+ Collection<String> bindings = manager.getBindingNames(getWindow(windowName), parameterName);
+
+ // Don't store the URI as a page scoped public render parameter but window scoped
+ // Also for explicit and parameter with no bindings
+ if (CoreConstants.JBOSS_PORTAL_CONTENT_URI.equals(parameterName) || (!implicitMode && bindings.size() == 0))
{
- String parameterId = parameterInfo.getId();
+ String[] parameterValue = getWindowPublicNavigationalState(windowName, parameterName);
- // We clone the value here so we keep the internal state not potentially changed
- publicNavigationalState.put(parameterId, parameterValue.clone());
+ if (parameterValue != null)
+ {
+ String parameterId = parameterInfo.getId();
+ // We clone the value here so we keep the internal state not potentially changed
+ publicNavigationalState.put(parameterId, parameterValue.clone());
+ }
}
- }
- else
- {
- String[] parameterValue = getPublicNavigationalState(parameterInfo.getName());
+ else
+ {
+ String[] parameterValue = getPublicNavigationalState(parameterName);
- // Explicit binding
- String[] explicitParameterValue = null;
+ // Explicit binding
+ String[] explicitParameterValue = null;
- // Check all bindings for this window/qname pair
- // If this window/qname is binded several times with different updated params value will be unpredictable...
- for (String binding : bindings)
- {
- explicitParameterValue = getPublicNavigationalState(new QName(XMLConstants.DEFAULT_NS_PREFIX, binding));
- }
+ // Check all bindings for this window/qname pair
+ // If this window/qname is bound several times with different updated params value will be unpredictable...
+ for (String binding : bindings)
+ {
+ explicitParameterValue = getPublicNavigationalState(new QName(XMLConstants.DEFAULT_NS_PREFIX, binding));
- //
- String parameterId = parameterInfo.getId();
+ // if a PNS has been found for a binding, use it and do not look further
+ if (explicitParameterValue != null)
+ {
+ break;
+ }
+ }
- //
- if (explicitParameterValue != null)
- {
- // We clone the value here so we keep the internal state not potentially changed
- publicNavigationalState.put(parameterId, explicitParameterValue.clone());
+ //
+ String parameterId = parameterInfo.getId();
+
+ //
+ if (explicitParameterValue != null)
+ {
+ // We clone the value here so we keep the internal state not potentially changed
+ publicNavigationalState.put(parameterId, explicitParameterValue.clone());
+ }
+ else if (implicitMode && parameterValue != null)
+ {
+ // We clone the value here so we keep the internal state not potentially changed
+ publicNavigationalState.put(parameterId, parameterValue.clone());
+ }
}
- else if (implicitMode && parameterValue != null)
- {
- // We clone the value here so we keep the internal state not potentially changed
- publicNavigationalState.put(parameterId, parameterValue.clone());
- }
}
- }
- //
- return publicNavigationalState;
+ //
+ return publicNavigationalState;
+ }
}
//
return null;
}
-
public String getPublicNavigationalParameterId(String windowName, QName name)
@@ -434,7 +434,7 @@
}
/**
- *
+ *
*/
public void setPortletPublicNavigationalState(String windowName, Map<String, String[]> update)
{
@@ -472,7 +472,7 @@
// Don't store the URI as a page scoped public render parameter but window scoped
// Also for explicit and parameter with no bindings
if (CoreConstants.JBOSS_PORTAL_CONTENT_URI.equals(name)
- || (!implicitMode && bindings.size() == 0))
+ || (!implicitMode && bindings.size() == 0))
{
if (value.length > 0)
{
@@ -509,7 +509,7 @@
}
/**
- *
+ *
*/
public Set<QName> getPublicNames()
{
@@ -523,7 +523,7 @@
}
/**
- *
+ *
*/
public String[] getPublicNavigationalState(QName name) throws IllegalArgumentException
{
@@ -552,7 +552,7 @@
}
/**
- *
+ *
*/
public void setPublicNavigationalState(QName name, String[] value) throws IllegalArgumentException, IllegalStateException
{
@@ -572,7 +572,7 @@
}
/**
- *
+ *
*/
public void removePublicNavigationalState(QName name) throws IllegalArgumentException, IllegalStateException
{
@@ -592,7 +592,7 @@
}
/**
- *
+ *
*/
public HashMap<QName, String[]> getWindowPublicContentStateParameters(String windowName)
{
@@ -617,13 +617,11 @@
}
}
}
-
+
return params;
}
- /**
- * @throws IllegalStateException if the public navigational state of the window is already initialized
- */
+ /** @throws IllegalStateException if the public navigational state of the window is already initialized */
private void initiateWindowPublicNavigationalStateUpdate() throws IllegalStateException
{
if (windowPublicNavigationalStateUpdate != null)
@@ -653,5 +651,4 @@
}
-
}
Modified: tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java
===================================================================
--- tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2009-02-28 16:27:59 UTC (rev 12911)
+++ tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2009-02-28 16:37:59 UTC (rev 12912)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -20,26 +20,26 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.core.model.portal.command.view;
+import org.jboss.portal.core.controller.ControllerCommand;
import org.jboss.portal.core.controller.ControllerException;
import org.jboss.portal.core.controller.ControllerResponse;
-import org.jboss.portal.core.controller.ControllerCommand;
import org.jboss.portal.core.controller.command.info.CommandInfo;
import org.jboss.portal.core.controller.command.info.ViewCommandInfo;
import org.jboss.portal.core.model.portal.Page;
import org.jboss.portal.core.model.portal.PortalObjectId;
-import org.jboss.portal.core.model.portal.navstate.PageNavigationalState;
import org.jboss.portal.core.model.portal.command.PageCommand;
import org.jboss.portal.core.model.portal.command.response.UpdatePageResponse;
+import org.jboss.portal.core.model.portal.navstate.PageNavigationalState;
import org.jboss.portal.core.navstate.NavigationalStateContext;
-import org.jboss.portal.common.util.ParameterMap;
-import javax.xml.namespace.QName;
import javax.xml.XMLConstants;
-import java.util.Map;
+import javax.xml.namespace.QName;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Map;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -52,7 +52,7 @@
private static final CommandInfo info = new ViewCommandInfo();
/** . */
- private static final Map<String,String[]> EMPTY_PARAMETERS = Collections.emptyMap();
+ private static final Map<String, String[]> EMPTY_PARAMETERS = Collections.emptyMap();
/** . */
private Map<String, String[]> parameters;
@@ -101,17 +101,8 @@
String pageId = getPage().getId().toString();
//
- PageNavigationalState previousPNS = nsContext.getPageNavigationalState(pageId);
-
- //
Map<QName, String[]> state = new HashMap<QName, String[]>();
- // Clone the previous state if needed
- if (previousPNS != null)
- {
- state.putAll(previousPNS.getParameters());
- }
-
//
for (Map.Entry<String, String[]> entry : parameters.entrySet())
{
Modified: tags/JBoss_Portal_2_7_2/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml
===================================================================
--- tags/JBoss_Portal_2_7_2/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2009-02-28 16:27:59 UTC (rev 12911)
+++ tags/JBoss_Portal_2_7_2/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2009-02-28 16:37:59 UTC (rev 12912)
@@ -1,46 +1,69 @@
-<div xmlns:ui="http://java.sun.com/jsf/facelets"
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ contributors as indicated by the @authors tag. See the
+ ~ copyright.txt in the distribution for a full listing of
+ ~ individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core">
<h:form id="common-edit-theme-form">
<table class="full-width datatable">
<thead class="portlet-section-header">
- <tr>
- <th>#{bundle.COMMON_NAME}</th>
- <th>#{bundle.COMMON_DESCRIPTION}</th>
- <th>#{bundle.COMMON_SETTING}</th>
- </tr>
+ <tr>
+ <th>#{bundle.COMMON_NAME}</th>
+ <th>#{bundle.COMMON_DESCRIPTION}</th>
+ <th>#{bundle.COMMON_SETTING}</th>
+ </tr>
</thead>
<tbody>
- <tr class="portlet-section-body">
- <td>#{bundle.COMMON_LAYOUT}</td>
- <td>#{bundle.COMMON_NAME_LAYOUT_IMPLEMENTATION}</td>
- <td>
- <h:selectOneMenu id="layout" value="#{theme.layoutName}">
- <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
- <tr class="portlet-section-alternate">
- <td>#{bundle.COMMON_THEME}</td>
- <td>#{bundle.COMMON_NAME_LOOK_AND_FEEL}</td>
- <td>
- <h:selectOneMenu id="theme" value="#{theme.themeName}">
- <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
- <tr class="portlet-section-body">
- <td>#{bundle.COMMON_RENDERSET}</td>
- <td>#{bundle.COMMON_NAME_RENDER_ENGINE_PAGES}</td>
- <td>
- <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}">
- <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
+ <tr class="portlet-section-body">
+ <td>#{bundle.COMMON_LAYOUT}</td>
+ <td>#{bundle.COMMON_NAME_LAYOUT_IMPLEMENTATION}</td>
+ <td>
+ <h:selectOneMenu id="layout" value="#{theme.layoutName}">
+ <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/>
+ </h:selectOneMenu>
+ </td>
+ </tr>
+ <tr class="portlet-section-alternate">
+ <td>#{bundle.COMMON_THEME}</td>
+ <td>#{bundle.COMMON_NAME_LOOK_AND_FEEL}</td>
+ <td>
+ <h:selectOneMenu id="theme" value="#{theme.themeName}">
+ <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/>
+ </h:selectOneMenu>
+ </td>
+ </tr>
+ <tr class="portlet-section-body">
+ <td>#{bundle.COMMON_RENDERSET}</td>
+ <td>#{bundle.COMMON_NAME_RENDER_ENGINE_PAGES}</td>
+ <td>
+ <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}">
+ <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/>
+ </h:selectOneMenu>
+ </td>
+ </tr>
</tbody>
</table>
- <br />
+ <br/>
<ui:insert name="form_submit"/>
</h:form>
</div>
\ No newline at end of file
Modified: tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/style.css
===================================================================
--- tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/style.css 2009-02-28 16:27:59 UTC (rev 12911)
+++ tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/style.css 2009-02-28 16:37:59 UTC (rev 12912)
@@ -1,18 +1,24 @@
/* We need the min-height in order to have a region that is never empty and can receive draggables
min-height doees not work on IE6 and the 2 other lines are there to make it work in that situation.
- 32 pixels is the height of the region when it is empty. */
+ 32 pixels is the height of the region when it is empty. */
.dnd-region {
- min-height:32px;
- height:auto !important;
- height:32px;
+ min-height: 32px;
+ height: auto !important;
+ height: 32px;
}
+/*
+Add height to handle div so that we can drag from the whole bar instead of just the title. Should work in IE as well,
+though it hasn't been tested.
+*/
.dnd-handle {
cursor: move;
- position:relative;
+ position: relative;
+ min-height: 1.2em;
+ height: auto !important;
+ height: 1.2em;
}
-
.dnd-droppable {
border: red 1px dashed;
background-color: Transparent;
Modified: tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
===================================================================
--- tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2009-02-28 16:27:59 UTC (rev 12911)
+++ tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2009-02-28 16:37:59 UTC (rev 12912)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -20,6 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.theme.impl.render.div;
import org.jboss.portal.Mode;
@@ -30,8 +31,6 @@
import org.jboss.portal.theme.render.renderer.ActionRendererContext;
import org.jboss.portal.theme.render.renderer.DecorationRenderer;
import org.jboss.portal.theme.render.renderer.DecorationRendererContext;
-import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions;
-import org.jboss.portal.theme.impl.render.dynamic.DynaConstants;
import java.io.PrintWriter;
import java.util.Collection;
@@ -55,13 +54,9 @@
public void render(RendererContext rendererContext, DecorationRendererContext drc) throws RenderException
{
- DynaRenderOptions options = (DynaRenderOptions)rendererContext.getAttribute(DynaConstants.RENDER_OPTIONS);
PrintWriter markup = rendererContext.getWriter();
- //Don't want title if this is DND, we already have it in DynaDecorationRenderer
- if (DynaRenderOptions.NO_AJAX.equals(options)){
- renderTitle(rendererContext, drc);
- }
+ renderTitle(rendererContext, drc);
markup.print("<div class=\"portlet-mode-container\">");
renderTriggerableActions(rendererContext, drc, ActionRendererContext.MODES_KEY);
Modified: tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
===================================================================
--- tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2009-02-28 16:27:59 UTC (rev 12911)
+++ tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2009-02-28 16:37:59 UTC (rev 12912)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -20,6 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.theme.impl.render.dynamic;
import org.jboss.portal.theme.render.AbstractObjectRenderer;
@@ -27,7 +28,6 @@
import org.jboss.portal.theme.render.RendererContext;
import org.jboss.portal.theme.render.renderer.DecorationRenderer;
import org.jboss.portal.theme.render.renderer.DecorationRendererContext;
-import org.jboss.portal.theme.impl.render.div.DivDecorationRenderer;
import java.io.PrintWriter;
@@ -69,26 +69,22 @@
markup.print("<div class=\"dnd-handle\">");
markup.print("<div class=\"dyna-decoration\">\n");
- //We need the title inside of the dnd-handle
- markup.print("<div class=\"portlet-titlebar-decoration\"></div>");
- markup.print("<span class=\"portlet-titlebar-dyna\">");
- markup.print(drc.getTitle());
- markup.print("</span>");
-
- // Close dnd-region
+ delegate.render(rendererContext, drc);
+
+ // Close dnd-decoration
markup.print("</div>");
- // Close dyna-region
+ // Close dnd-handle
markup.print("</div>");
- delegate.render(rendererContext, drc);
-
}
else
{
markup.print("<div class=\"dyna-decoration\">\n");
+
delegate.render(rendererContext, drc);
- //end element in DivDecorationRenderer
- //markup.print("</div>\n");
+
+ // Close dyna-decoration
+ markup.print("</div>");
}
}
else
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r12911 - tags/JBoss_Portal_2_7_2/build.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-02-28 11:27:59 -0500 (Sat, 28 Feb 2009)
New Revision: 12911
Modified:
tags/JBoss_Portal_2_7_2/build/distrib.xml
Log:
Updated release.version
Modified: tags/JBoss_Portal_2_7_2/build/distrib.xml
===================================================================
--- tags/JBoss_Portal_2_7_2/build/distrib.xml 2009-02-28 16:21:30 UTC (rev 12910)
+++ tags/JBoss_Portal_2_7_2/build/distrib.xml 2009-02-28 16:27:59 UTC (rev 12911)
@@ -3,7 +3,7 @@
<property name="source.dir" value=".."/>
<property name="docs.dir" value="${source.dir}/../docs"/>
<property name="examples.dir" value="${source.dir}/../examples"/>
- <property name="release.version" value="2.7.1"/>
+ <property name="release.version" value="2.7.2"/>
<!-- -->
<property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r12910 - branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-02-28 11:21:30 -0500 (Sat, 28 Feb 2009)
New Revision: 12910
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
Log:
- JBPORTAL-2226: fixed initial rendering in IE by completely reverting previous changes.
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-28 15:58:01 UTC (rev 12909)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-28 16:21:30 UTC (rev 12910)
@@ -485,7 +485,8 @@
.mode-button {
/*position:absolute;*/
- margin-right: 3px; /*padding-top:5px;*/
+ margin-right: 3px;
+ padding-top: 5px;
float: left;
}
@@ -495,7 +496,7 @@
font-size: 12px;
font-weight: bold;
white-space: nowrap;
- line-height: 3px;
+ line-height: 100%;
float: left;
text-indent: 5px;
padding-top: 5px;
@@ -514,14 +515,15 @@
width: 9px;
height: 29px;
min-width: 9px;
- background-position: 0 0;
+ background-position: 0 1px;
}
.portlet-titlebar-center {
background-image: url(images/portlet-top-middle2.gif);
background-repeat: repeat-x;
height: 29px;
- background-position: top; /*position:relative;*/
+ background-position: bottom;
+ position: relative;
}
.portlet-titlebar-right {
@@ -530,7 +532,7 @@
width: 10px;
height: 30px;
min-width: 10px;
- background-position: -1px 0;
+ background-position: -1px 1px;
}
.portlet-content-left {
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r12909 - in branches/JBoss_Portal_Branch_2_6/theme/src: main/org/jboss/portal/theme/impl/render/dynamic and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-02-28 10:58:01 -0500 (Sat, 28 Feb 2009)
New Revision: 12909
Modified:
branches/JBoss_Portal_Branch_2_6/theme/src/bin/portal-ajax-war/dyna/style.css
branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
Log:
- JBPORTAL-2226: dnd-handle div now has height so that we can drag from the whole title bar (needs testing on IE)
- Properly close divs in DynaDecorationRenderer.
Modified: branches/JBoss_Portal_Branch_2_6/theme/src/bin/portal-ajax-war/dyna/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/theme/src/bin/portal-ajax-war/dyna/style.css 2009-02-28 15:47:31 UTC (rev 12908)
+++ branches/JBoss_Portal_Branch_2_6/theme/src/bin/portal-ajax-war/dyna/style.css 2009-02-28 15:58:01 UTC (rev 12909)
@@ -1,17 +1,24 @@
/* We need the min-height in order to have a region that is never empty and can receive draggables
min-height doees not work on IE6 and the 2 other lines are there to make it work in that situation.
- 32 pixels is the height of the region when it is empty. */
+ 32 pixels is the height of the region when it is empty. */
.dnd-region {
- min-height:32px;
- height:auto !important;
- height:32px;
+ min-height: 32px;
+ height: auto !important;
+ height: 32px;
}
+/*
+Add height to handle div so that we can drag from the whole bar instead of just the title. Should work in IE as well,
+though it hasn't been tested.
+*/
.dnd-handle {
cursor: move;
+ position: relative;
+ min-height: 1.2em;
+ height: auto !important;
+ height: 1.2em;
}
-
.dnd-droppable {
border: red 1px dashed;
background-color: Transparent;
Modified: branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2009-02-28 15:47:31 UTC (rev 12908)
+++ branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2009-02-28 15:58:01 UTC (rev 12909)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -20,6 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.theme.impl.render.dynamic;
import org.jboss.portal.theme.render.AbstractObjectRenderer;
@@ -68,19 +69,22 @@
markup.print("<div class=\"dnd-handle\">");
markup.print("<div class=\"dyna-decoration\">\n");
- //
delegate.render(rendererContext, drc);
- //end element in DivDecorationRenderer
- /*markup.print("</div>\n");
- markup.print("</div>\n");*/
+ // Close dnd-decoration
+ markup.print("</div>");
+ // Close dnd-handle
+ markup.print("</div>");
+
}
else
{
markup.print("<div class=\"dyna-decoration\">\n");
+
delegate.render(rendererContext, drc);
- //end element in DivDecorationRenderer
- //markup.print("</div>\n");
+
+ // Close dyna-decoration
+ markup.print("</div>");
}
}
else
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r12908 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/resources/portal-admin-war/jsf/common and 3 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-02-28 10:47:31 -0500 (Sat, 28 Feb 2009)
New Revision: 12908
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/style.css
branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
Log:
- JBPORTAL-2226:
+ Reverted most changes from revision 12868
+ dnd-handle div now has height so that we can drag from the whole title bar (needs testing on IE)
- Properly close divs in DynaDecorationRenderer.
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-28 14:12:15 UTC (rev 12907)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-28 15:47:31 UTC (rev 12908)
@@ -1,6 +1,5 @@
-
@import url("/portal-core/themes/common/portlet-editor.css");
-@import url( "../common/tooltip.css" );
+@import url("../common/tooltip.css");
/* *************************************************** */
/* Default for JBoss Portal */
@@ -13,11 +12,10 @@
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px;
color: #656565;
- background-image: url( images/header-bg2.gif );
+ background-image: url(images/header-bg2.gif);
background-repeat: repeat-x;
}
-
/*****************
* Portal Header *
******************/
@@ -42,8 +40,7 @@
/* Header background */
#header {
- height: 64px;
- /*background-image: url( 'images/header-bg-left-shadow.gif' );*/
+ height: 64px; /*background-image: url( 'images/header-bg-left-shadow.gif' );*/
background-position: top left;
background-repeat: no-repeat;
width: 100%;
@@ -54,7 +51,7 @@
}
#logoName {
- background-image: url( images/JBP-logo-white.gif );
+ background-image: url(images/JBP-logo-white.gif);
background-repeat: no-repeat;
float: left;
width: 250px;
@@ -73,8 +70,8 @@
#portal-container {
/* part of below IE hack to preserve min-width for portlet regions */
/*width: 100%;*/
- /*margin: 4px 2% 0px 2%;*/
- background-image: url( 'images/header-bg-left-shadow2.gif' );
+/*margin: 4px 2% 0px 2%;*/
+ background-image: url('images/header-bg-left-shadow2.gif');
background-position: top left;
background-repeat: no-repeat;
padding: 0 350px 0 350px;
@@ -175,8 +172,7 @@
width: 35%;
float: left;
margin: 0px;
- padding: 0px;
-/*height: 300px;*/
+ padding: 0px; /*height: 300px;*/
}
#regionB {
@@ -228,7 +224,7 @@
*****************************/
div#navigation {
- position:relative;
+ position: relative;
width: 100%;
height: 64px;
}
@@ -237,7 +233,7 @@
list-style: none;
margin: 0 0 -5px 0;
padding: 0;
- position:absolute;
+ position: absolute;
bottom: 0px;
left: 0;
min-width: 550px;
@@ -248,7 +244,7 @@
list-style: none;
margin: 0 0 -5px 0;
padding: 0;
- position:absolute;
+ position: absolute;
bottom: -5px;
left: 0;
min-width: 550px;
@@ -267,12 +263,12 @@
}
ul#tabsHeader li,
-ul#tabsHeader li#current{
+ ul#tabsHeader li#current {
background-position: top right;
background-repeat: no-repeat;
}
-ul#tabsHeader li a{
+ul#tabsHeader li a {
background-position: top left;
background-repeat: no-repeat;
padding: 5px 15px 0 15px;
@@ -283,8 +279,7 @@
white-space: nowrap;
}
-
-ul#tabsHeader li#current a{
+ul#tabsHeader li#current a {
background-position: top left;
background-repeat: no-repeat;
padding: 5px 15px 0 15px;
@@ -294,23 +289,21 @@
white-space: nowrap;
}
-
-
ul#tabsHeader li#current {
- background-image: url( 'images/nav-active-right2.gif' );
+ background-image: url('images/nav-active-right2.gif');
}
-ul#tabsHeader li#current a{
- background-image: url( 'images/nav-active-left.gif' );
+ul#tabsHeader li#current a {
+ background-image: url('images/nav-active-left.gif');
color: #2c2c2c;
}
ul#tabsHeader li {
- background-image: url( 'images/nav-inactive-right2.gif' );
+ background-image: url('images/nav-inactive-right2.gif');
}
-ul#tabsHeader li a{
- background-image: url( 'images/nav-inactive-left.gif' );
+ul#tabsHeader li a {
+ background-image: url('images/nav-inactive-left.gif');
color: #113266;
}
@@ -382,14 +375,13 @@
background: #C0D3DC;
}
-
/* End Submenu selectors */
/* -------- These are new selectors for the admin and add page styles ------- */
ul#tabsHeader #admin {
display: inline;
- background-image: url( images/tab_right_admin.gif );
+ background-image: url(images/tab_right_admin.gif);
background-repeat: no-repeat;
background-position: right top;
padding-top: -3px;
@@ -454,9 +446,9 @@
*****************************/
#dashboardnav {
- /*float: right;*/
- position:absolute;
- top:0;
+/*float: right;*/
+ position: absolute;
+ top: 0;
right: 15px;
font-size: 10px;
padding: 6px 12px 0px 0px;
@@ -469,7 +461,7 @@
}
#dashboardnav .addcontent {
- background-image: url( images/ico_addcontent.gif );
+ background-image: url(images/ico_addcontent.gif);
background-repeat: no-repeat;
background-position: left;
height: 20px;
@@ -488,16 +480,13 @@
/* wrapper for floating portlet window modes */
.portlet-mode-container {
white-space: nowrap;
- float:right;
- position:relative;
- z-index:1;
+ float: right;
}
.mode-button {
- /*position:absolute;*/
- margin-right: 3px;
- /*padding-top:5px;*/
- float:left;
+/*position:absolute;*/
+ margin-right: 3px; /*padding-top:5px;*/
+ float: left;
}
.portlet-titlebar-title {
@@ -511,34 +500,16 @@
text-indent: 5px;
padding-top: 5px;
padding-bottom: 6px;
- display:block;
- margin-right:10px;
+ display: block;
+ margin-right: 10px;
}
-.portlet-titlebar-dyna {
- color: #656565;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- font-weight: bold;
- white-space: nowrap;
- line-height: 3px;
- float: left;
- text-indent: 5px;
- padding-top: 5px;
- padding-bottom: 6px;
- display:block;
- margin-right:10px;
- position:absolute;
- width: 100%;
- z-index: 1;
-}
-
/* ------ NOT CURRENTLY IN USE FOR NEW 2.6 FUNCTIONALITY -------
.portlet-titlebar-decoration {}
*/
.portlet-titlebar-left {
- background-image: url( images/portlet-top-left2.gif );
+ background-image: url(images/portlet-top-left2.gif);
background-repeat: no-repeat;
width: 9px;
height: 29px;
@@ -547,15 +518,14 @@
}
.portlet-titlebar-center {
- background-image: url( images/portlet-top-middle2.gif );
+ background-image: url(images/portlet-top-middle2.gif);
background-repeat: repeat-x;
height: 29px;
- background-position: top;
- /*position:relative;*/
+ background-position: top; /*position:relative;*/
}
.portlet-titlebar-right {
- background-image: url( images/portlet-top-right2.gif );
+ background-image: url(images/portlet-top-right2.gif);
background-repeat: no-repeat;
width: 10px;
height: 30px;
@@ -564,7 +534,7 @@
}
.portlet-content-left {
- background-image: url( images/portlet-left-vertical.gif );
+ background-image: url(images/portlet-left-vertical.gif);
background-repeat: repeat-y;
width: 9px;
min-width: 9px;
@@ -588,7 +558,7 @@
}
.portlet-content-right {
- background-image: url( images/portlet-right-vertical.gif );
+ background-image: url(images/portlet-right-vertical.gif);
height: 100%;
background-repeat: repeat-y;
background-position: left;
@@ -604,7 +574,7 @@
}
.portlet-footer-left {
- background-image: url( images/portlet-bottom-left.gif );
+ background-image: url(images/portlet-bottom-left.gif);
width: 9px;
height: 4px;
background-repeat: no-repeat;
@@ -621,7 +591,7 @@
}
.portlet-footer-center {
- background-image: url( images/portlet-bottom-middle.gif );
+ background-image: url(images/portlet-bottom-middle.gif);
height: 4px;
background-repeat: repeat-x;
/* background-color:#FFFFFF;
@@ -631,7 +601,7 @@
}
.portlet-footer-right {
- background-image: url( images/portlet-bottom-right.gif );
+ background-image: url(images/portlet-bottom-right.gif);
width: 5px;
height: 4px;
background-repeat: no-repeat;
@@ -648,7 +618,7 @@
* Portlet Window Modes *
************************/
.portlet-mode-maximized {
- background-image: url( images/ico_16_maximize.gif );
+ background-image: url(images/ico_16_maximize.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -663,7 +633,7 @@
}
.portlet-mode-minimized {
- background-image: url( images/ico_16_minimize.gif );
+ background-image: url(images/ico_16_minimize.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -678,7 +648,7 @@
}
.portlet-mode-normal {
- background-image: url( images/ico_16_normal.gif );
+ background-image: url(images/ico_16_normal.gif);
width: 16px;
height: 16px;
background-repeat: no-repeat;
@@ -693,7 +663,7 @@
}
.portlet-mode-help {
- background-image: url( images/ico_16_help.gif );
+ background-image: url(images/ico_16_help.gif);
width: 16px;
height: 16px;
background-repeat: no-repeat;
@@ -708,7 +678,7 @@
}
.portlet-mode-edit {
- background-image: url( images/ico_edit.gif );
+ background-image: url(images/ico_edit.gif);
background-repeat: no-repeat;
width: 28px;
height: 16px;
@@ -723,7 +693,7 @@
}
.portlet-mode-admin {
- background-image: url( images/ico_admin.gif );
+ background-image: url(images/ico_admin.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -738,7 +708,7 @@
}
.portlet-mode-remove {
- background-image: url( images/ico_16_remove.gif );
+ background-image: url(images/ico_16_remove.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -753,7 +723,7 @@
}
.portlet-mode-view {
- background-image: url( images/ico_cancel.gif );
+ background-image: url(images/ico_cancel.gif);
background-repeat: no-repeat;
width: 28px;
height: 16px;
@@ -769,7 +739,7 @@
}
.portlet-mode-reload {
- background-image: url( images/ico_16_reload.gif );
+ background-image: url(images/ico_16_reload.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -784,7 +754,7 @@
}
.portlet-mode-hide {
- background-image: url( images/ico_16_swizzleclosed.gif );
+ background-image: url(images/ico_16_swizzleclosed.gif);
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -955,14 +925,14 @@
}
/* Text for form field labels */
-.portlet-form-field-label{
+.portlet-form-field-label {
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
color: #000;
white-space: nowrap
}
-.provider-menu-container{
- padding:10px;
+.provider-menu-container {
+ padding: 10px;
}
/* Text for a form field */
@@ -1255,7 +1225,7 @@
a.addicon {
font-weight: bold;
- background-image: url( images/ico_addcontent.gif );
+ background-image: url(images/ico_addcontent.gif);
background-repeat: no-repeat;
background-position: left;
padding-left: 16px;
@@ -1330,7 +1300,7 @@
.pagination li.nextpage {
font-weight: bold;
- background-image: url( images/ico_arrow_blue_right.gif );
+ background-image: url(images/ico_arrow_blue_right.gif);
background-repeat: no-repeat;
background-position: left;
margin-left: 3px;
@@ -1340,7 +1310,7 @@
.pagination li.nextpagedisabled {
color: #656565;
font-weight: bold;
- background-image: url( images/ico_arrow_grey_right.gif );
+ background-image: url(images/ico_arrow_grey_right.gif);
background-repeat: no-repeat;
background-position: left;
margin-left: 3px;
@@ -1350,7 +1320,7 @@
.pagination li.previouspage {
font-weight: bold;
- background-image: url( images/ico_arrow_blue_left.gif );
+ background-image: url(images/ico_arrow_blue_left.gif);
background-repeat: no-repeat;
background-position: right;
padding-left: 10px;
@@ -1361,7 +1331,7 @@
.pagination li.previouspagedisabled {
font-weight: bold;
color: #656565;
- background-image: url( images/ico_arrow_grey_left.gif );
+ background-image: url(images/ico_arrow_grey_left.gif);
background-repeat: no-repeat;
background-position: right;
padding-left: 12px;
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2009-02-28 14:12:15 UTC (rev 12907)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2009-02-28 15:47:31 UTC (rev 12908)
@@ -1,46 +1,69 @@
-<div xmlns:ui="http://java.sun.com/jsf/facelets"
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ contributors as indicated by the @authors tag. See the
+ ~ copyright.txt in the distribution for a full listing of
+ ~ individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core">
<h:form id="common-edit-theme-form">
<table class="full-width datatable">
<thead class="portlet-section-header">
- <tr>
- <th>#{bundle.COMMON_NAME}</th>
- <th>#{bundle.COMMON_DESCRIPTION}</th>
- <th>#{bundle.COMMON_SETTING}</th>
- </tr>
+ <tr>
+ <th>#{bundle.COMMON_NAME}</th>
+ <th>#{bundle.COMMON_DESCRIPTION}</th>
+ <th>#{bundle.COMMON_SETTING}</th>
+ </tr>
</thead>
<tbody>
- <tr class="portlet-section-body">
- <td>#{bundle.COMMON_LAYOUT}</td>
- <td>#{bundle.COMMON_NAME_LAYOUT_IMPLEMENTATION}</td>
- <td>
- <h:selectOneMenu id="layout" value="#{theme.layoutName}">
- <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
- <tr class="portlet-section-alternate">
- <td>#{bundle.COMMON_THEME}</td>
- <td>#{bundle.COMMON_NAME_LOOK_AND_FEEL}</td>
- <td>
- <h:selectOneMenu id="theme" value="#{theme.themeName}">
- <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
- <tr class="portlet-section-body">
- <td>#{bundle.COMMON_RENDERSET}</td>
- <td>#{bundle.COMMON_NAME_RENDER_ENGINE_PAGES}</td>
- <td>
- <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}">
- <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
+ <tr class="portlet-section-body">
+ <td>#{bundle.COMMON_LAYOUT}</td>
+ <td>#{bundle.COMMON_NAME_LAYOUT_IMPLEMENTATION}</td>
+ <td>
+ <h:selectOneMenu id="layout" value="#{theme.layoutName}">
+ <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/>
+ </h:selectOneMenu>
+ </td>
+ </tr>
+ <tr class="portlet-section-alternate">
+ <td>#{bundle.COMMON_THEME}</td>
+ <td>#{bundle.COMMON_NAME_LOOK_AND_FEEL}</td>
+ <td>
+ <h:selectOneMenu id="theme" value="#{theme.themeName}">
+ <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/>
+ </h:selectOneMenu>
+ </td>
+ </tr>
+ <tr class="portlet-section-body">
+ <td>#{bundle.COMMON_RENDERSET}</td>
+ <td>#{bundle.COMMON_NAME_RENDER_ENGINE_PAGES}</td>
+ <td>
+ <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}">
+ <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/>
+ </h:selectOneMenu>
+ </td>
+ </tr>
</tbody>
</table>
- <br />
+ <br/>
<ui:insert name="form_submit"/>
</h:form>
</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/style.css 2009-02-28 14:12:15 UTC (rev 12907)
+++ branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/style.css 2009-02-28 15:47:31 UTC (rev 12908)
@@ -1,18 +1,24 @@
/* We need the min-height in order to have a region that is never empty and can receive draggables
min-height doees not work on IE6 and the 2 other lines are there to make it work in that situation.
- 32 pixels is the height of the region when it is empty. */
+ 32 pixels is the height of the region when it is empty. */
.dnd-region {
- min-height:32px;
- height:auto !important;
- height:32px;
+ min-height: 32px;
+ height: auto !important;
+ height: 32px;
}
+/*
+Add height to handle div so that we can drag from the whole bar instead of just the title. Should work in IE as well,
+though it hasn't been tested.
+*/
.dnd-handle {
cursor: move;
- position:relative;
+ position: relative;
+ min-height: 1.2em;
+ height: auto !important;
+ height: 1.2em;
}
-
.dnd-droppable {
border: red 1px dashed;
background-color: Transparent;
Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2009-02-28 14:12:15 UTC (rev 12907)
+++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2009-02-28 15:47:31 UTC (rev 12908)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -20,6 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.theme.impl.render.div;
import org.jboss.portal.Mode;
@@ -30,8 +31,6 @@
import org.jboss.portal.theme.render.renderer.ActionRendererContext;
import org.jboss.portal.theme.render.renderer.DecorationRenderer;
import org.jboss.portal.theme.render.renderer.DecorationRendererContext;
-import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions;
-import org.jboss.portal.theme.impl.render.dynamic.DynaConstants;
import java.io.PrintWriter;
import java.util.Collection;
@@ -55,13 +54,9 @@
public void render(RendererContext rendererContext, DecorationRendererContext drc) throws RenderException
{
- DynaRenderOptions options = (DynaRenderOptions)rendererContext.getAttribute(DynaConstants.RENDER_OPTIONS);
PrintWriter markup = rendererContext.getWriter();
- //Don't want title if this is DND, we already have it in DynaDecorationRenderer
- if (DynaRenderOptions.NO_AJAX.equals(options)){
- renderTitle(rendererContext, drc);
- }
+ renderTitle(rendererContext, drc);
markup.print("<div class=\"portlet-mode-container\">");
renderTriggerableActions(rendererContext, drc, ActionRendererContext.MODES_KEY);
Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2009-02-28 14:12:15 UTC (rev 12907)
+++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2009-02-28 15:47:31 UTC (rev 12908)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2009, Red Hat Middleware, LLC, and individual *
* contributors as indicated by the @authors tag. See the *
* copyright.txt in the distribution for a full listing of *
* individual contributors. *
@@ -20,6 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.theme.impl.render.dynamic;
import org.jboss.portal.theme.render.AbstractObjectRenderer;
@@ -27,7 +28,6 @@
import org.jboss.portal.theme.render.RendererContext;
import org.jboss.portal.theme.render.renderer.DecorationRenderer;
import org.jboss.portal.theme.render.renderer.DecorationRendererContext;
-import org.jboss.portal.theme.impl.render.div.DivDecorationRenderer;
import java.io.PrintWriter;
@@ -69,26 +69,22 @@
markup.print("<div class=\"dnd-handle\">");
markup.print("<div class=\"dyna-decoration\">\n");
- //We need the title inside of the dnd-handle
- markup.print("<div class=\"portlet-titlebar-decoration\"></div>");
- markup.print("<span class=\"portlet-titlebar-dyna\">");
- markup.print(drc.getTitle());
- markup.print("</span>");
-
- // Close dnd-region
+ delegate.render(rendererContext, drc);
+
+ // Close dnd-decoration
markup.print("</div>");
- // Close dyna-region
+ // Close dnd-handle
markup.print("</div>");
- delegate.render(rendererContext, drc);
-
}
else
{
markup.print("<div class=\"dyna-decoration\">\n");
+
delegate.render(rendererContext, drc);
- //end element in DivDecorationRenderer
- //markup.print("</div>\n");
+
+ // Close dyna-decoration
+ markup.print("</div>");
}
}
else
15 years, 2 months
- 1
- 0
JBoss Portal SVN: r12907 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/view.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-02-28 09:12:15 -0500 (Sat, 28 Feb 2009)
New Revision: 12907
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java
Log:
- Removed now useless query for previous PNS.
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2009-02-28 14:11:23 UTC (rev 12906)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2009-02-28 14:12:15 UTC (rev 12907)
@@ -20,6 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
******************************************************************************/
+
package org.jboss.portal.core.model.portal.command.view;
import org.jboss.portal.core.controller.ControllerCommand;
@@ -100,9 +101,6 @@
String pageId = getPage().getId().toString();
//
- PageNavigationalState previousPNS = nsContext.getPageNavigationalState(pageId);
-
- //
Map<QName, String[]> state = new HashMap<QName, String[]>();
//
15 years, 2 months
- 1
- 0