diff --git a/config/alfresco/web-client-config-actions.xml b/config/alfresco/web-client-config-actions.xml index 84671981a2..f96852836f 100644 --- a/config/alfresco/web-client-config-actions.xml +++ b/config/alfresco/web-client-config-actions.xml @@ -28,7 +28,7 @@ inlineAction /images/icons/edit_icon.gif - #{CheckinCheckoutBean.editFile} + #{CheckinCheckoutDialog.editFile} editDocument http://... new @@ -50,7 +50,7 @@ org.alfresco.web.action.evaluator.EditDocHttpEvaluator edit /images/icons/edit_icon.gif - #{CheckinCheckoutBean.editFile} + #{CheckinCheckoutDialog.editFile} #{actionContext.id} @@ -87,7 +87,7 @@ org.alfresco.web.action.evaluator.CheckinDocEvaluator checkin /images/icons/CheckIn_icon.gif - #{CheckinCheckoutBean.setupContentAction} + #{CheckinCheckoutDialog.setupContentAction} dialog:checkinFile #{actionContext.id} @@ -99,7 +99,7 @@ org.alfresco.web.action.evaluator.CheckoutDocEvaluator checkout /images/icons/CheckOut_icon.gif - #{CheckinCheckoutBean.setupContentAction} + #{CCCheckoutFileDialog.setupContentAction} dialog:checkoutFile #{actionContext.id} @@ -111,7 +111,7 @@ org.alfresco.web.action.evaluator.CancelCheckoutDocEvaluator undocheckout /images/icons/undo_checkout.gif - #{CheckinCheckoutBean.setupContentAction} + #{CCUndoCheckoutFileDialog.setupContentAction} dialog:undoCheckoutFile #{actionContext.id} @@ -199,7 +199,7 @@ org.alfresco.web.action.evaluator.UpdateDocEvaluator update /images/icons/update.gif - #{CheckinCheckoutBean.setupContentAction} + #{CheckinCheckoutDialog.setupContentAction} dialog:updateFile #{actionContext.id} @@ -571,14 +571,14 @@ reapply_rules /images/icons/reapply_rules.gif - #{RulesBean.reapplyRules} + #{RulesDialog.reapplyRules} - + /images/icons/reapply_rules.gif - #{RulesBean.ignoreInheritedRules} + #{RulesDialog.ignoreInheritedRules} @@ -688,7 +688,7 @@ org.alfresco.web.action.evaluator.CheckoutDocEvaluator checkout /images/icons/CheckOut_icon.gif - #{CheckinCheckoutBean.setupContentAction} + #{CheckinCheckoutDialog.setupContentAction} checkoutFile --> diff --git a/config/alfresco/web-client-config-dialogs.xml b/config/alfresco/web-client-config-dialogs.xml index d8a582688a..5a349fe7ad 100644 --- a/config/alfresco/web-client-config-dialogs.xml +++ b/config/alfresco/web-client-config-dialogs.xml @@ -256,6 +256,190 @@ icon="/images/icons/link_validation_report_large.gif" title-id="link_validaton_dialog_title" description-id="link_validaton_dialog_desc" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/alfresco/web-client-config-forum-actions.xml b/config/alfresco/web-client-config-forum-actions.xml index 2752edf976..989df50985 100644 --- a/config/alfresco/web-client-config-forum-actions.xml +++ b/config/alfresco/web-client-config-forum-actions.xml @@ -10,7 +10,7 @@ org.alfresco.web.action.evaluator.ForumsCheckinDocEvaluator checkin /images/icons/CheckIn_icon.gif - #{CheckinCheckoutBean.setupContentAction} + #{CheckinCheckoutDialog.setupContentAction} dialog:checkinFile #{actionContext.id} diff --git a/config/alfresco/web-client-config-wizards.xml b/config/alfresco/web-client-config-wizards.xml index 1a0a13f044..5df9e0695f 100644 --- a/config/alfresco/web-client-config-wizards.xml +++ b/config/alfresco/web-client-config-wizards.xml @@ -559,7 +559,65 @@ instruction-id="new_edition_finish_instruction" /> + + + + + + + + + + + + + + + + + + + + + + + + + + The bean for the Delete Category screen. + + MultilingualManageDialog + + org.alfresco.web.bean.ml.MultilingualManageDialog + + session + + The bean that make a document multilingual @@ -470,8 +482,21 @@ The bean that holds a state for the Advanced Search screen. - AdvancedSearchBean - org.alfresco.web.bean.AdvancedSearchBean + SearchProperties + org.alfresco.web.bean.SearchProperties + session + + permissionService + #{PermissionService} + + + + + + The bean that holds a state for the Advanced Search screen. + + AdvancedSearchDialog + org.alfresco.web.bean.AdvancedSearchDialog session navigator @@ -490,8 +515,8 @@ #{SearchService} - permissionService - #{PermissionService} + properties + #{SearchProperties} @@ -499,8 +524,8 @@ The bean that holds state for the Users screen. - UsersBean - org.alfresco.web.bean.users.UsersBean + UsersBeanProperties + org.alfresco.web.bean.users.UsersBeanProperties session nodeService @@ -524,15 +549,24 @@ The bean that holds state for the Groups Management screens. - GroupsBean - org.alfresco.web.bean.GroupsBean + UsersDialog + org.alfresco.web.bean.users.UsersDialog session - nodeService - #{NodeService} + properties + #{UsersBeanProperties} + + + + + The bean that holds state for the Groups Management screens. + + GroupsProperties + org.alfresco.web.bean.groups.GroupsProperties + session - authorityService + authService #{AuthorityService} @@ -543,21 +577,51 @@ - The bean that holds state for the Category Management screens. + The bean that holds state for the Groups Management screens. - CategoriesBean - org.alfresco.web.bean.CategoriesBean + GroupsDialog + org.alfresco.web.bean.GroupsDialog session nodeService #{NodeService} + + properties + #{GroupsProperties} + + + + + + The bean that holds state for the Category Management screens. + + CategoriesProperties + org.alfresco.web.bean.CategoriesProperties + session categoryService #{CategoryService} + + + The bean that holds state for the Category Management screens. + + CategoriesDialog + org.alfresco.web.bean.CategoriesDialog + session + + nodeService + #{NodeService} + + + properties + #{CategoriesProperties} + + + The bean that backs up the Edit Space Dialog @@ -789,8 +853,8 @@ The bean that backs up the Link Properties Dialog - LinkPropertiesBean - org.alfresco.web.bean.LinkPropertiesBean + LinkPropertiesDialog + org.alfresco.web.bean.LinkPropertiesDialog session nodeService @@ -850,8 +914,8 @@ #{MimetypeService} - rulesBean - #{RulesBean} + rulesDialog + #{RulesDialog} personService @@ -903,8 +967,8 @@ #{MimetypeService} - rulesBean - #{RulesBean} + rulesDialog + #{RulesDialog} personService @@ -1168,23 +1232,11 @@ - The bean that backs up the Checkin and Checkout pages. + The bean that presents the Checkin and Checkout bean's properties. - CheckinCheckoutBean - org.alfresco.web.bean.CheckinCheckoutBean + CCProperties + org.alfresco.web.bean.CCProperties session - - browseBean - #{BrowseBean} - - - navigator - #{NavigationBean} - - - nodeService - #{NodeService} - versionOperationsService #{CheckoutCheckinService} @@ -1199,12 +1251,35 @@ + + The bean that backs up the Checkin and Checkout pages. + CheckinCheckoutDialog + org.alfresco.web.bean.CheckinCheckoutDialog + session + + browseBean + #{BrowseBean} + + + navigator + #{NavigationBean} + + + nodeService + #{NodeService} + + + property + #{CCProperties} + + + The bean that holds manage content rules state - RulesBean - org.alfresco.web.bean.rules.RulesBean + RulesDialog + org.alfresco.web.bean.rules.RulesDialog session browseBean @@ -1372,7 +1447,7 @@ Backing bean used for the Export dialog ExportDialog - org.alfresco.web.bean.ExportBean + org.alfresco.web.bean.ExportDialog session browseBean @@ -1417,7 +1492,9 @@ - Backing bean used for the low-level Node Browser + + Backing bean used for the low-level Node Browser + AdminNodeBrowseBean org.alfresco.web.bean.AdminNodeBrowseBean session @@ -1884,17 +1961,26 @@ The bean that holds state for the Manage Deleted Items screen. - TrashcanBean - org.alfresco.web.bean.TrashcanBean + TrashcanDialogProperty + org.alfresco.web.bean.TrashcanDialogProperty + session + + nodeArchiveService + #{nodeArchiveService} + + + + + + The bean that holds state for the Manage Deleted Items screen. + + TrashcanDialog + org.alfresco.web.bean.TrashcanDialog session nodeService #{NodeService} - - nodeArchiveService - #{nodeArchiveService} - searchService #{SearchService} @@ -1903,6 +1989,10 @@ dictionaryService #{DictionaryService} + + property + #{TrashcanDialogProperty} + @@ -2364,16 +2454,16 @@ #{webClientConfigAdminInterpreter} - - - Backing bean used for the Repository Admin Console - RepoAdminConsoleBean - org.alfresco.web.bean.repository.admin.RepoAdminConsoleBean - session - - repoAdminInterpreter - #{repoAdminInterpreter} - + + + Backing bean used for the Repository Admin Console + RepoAdminConsoleBean + org.alfresco.web.bean.repository.admin.RepoAdminConsoleBean + session + + repoAdminInterpreter + #{repoAdminInterpreter} + @@ -4083,4 +4173,835 @@ #{ContentFilterLanguagesService} + + + + The bean that backs up the New User Wizard + + CreateUserWizard + + org.alfresco.web.bean.users.CreateUserWizard + + session + + nodeService + #{NodeService} + + + searchService + #{SearchService} + + + navigator + #{NavigationBean} + + + browseBean + #{BrowseBean} + + + authenticationService + #{authenticationService} + + + permissionService + #{PermissionService} + + + namespaceService + #{NamespaceService} + + + personService + #{PersonService} + + + ownableService + #{OwnableService} + + + + + + The bean that backs up the Edit User Wizard + + EditUserWizard + + org.alfresco.web.bean.users.EditUserWizard + + session + + nodeService + #{NodeService} + + + searchService + #{SearchService} + + + navigator + #{NavigationBean} + + + browseBean + #{BrowseBean} + + + authenticationService + #{authenticationService} + + + permissionService + #{PermissionService} + + + namespaceService + #{NamespaceService} + + + personService + #{PersonService} + + + ownableService + #{OwnableService} + + + properties + #{UsersBeanProperties} + + + + + + The bean that holds state for the Users Edit Details screen. + + EditUserDetailsDialog + + org.alfresco.web.bean.users.EditUserDetailsDialog + + session + + properties + #{UsersBeanProperties} + + + nodeService + #{NodeService} + + + + + + The bean for the Remove Invited User screen. + + RemoveInvitedUserDialog + + org.alfresco.web.bean.users.RemoveInvitedUserDialog + + session + + spaceUsersBean + #{SpaceUsersBean} + + + + + + The bean for the Edit User Roles screen. + + EditUserRolesDialog + + org.alfresco.web.bean.users.EditUserRolesDialog + + session + + spaceUsersBean + #{SpaceUsersBean} + + + + + The bean for the Delete User screen. + DeleteUserDialog + + org.alfresco.web.bean.users.DeleteUserDialog + + session + + authenticationService + #{AuthenticationService} + + + personService + #{PersonService} + + + + + + The bean for the Delete Content User screen. + + RemoveContentUserDialog + + org.alfresco.web.bean.users.RemoveContentUserDialog + + session + + contentUsersBean + #{ContentUsersBean} + + + + + + The bean for add users to group dialog. + + AddUsersDialog + + org.alfresco.web.bean.groups.AddUsersDialog + + session + + nodeService + #{NodeService} + + + properties + #{GroupsProperties} + + + + + The bean for delete group dialog. + DeleteGroupDialog + + org.alfresco.web.bean.groups.DeleteGroupDialog + + session + + nodeService + #{NodeService} + + + properties + #{GroupsProperties} + + + + + The bean for create group dialog. + CreateGroupDialog + + org.alfresco.web.bean.groups.CreateGroupDialog + + session + + nodeService + #{NodeService} + + + properties + #{GroupsProperties} + + + + + + The bean that holds state for the Edit File screens. + + EditFileDialog + + org.alfresco.web.bean.users.EditFileDialog + + session + + + + + The bean for the Edit Content User Roles screen. + + EditContentUserRolesDialog + + org.alfresco.web.bean.users.EditContentUserRolesDialog + + session + + contentUsersBean + #{ContentUsersBean} + + + + + + The bean for the Admin Console screen. + + AdminConsoleDialog + + org.alfresco.web.bean.AdminConsoleDialog + + session + + + + + The bean for the Edit Category screen. + + EditCategoryDialog + + org.alfresco.web.bean.EditCategoryDialog + + session + + nodeService + #{NodeService} + + + properties + #{CategoriesProperties} + + + + + + The bean for the Delete Category screen. + + DeleteCategoryDialog + + org.alfresco.web.bean.DeleteCategoryDialog + + session + + nodeService + #{NodeService} + + + properties + #{CategoriesProperties} + + + + + The bean for the New Category screen. + CreateCategoryDialog + + org.alfresco.web.bean.CreateCategoryDialog + + session + + nodeService + #{NodeService} + + + properties + #{CategoriesProperties} + + + + + The bean for Apply Doc Template Screen. + ApplyDocTemplateDialog + + org.alfresco.web.bean.ApplyDocTemplateDialog + + session + + nodeService + #{NodeService} + + + browseBean + #{BrowseBean} + + + + + The bean for Apply RSS Template Screen. + ApplyRssTemplateDialog + + org.alfresco.web.bean.ApplyRssTemplateDialog + + session + + nodeService + #{NodeService} + + + browseBean + #{BrowseBean} + + + + + The bean for Apply Space Template Screen. + ApplySpaceTemplateDialog + + org.alfresco.web.bean.ApplySpaceTemplateDialog + + session + + nodeService + #{NodeService} + + + browseBean + #{BrowseBean} + + + + + The bean for Edit Simple Workflow Screen. + EditSimpleWorkflowDialog + + org.alfresco.web.bean.EditSimpleWorkflowDialog + + session + + browseBean + #{BrowseBean} + + + nodeService + #{NodeService} + + + + + The bean for Edit Simple Space Workflow Screen. + EditSpaceSimpleWorkflowDialog + + org.alfresco.web.bean.EditSpaceSimpleWorkflowDialog + + session + + browseBean + #{BrowseBean} + + + nodeService + #{NodeService} + + + + + The bean for Change Current User Password Screen. + ChangeMyPasswordDialog + + org.alfresco.web.bean.users.ChangeMyPasswordDialog + + session + + properties + #{UsersBeanProperties} + + + + + The bean for Change Users Password Screen. + ChangePasswordDialog + + org.alfresco.web.bean.users.ChangePasswordDialog + + session + + properties + #{UsersBeanProperties} + + + + + + Bean that manages the deleting of trashitem. + + TrashcanDeleteItemDialog + org.alfresco.web.bean.TrashcanDeleteItemDialog + session + + nodeService + #{NodeService} + + + searchService + #{SearchService} + + + dictionaryService + #{DictionaryService} + + + property + #{TrashcanDialogProperty} + + + + + + Bean that manages the deleting of all trashitems. + + TrashcanDeleteAllItemsDialog + org.alfresco.web.bean.TrashcanDeleteAllItemsDialog + session + + nodeService + #{NodeService} + + + searchService + #{SearchService} + + + dictionaryService + #{DictionaryService} + + + property + #{TrashcanDialogProperty} + + + + + + Bean that manages the deleting of listed trashitems. + + TrashcanDeleteListedItemsDialog + org.alfresco.web.bean.TrashcanDeleteListedItemsDialog + session + + nodeService + #{NodeService} + + + searchService + #{SearchService} + + + dictionaryService + #{DictionaryService} + + + property + #{TrashcanDialogProperty} + + + + + The bean for the Item Details Screen. + TrashcanItemDetailsDialog + + org.alfresco.web.bean.TrashcanItemDetailsDialog + + session + + nodeService + #{NodeService} + + + searchService + #{SearchService} + + + dictionaryService + #{DictionaryService} + + + property + #{TrashcanDialogProperty} + + + + + The bean for the Recover Item Screen. + TrashcanRecoverItemDialog + + org.alfresco.web.bean.TrashcanRecoverItemDialog + + session + + nodeService + #{NodeService} + + + searchService + #{SearchService} + + + dictionaryService + #{DictionaryService} + + + property + #{TrashcanDialogProperty} + + + + + The bean for the Recover All Items Screen. + TrashcanRecoverAllItemsDialog + + org.alfresco.web.bean.TrashcanRecoverAllItemsDialog + + session + + nodeService + #{NodeService} + + + searchService + #{SearchService} + + + dictionaryService + #{DictionaryService} + + + property + #{TrashcanDialogProperty} + + + + + The bean for the Recover Listed Items Screen. + TrashcanRecoverListedItemsDialog + + org.alfresco.web.bean.TrashcanRecoverListedItemsDialog + + session + + nodeService + #{NodeService} + + + searchService + #{SearchService} + + + dictionaryService + #{DictionaryService} + + + property + #{TrashcanDialogProperty} + + + + + The bean for Change Users Password Screen. + UserConsoleDialog + + org.alfresco.web.bean.users.UserConsoleDialog + + session + + + + The bean for the Recovery Report Screen. + TrashcanRecoveryReportDialog + + org.alfresco.web.bean.TrashcanRecoveryReportDialog + + session + + nodeService + #{NodeService} + + + searchService + #{SearchService} + + + dictionaryService + #{DictionaryService} + + + property + #{TrashcanDialogProperty} + + + + + The bean for the Edit Html Inline Screen. + CCEditHtmlInlineDialog + + org.alfresco.web.bean.CCEditHtmlInlineDialog + + session + + property + #{CCProperties} + + + + + The bean for the Edit Text Inline Screen. + CCEditTextInlineDialog + + org.alfresco.web.bean.CCEditTextInlineDialog + + session + + property + #{CCProperties} + + + + + The bean for the Checkout File Screen. + CCCheckoutFileDialog + + org.alfresco.web.bean.CCCheckoutFileDialog + + session + + property + #{CCProperties} + + + browseBean + #{BrowseBean} + + + navigator + #{NavigationBean} + + + nodeService + #{NodeService} + + + + + The bean for the Checkout File Link Screen. + CCCheckoutFileLinkDialog + + org.alfresco.web.bean.CCCheckoutFileLinkDialog + + session + + browseBean + #{BrowseBean} + + + navigator + #{NavigationBean} + + + nodeService + #{NodeService} + + + property + #{CCProperties} + + + + + The bean for the Edit File Screen. + CCEditFileDialog + + org.alfresco.web.bean.CCEditFileDialog + + session + + property + #{CCProperties} + + + + + The bean for the Undo Checkout File Screen. + CCUndoCheckoutFileDialog + + org.alfresco.web.bean.CCUndoCheckoutFileDialog + + session + + property + #{CCProperties} + + + + + The bean for the Working Copy Missing Screen. + CCWorkingCopyMissingDialog + + org.alfresco.web.bean.CCWorkingCopyMissingDialog + + session + + property + #{CCProperties} + + + + + The bean for the Edit Search Screen. + EditSearchDialog + + org.alfresco.web.bean.EditSearchDialog + + session + + navigator + #{NavigationBean} + + + nodeService + #{NodeService} + + + namespaceService + #{NamespaceService} + + + searchService + #{SearchService} + + + properties + #{SearchProperties} + + + + + The bean for the Save Search Screen. + SaveSearchDialog + + org.alfresco.web.bean.SaveSearchDialog + + session + + navigator + #{NavigationBean} + + + nodeService + #{NodeService} + + + namespaceService + #{NamespaceService} + + + searchService + #{SearchService} + + + properties + #{SearchProperties} + + + + + The bean for the Save Search Screen. + ShowSystemInfoDialog + + org.alfresco.web.bean.ShowSystemInfoDialog + + session + + navigationBean + #{NavigationBean} + + + diff --git a/source/web/WEB-INF/faces-config-navigation.xml b/source/web/WEB-INF/faces-config-navigation.xml index 09bf5d26fb..58789f557f 100644 --- a/source/web/WEB-INF/faces-config-navigation.xml +++ b/source/web/WEB-INF/faces-config-navigation.xml @@ -77,6 +77,30 @@ import /jsp/dialog/import.jsp + + manageCategories + /jsp/categories/categories.jsp + + + manageUsers + /jsp/users/users.jsp + + + manageGroups + /jsp/groups/groups.jsp + + + showSystemInfo + /jsp/dialog/system-info.jsp + + + showNodeBrowser + /jsp/admin/store-browser.jsp + + + export + /jsp/dialog/export.jsp + @@ -209,30 +233,6 @@ /jsp/admin/admin-console.jsp - - manageCategories - /jsp/categories/categories.jsp - - - manageUsers - /jsp/users/users.jsp - - - manageGroups - /jsp/groups/groups.jsp - - - showSystemInfo - /jsp/dialog/system-info.jsp - - - showNodeBrowser - /jsp/admin/store-browser.jsp - - - export - /jsp/dialog/export.jsp - @@ -267,18 +267,6 @@ - - /jsp/dialog/checkout-file.jsp - - checkoutFileLink - /jsp/dialog/checkout-file-link.jsp - - - workingCopyMissing - /jsp/dialog/working-copy-missing.jsp - - - /jsp/dialog/space-details.jsp @@ -289,10 +277,6 @@ manageRules /jsp/dialog/rules.jsp - - export - /jsp/dialog/export.jsp - applyTemplate /jsp/dialog/apply-space-template.jsp @@ -320,7 +304,7 @@ - /jsp/dialog/apply-rss-template.jsp + /jsp/dialog/* manageInvitedUsers /jsp/roles/manage-invited-users.jsp @@ -616,7 +600,7 @@ - /jsp/users/user-console.jsp + /jsp/* changePassword /jsp/users/change-my-password.jsp @@ -825,10 +809,6 @@ manageInvitedUsers /jsp/roles/manage-invited-users.jsp - - export - /jsp/dialog/export.jsp - @@ -884,6 +864,14 @@ topicDeleted /jsp/forums/forum.jsp + + checkoutFileLink + /jsp/dialog/checkout-file-link.jsp + + + workingCopyMissing + /jsp/dialog/working-copy-missing.jsp + @@ -931,4 +919,15 @@ /jsp/wcm/browse-sandbox.jsp + + + + + /jsp/* + + goToTrashList + /jsp/trashcan/trash-list.jsp + + + diff --git a/source/web/jsp/admin/admin-console.jsp b/source/web/jsp/admin/admin-console.jsp index e72c5799e5..ce0d206d37 100644 --- a/source/web/jsp/admin/admin-console.jsp +++ b/source/web/jsp/admin/admin-console.jsp @@ -28,150 +28,60 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - - - -
- - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "ballongrey", "#EEEEEE"); %> - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "ballongrey"); %> - - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
- -
-
- - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + + + +
+ + + + + +
+ + + +
+ + + +
+ \ No newline at end of file diff --git a/source/web/jsp/browse/browse.jsp b/source/web/jsp/browse/browse.jsp index 945ea76a8a..4b87d389c1 100644 --- a/source/web/jsp/browse/browse.jsp +++ b/source/web/jsp/browse/browse.jsp @@ -172,9 +172,9 @@ <%-- More Search actions --%> - - - + + + diff --git a/source/web/jsp/categories/categories.jsp b/source/web/jsp/categories/categories.jsp index c358f5cdc3..5f22dff1cd 100644 --- a/source/web/jsp/categories/categories.jsp +++ b/source/web/jsp/categories/categories.jsp @@ -80,8 +80,8 @@
<%-- show either root message or the current category name --%> - - + +
@@ -89,18 +89,18 @@ <%-- Create actions menu --%> - + <%-- More actions menu --%> - - - + + + - - + + @@ -110,7 +110,7 @@ <%-- View mode settings --%> + value="#{CategoriesProperties.viewMode}" actionListener="#{CategoriesDialog.viewModeChanged}" menu="true" menuImage="/images/icons/menu.gif" styleClass="moreActionsMenu"> @@ -138,7 +138,7 @@ <%-- Category Path Breadcrumb --%>
- +
<%-- Categories List --%> @@ -146,9 +146,9 @@ - + value="#{CategoriesDialog.categories}" var="r" initialSortColumn="name" initialSortDescending="true"> <%-- Primary column for icons view mode --%> @@ -156,16 +156,16 @@ - + - + - + @@ -175,10 +175,10 @@ - + - + diff --git a/source/web/jsp/categories/delete-category.jsp b/source/web/jsp/categories/delete-category.jsp index 135f27297e..0794e75e98 100644 --- a/source/web/jsp/categories/delete-category.jsp +++ b/source/web/jsp/categories/delete-category.jsp @@ -28,156 +28,46 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - <%-- load a bundle of properties with I18N strings --%> - - - <%-- set the form name here --%> - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- - -
''
-
-
- -
- - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %> - - - - - -
- - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %> -
- - - -
- <%-- Error Messages --%> - <%-- messages tag to show messages not handled by other specific message tags --%> - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
-
- - - - - - + + + + + + + + + + + + + + +
+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %> + + + + + +
+ + + + + + + + + +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %> +
+ + + + + +
+ \ No newline at end of file diff --git a/source/web/jsp/categories/edit-category.jsp b/source/web/jsp/categories/edit-category.jsp index 65671f29dd..cbac09ac6d 100644 --- a/source/web/jsp/categories/edit-category.jsp +++ b/source/web/jsp/categories/edit-category.jsp @@ -28,165 +28,50 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> + + +
- - - <%-- Main area --%> - - <%-- Shelf --%> + + - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> + +
: - <%@ include file="../parts/shelf.jsp" %> + + +  * - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
''
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - -
: -  * -
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
-
- - - - - - \ No newline at end of file + + + : + + + + + + \ No newline at end of file diff --git a/source/web/jsp/categories/new-category.jsp b/source/web/jsp/categories/new-category.jsp index 44e958f6f2..24ef2bd469 100644 --- a/source/web/jsp/categories/new-category.jsp +++ b/source/web/jsp/categories/new-category.jsp @@ -28,165 +28,53 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> + + +
- - - <%-- Main area --%> - - <%-- Shelf --%> + + - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> + +
: - <%@ include file="../parts/shelf.jsp" %> + + +  * - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - -
: -  * -
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
-
- - - - - - \ No newline at end of file + + + : + + + + + + + + diff --git a/source/web/jsp/dialog/advanced-search.jsp b/source/web/jsp/dialog/advanced-search.jsp index b87fa259e8..6ea985c62b 100644 --- a/source/web/jsp/dialog/advanced-search.jsp +++ b/source/web/jsp/dialog/advanced-search.jsp @@ -94,14 +94,14 @@ - + <%-- Available Saved Searches --%>
+ value="#{SearchProperties.savedSearchMode}" actionListener="#{AdvancedSearchDialog.savedSearchModeChanged}" menu="true" menuImage="/images/icons/menu.gif" styleClass="moreActionsMenu" label="#{msg.saved_searches}"> @@ -113,10 +113,10 @@ <%-- uses a nasty hack to execute an ActionListener for the drop-down. tried using a valueChangedListener+formsubmit but the valueChangedListener is called too late in the lifecycle for the form controls to be modified --%> - - + + -
+
@@ -147,18 +147,18 @@ :  - + + expanded='#{SearchProperties.panels["restrict-panel"]}' expandedActionListener="#{AdvancedSearchDialog.expandPanel}"> @@ -163,8 +163,8 @@ @@ -200,7 +200,7 @@ <% - CheckinCheckoutBean bean = (CheckinCheckoutBean)FacesHelper.getManagedBean(FacesContext.getCurrentInstance(), "CheckinCheckoutBean"); + CheckinCheckoutDialog bean = (CheckinCheckoutDialog)FacesHelper.getManagedBean(FacesContext.getCurrentInstance(), "CheckinCheckoutDialog"); if (bean != null && bean.getFileName() != null) { %> @@ -254,4 +254,4 @@ - \ No newline at end of file + diff --git a/source/web/jsp/dialog/checkout-file-link.jsp b/source/web/jsp/dialog/checkout-file-link.jsp index d0aead6e87..2d06fedfc6 100644 --- a/source/web/jsp/dialog/checkout-file-link.jsp +++ b/source/web/jsp/dialog/checkout-file-link.jsp @@ -28,187 +28,70 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - <%-- set the form name here --%> - - - <%-- Main outer table --%> -
- + @@ -172,11 +172,11 @@
+ expanded='#{SearchProperties.panels["location-panel"]}' expandedActionListener="#{AdvancedSearchDialog.expandPanel}"> @@ -199,7 +199,7 @@
+ expanded='#{SearchProperties.panels["categories-panel"]}' expandedActionListener="#{AdvancedSearchDialog.expandPanel}">
- + @@ -184,12 +184,12 @@
- +
- +
@@ -113,13 +113,13 @@
@@ -214,16 +214,16 @@
- +
- + rendered="#{SearchProperties.categoriesDataModel.rowCount != 0}"> @@ -239,12 +239,12 @@ - - + @@ -264,7 +264,7 @@ @@ -347,7 +347,7 @@
+ expanded='#{SearchProperties.panels["attrs-panel"]}' expandedActionListener="#{AdvancedSearchDialog.expandPanel}"> - + - + - +
@@ -272,63 +272,63 @@
: - - + +
: - - + +
: - - + +
::
::
::
- + - + - + - + - + - +
::
::
::
::
::
::
- + expanded='#{SearchProperties.panels["custom-panel"]}' expandedActionListener="#{AdvancedSearchDialog.expandPanel}"> +
@@ -390,4 +390,4 @@ - \ No newline at end of file + diff --git a/source/web/jsp/dialog/apply-doc-template.jsp b/source/web/jsp/dialog/apply-doc-template.jsp index 48faf47c18..e29cd75e34 100644 --- a/source/web/jsp/dialog/apply-doc-template.jsp +++ b/source/web/jsp/dialog/apply-doc-template.jsp @@ -22,136 +22,20 @@ * the FLOSS exception, and it is also available here: * http://www.alfresco.com/legal/licensing" --%> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> -<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a"%> +<%@ taglib uri="/WEB-INF/repo.tld" prefix="r"%> -<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> -
- +
- - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- - -
''
-
-
- -
- - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - -
: - <%-- Templates drop-down selector --%> - - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
-
- - - - - - \ No newline at end of file + + + + + + +
:<%-- Templates drop-down selector --%> + +
+ \ No newline at end of file diff --git a/source/web/jsp/dialog/apply-rss-template.jsp b/source/web/jsp/dialog/apply-rss-template.jsp index 78b0dc13ee..73f726a0f0 100644 --- a/source/web/jsp/dialog/apply-rss-template.jsp +++ b/source/web/jsp/dialog/apply-rss-template.jsp @@ -22,154 +22,64 @@ * the FLOSS exception, and it is also available here: * http://www.alfresco.com/legal/licensing" --%> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> -<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a"%> +<%@ taglib uri="/WEB-INF/repo.tld" prefix="r"%> -<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> +<%@ page buffer="64kb" contentType="text/html;charset=UTF-8"%> +<%@ page isELIgnored="false"%> +<%@ page import="org.alfresco.web.ui.common.PanelGenerator"%> - + - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- - -
''
-
-
- -
- - - <%-- TODO: check for Guest user access and hide panel? --%> - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %> - - - - - -
- - - - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %> - -
- - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - -
: - <%-- Templates drop-down selector --%> - - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
-
- - - - + + + + <%-- TODO: check for Guest user access and hide panel? --%> + + +
+ <% + PanelGenerator.generatePanelStart(out, request.getContextPath(), + "yellowInner", "#ffffcc"); + %> + + + + + +
+ +
+ <% + PanelGenerator.generatePanelEnd(out, request.getContextPath(), + "yellowInner"); + %> - \ No newline at end of file +
+ <% + PanelGenerator.generatePanelStart(out, request.getContextPath(), + "white", "white"); + %> + + + + + +
:<%-- Templates drop-down selector --%> + +
+ <% + PanelGenerator.generatePanelEnd(out, request.getContextPath(), + "white"); + %> +
+ diff --git a/source/web/jsp/dialog/apply-space-template.jsp b/source/web/jsp/dialog/apply-space-template.jsp index 20aa334dd9..40ab204376 100644 --- a/source/web/jsp/dialog/apply-space-template.jsp +++ b/source/web/jsp/dialog/apply-space-template.jsp @@ -22,136 +22,20 @@ * the FLOSS exception, and it is also available here: * http://www.alfresco.com/legal/licensing" --%> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> -<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a"%> +<%@ taglib uri="/WEB-INF/repo.tld" prefix="r"%> -<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- - -
''
-
-
- -
- - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - -
: - <%-- Templates drop-down selector --%> - - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
-
- - - - - - \ No newline at end of file + + + + + + +
:<%-- Templates drop-down selector --%> + +
+ \ No newline at end of file diff --git a/source/web/jsp/dialog/checkin-file.jsp b/source/web/jsp/dialog/checkin-file.jsp index 4a8424a932..0fb1b37f6b 100644 --- a/source/web/jsp/dialog/checkin-file.jsp +++ b/source/web/jsp/dialog/checkin-file.jsp @@ -32,7 +32,7 @@ <%@ page isELIgnored="false" %> <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> <%@ page import="org.alfresco.web.app.servlet.FacesHelper" %> -<%@ page import="org.alfresco.web.bean.CheckinCheckoutBean" %> +<%@ page import="org.alfresco.web.bean.CheckinCheckoutDialog" %> <%@ page import="org.alfresco.web.app.Application" %> <%@ page import="javax.faces.context.FacesContext" %> @@ -82,7 +82,7 @@ 		-
''
+
''
- +
- +
@@ -135,19 +135,19 @@
- - + +
- +
- +
- - + +
- - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- Error Messages --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
''
-
-
- -
- - - - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %> - - - - - -
- - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- <%-- downloadable file link generated by CheckinCheckoutBean --%> - -
- -
- -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> -
-
- <%-- messages tag to show messages not handled by other specific message tags --%> - -
-
- - - - - - \ No newline at end of file + + + + + + + + + +
+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %> + + + + + +
+ + + +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %> +
+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ <%-- downloadable file link generated by CheckinCheckoutDialog --%> + +
+ +
+ +
+ +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> +
+ \ No newline at end of file diff --git a/source/web/jsp/dialog/checkout-file.jsp b/source/web/jsp/dialog/checkout-file.jsp index ed62004c77..33c8b42283 100644 --- a/source/web/jsp/dialog/checkout-file.jsp +++ b/source/web/jsp/dialog/checkout-file.jsp @@ -28,172 +28,56 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - <%-- set the form name here --%> - - - <%-- Main outer table --%> - - - <%-- Title bar --%> + + +
- - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - + +
- <%@ include file="../parts/titlebar.jsp" %> + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %> + + + + + +
+ + + +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %>
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> + + - -
+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + - - - + - - <%-- separator row with gradient shadow --%> - - - - - - <%-- Details --%> - - - - - <%-- Error Messages --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - + -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
''
-
-
- -
- - - - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %> - - - - - -
- - - -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - -
- - - - -
- <%-- Space selector to allow user to pick a Space --%> - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> -
+ + + +
- <%-- messages tag to show messages not handled by other specific message tags --%> - -
+ <%-- Space selector to allow user to pick a Space --%> + + +
-
- - - - - - \ No newline at end of file + <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> +
+ diff --git a/source/web/jsp/dialog/delete-rule.jsp b/source/web/jsp/dialog/delete-rule.jsp index efb14b9828..41bf1ddadc 100644 --- a/source/web/jsp/dialog/delete-rule.jsp +++ b/source/web/jsp/dialog/delete-rule.jsp @@ -28,138 +28,16 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - <%-- set the form name here --%> - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- - -
''
-
-
- -
- - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - -
- - - -
- <%-- Error Messages --%> - <%-- messages tag to show messages not handled by other specific message tags --%> - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
-
- - - - - - + + + + + +
+ + + + + +
+ \ No newline at end of file diff --git a/source/web/jsp/dialog/document-details.jsp b/source/web/jsp/dialog/document-details.jsp index 7ff2bff80d..fc9843bcf1 100644 --- a/source/web/jsp/dialog/document-details.jsp +++ b/source/web/jsp/dialog/document-details.jsp @@ -146,7 +146,7 @@ - + @@ -158,7 +158,7 @@ - +
@@ -388,7 +388,7 @@ @@ -396,7 +396,7 @@ - +
@@ -405,7 +405,7 @@ + action="dialog:editContentCategories" actionListener="#{DocumentDetailsBean.setupCategoriesForEdit}" /> diff --git a/source/web/jsp/dialog/edit-category.jsp b/source/web/jsp/dialog/edit-category.jsp index 26b9164565..e271cde793 100644 --- a/source/web/jsp/dialog/edit-category.jsp +++ b/source/web/jsp/dialog/edit-category.jsp @@ -28,150 +28,29 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- Error Messages --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
''
-
-
- -
- - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - -
: - - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
- <%-- messages tag to show messages not handled by other specific message tags --%> - -
-
- - - - - - \ No newline at end of file + + + + + + + + + +
: + + + + + + + +
+ \ No newline at end of file diff --git a/source/web/jsp/dialog/edit-file.jsp b/source/web/jsp/dialog/edit-file.jsp index af81dae95d..7de74ed515 100644 --- a/source/web/jsp/dialog/edit-file.jsp +++ b/source/web/jsp/dialog/edit-file.jsp @@ -28,172 +28,55 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - <%-- load a bundle of properties with I18N strings --%> - - - <%-- set the form name here --%> - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- Error Messages --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
''
-
-
- -
- - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - <%-- Hide the checkout info if this document is already checked out --%> - - - - - - - - - -
- -
- - - -
- <%-- downloadable file link generated by CheckinCheckoutBean --%> - -
- -
- -
- -
- - - -
-
-
-
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
- <%-- messages tag to show messages not handled by other specific message tags --%> - -
-
- - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + <%-- Hide the checkout info if this document is already checked out --%> + + + + + + + + + +
+ +
+ + + +
+ <%-- downloadable file link generated by CheckinCheckoutDialog --%> + +
+ +
+ +
+ +
+ + + + +
+
+
+
+ \ No newline at end of file diff --git a/source/web/jsp/dialog/edit-html-inline.jsp b/source/web/jsp/dialog/edit-html-inline.jsp index c46d29d671..bc52f9a82a 100644 --- a/source/web/jsp/dialog/edit-html-inline.jsp +++ b/source/web/jsp/dialog/edit-html-inline.jsp @@ -28,185 +28,74 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - + + + + + - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> -
+ <%-- Hide the checkout info if this document is already checked out --%> + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %> + + + + + + +
+ + + + + + + + +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %> + +
- - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- Error Messages --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
''
-
-
- -
- - - - - - - - <%-- Inline editor --%> - - - -
- <%-- Hide the checkout info if this document is already checked out --%> - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %> - - - - - - -
- - - - - -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %> - - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
- -
- -
-
- <%-- messages tag to show messages not handled by other specific message tags --%> - -
-
- - - - - - \ No newline at end of file + <%-- Inline editor --%> + + +
+ +
+ + + + + \ No newline at end of file diff --git a/source/web/jsp/dialog/edit-link-properties.jsp b/source/web/jsp/dialog/edit-link-properties.jsp index 88f3b900ac..e5d13a5ec2 100644 --- a/source/web/jsp/dialog/edit-link-properties.jsp +++ b/source/web/jsp/dialog/edit-link-properties.jsp @@ -1,26 +1,26 @@ <%-- - * Copyright (C) 2005-2007 Alfresco Software Limited. - - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. +* Copyright (C) 2005-2007 Alfresco Software Limited. - * This program 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 General Public License for more details. +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +* This program 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 General Public License for more details. - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +* As a special exception to the terms and conditions of version 2.0 of +* the GPL, you may redistribute this Program in connection with Free/Libre +* and Open Source Software ("FLOSS") applications as described in Alfresco's +* FLOSS exception. You should have recieved a copy of the text describing +* the FLOSS exception, and it is also available here: +* http://www.alfresco.com/legal/licensing" --%> <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> @@ -28,174 +28,49 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - + - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- Error Messages --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
''
-
-
- -
- - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - - - - - - - -
: -  * -
: - -
: - -
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
- <%-- messages tag to show messages not handled by other specific message tags --%> - -
-
- - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + +
: + * +
: + +
: + +
: + +
\ No newline at end of file diff --git a/source/web/jsp/dialog/edit-search.jsp b/source/web/jsp/dialog/edit-search.jsp index 0269b1f4d0..e76c1e3017 100644 --- a/source/web/jsp/dialog/edit-search.jsp +++ b/source/web/jsp/dialog/edit-search.jsp @@ -1,26 +1,26 @@ <%-- - * Copyright (C) 2005-2007 Alfresco Software Limited. - - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. +* Copyright (C) 2005-2007 Alfresco Software Limited. - * This program 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 General Public License for more details. +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +* This program 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 General Public License for more details. - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +* As a special exception to the terms and conditions of version 2.0 of +* the GPL, you may redistribute this Program in connection with Free/Libre +* and Open Source Software ("FLOSS") applications as described in Alfresco's +* FLOSS exception. You should have recieved a copy of the text describing +* the FLOSS exception, and it is also available here: +* http://www.alfresco.com/legal/licensing" --%> <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> @@ -32,180 +32,71 @@ <%@ page isELIgnored="false" %> <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - + - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %> - - - - - -
- - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %> -
: -  * -
: - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
-
- - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + +
+<% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %> + + + + + +
+ + + + +
+<% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %> +
: + * +
: + + +
+ diff --git a/source/web/jsp/dialog/edit-simple-workflow.jsp b/source/web/jsp/dialog/edit-simple-workflow.jsp index de8cc951dc..0e051f8f10 100644 --- a/source/web/jsp/dialog/edit-simple-workflow.jsp +++ b/source/web/jsp/dialog/edit-simple-workflow.jsp @@ -28,33 +28,28 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - + - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- Error Messages --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - - - - - - - - - - - - -
: - -
- - - - - - - - -
- - - - - : - -
-
- - - - -
- - - - - -
- - - - - - - - - -
- :  - -
- - - - - - - - -
- - - - - : - -
-
-
-
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
- <%-- messages tag to show messages not handled by other specific message tags --%> - -
-
- - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
:
+ + + + + + + + +
+ + + :
+
+ + +
+ + + + + +
+ + + + + + + + + + + + +
: 
+ + + + + + + + +
+ + + :
+
+
+
+ \ No newline at end of file diff --git a/source/web/jsp/dialog/edit-space-category.jsp b/source/web/jsp/dialog/edit-space-category.jsp index 444316f8e1..aab2a9c295 100644 --- a/source/web/jsp/dialog/edit-space-category.jsp +++ b/source/web/jsp/dialog/edit-space-category.jsp @@ -1,26 +1,26 @@ <%-- - * Copyright (C) 2005-2007 Alfresco Software Limited. - - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. +* Copyright (C) 2005-2007 Alfresco Software Limited. - * This program 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 General Public License for more details. +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +* This program 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 General Public License for more details. - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +* As a special exception to the terms and conditions of version 2.0 of +* the GPL, you may redistribute this Program in connection with Free/Libre +* and Open Source Software ("FLOSS") applications as described in Alfresco's +* FLOSS exception. You should have recieved a copy of the text describing +* the FLOSS exception, and it is also available here: +* http://www.alfresco.com/legal/licensing" --%> <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> @@ -28,150 +28,29 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> + + + + + + + + +
: + + + + + + +
+ - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- Error Messages --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
''
-
-
- -
- - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - -
: - - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
- <%-- messages tag to show messages not handled by other specific message tags --%> - -
-
- - - - - - \ No newline at end of file diff --git a/source/web/jsp/dialog/edit-space-simple-workflow.jsp b/source/web/jsp/dialog/edit-space-simple-workflow.jsp index 9200d2a3e2..dd5953e7a0 100644 --- a/source/web/jsp/dialog/edit-space-simple-workflow.jsp +++ b/source/web/jsp/dialog/edit-space-simple-workflow.jsp @@ -22,39 +22,38 @@ * the FLOSS exception, and it is also available here: * http://www.alfresco.com/legal/licensing" --%> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> -<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a"%> +<%@ taglib uri="/WEB-INF/repo.tld" prefix="r"%> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - +<%@ page buffer="32kb" contentType="text/html;charset=UTF-8"%> +<%@ page isELIgnored="false"%> +<%@ page import="org.alfresco.web.ui.common.PanelGenerator"%> + - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- Error Messages --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - - - - - - - - - - - - -
: - -
- - - - - - - - -
- - - - - : - -
-
- - - - -
- - - - - -
- - - - - - - - - -
- :  - -
- - - - - - - - -
- - - - - : - -
-
-
-
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
- <%-- messages tag to show messages not handled by other specific message tags --%> - -
-
- - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
:
+ + + + + + + + +
+ + + :
+
+ + +
+ + + + + +
+ + + + + + + + + + + + +
: 
+ + + + + + + + +
+ + + :
+
+
+
+ \ No newline at end of file diff --git a/source/web/jsp/dialog/edit-text-inline.jsp b/source/web/jsp/dialog/edit-text-inline.jsp index c9879f9dae..9d3d98a438 100644 --- a/source/web/jsp/dialog/edit-text-inline.jsp +++ b/source/web/jsp/dialog/edit-text-inline.jsp @@ -28,157 +28,44 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - + + + + + - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> -
+ <%-- Hide the checkout info if this document is already checked out --%> + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %> + + + + + + +
+ + + + + + + +
+ +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %> + +
- - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- Error Messages --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
''
-
-
- -
- - - - - - - - <%-- Inline editor --%> - - - -
- <%-- Hide the checkout info if this document is already checked out --%> - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %> - - - - - - -
- - - - - -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %> - - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> -
-
- <%-- messages tag to show messages not handled by other specific message tags --%> - -
-
- - - - - - \ No newline at end of file + <%-- Inline editor --%> + + + <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> + + <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> + + + + diff --git a/source/web/jsp/dialog/export.jsp b/source/web/jsp/dialog/export.jsp index e656e12f7b..ce5b436f9a 100644 --- a/source/web/jsp/dialog/export.jsp +++ b/source/web/jsp/dialog/export.jsp @@ -28,220 +28,100 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - + - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
''
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - - <%-- - - - - - --%> - - - - - - - - - - - - - - - - - -
: - -
: - -
- - - - -
: - - - -
  - -   - -
  - -   - -
  - -   - -
  -
-   - -
-
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
-
- - - - - - \ No newline at end of file + + + + + + + + + + + + + + + +<%-- + + + + +--%> + + + + + + + + + + + + + + + + + +
: + +
: + +
+ + + + +
: + + + +
  + +  + +
  + +  + +
  + +  + +
  +
+   + +
+
\ No newline at end of file diff --git a/source/web/jsp/dialog/filelink-details.jsp b/source/web/jsp/dialog/filelink-details.jsp index 8c2283f9f3..b758db2580 100644 --- a/source/web/jsp/dialog/filelink-details.jsp +++ b/source/web/jsp/dialog/filelink-details.jsp @@ -145,7 +145,7 @@ - + @@ -158,7 +158,7 @@ + action="dialog:editLinkProperties" actionListener="#{LinkPropertiesDialog.setupFileLinkForAction}" /> diff --git a/source/web/jsp/dialog/rules.jsp b/source/web/jsp/dialog/rules.jsp index 057e9a961c..b9590ac612 100644 --- a/source/web/jsp/dialog/rules.jsp +++ b/source/web/jsp/dialog/rules.jsp @@ -87,14 +87,14 @@ <%-- More actions menu --%> - + <%-- Filters --%> @@ -118,7 +118,7 @@ - + @@ -155,11 +155,11 @@ <%-- Rules List --%> - + binding="#{RulesDialog.richList}"> <%-- Primary column for details view mode --%> @@ -170,7 +170,7 @@ @@ -181,7 +181,7 @@ - @@ -247,12 +247,12 @@ + actionListener="#{RulesDialog.setupRuleAction}" action="dialog:deleteRule"> + actionListener="#{RulesDialog.setupRuleAction}" action="wizard:editRule"> @@ -307,4 +307,4 @@ - \ No newline at end of file + diff --git a/source/web/jsp/dialog/save-search.jsp b/source/web/jsp/dialog/save-search.jsp index 817aea5545..08e7de4ffe 100644 --- a/source/web/jsp/dialog/save-search.jsp +++ b/source/web/jsp/dialog/save-search.jsp @@ -1,198 +1,85 @@ <%-- - * Copyright (C) 2005-2007 Alfresco Software Limited. - - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. +* Copyright (C) 2005-2007 Alfresco Software Limited. - * This program 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 General Public License for more details. +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +* This program 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 General Public License for more details. - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +* As a special exception to the terms and conditions of version 2.0 of +* the GPL, you may redistribute this Program in connection with Free/Libre +* and Open Source Software ("FLOSS") applications as described in Alfresco's +* FLOSS exception. You should have recieved a copy of the text describing +* the FLOSS exception, and it is also available here: +* http://www.alfresco.com/legal/licensing" --%> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> -<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - + + + + + + + + + + + + + + + + +
+
:  * +
: +
+ + +
+ - - - <%-- load a bundle of properties with I18N strings --%> - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
-
- -
- - - - - - -
- - - - <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - - - - - - - - - - - - - -
: -  * -
: - -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
-
- - - - - \ No newline at end of file diff --git a/source/web/jsp/dialog/space-details.jsp b/source/web/jsp/dialog/space-details.jsp index fa6b1c20f9..bb27606287 100644 --- a/source/web/jsp/dialog/space-details.jsp +++ b/source/web/jsp/dialog/space-details.jsp @@ -134,7 +134,7 @@ - + @@ -146,7 +146,7 @@ - +
@@ -236,7 +236,7 @@ @@ -253,7 +253,7 @@ + action="dialog:editSpaceCategories" actionListener="#{SpaceDetailsBean.setupCategoriesForEdit}" /> @@ -288,7 +288,7 @@ - @@ -430,4 +430,4 @@ - \ No newline at end of file + diff --git a/source/web/jsp/dialog/spacelink-details.jsp b/source/web/jsp/dialog/spacelink-details.jsp index dfd9aa09c2..56d8e0246b 100644 --- a/source/web/jsp/dialog/spacelink-details.jsp +++ b/source/web/jsp/dialog/spacelink-details.jsp @@ -133,7 +133,7 @@ - + @@ -147,7 +147,7 @@ +action="dialog:editLinkProperties" actionListener="#{LinkPropertiesDialog.setupFolderLinkForAction}" /> diff --git a/source/web/jsp/dialog/system-info.jsp b/source/web/jsp/dialog/system-info.jsp index ca5ea95cf0..5eb9a067e5 100644 --- a/source/web/jsp/dialog/system-info.jsp +++ b/source/web/jsp/dialog/system-info.jsp @@ -28,173 +28,65 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> -<%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - - <%-- load a bundle of properties with I18N strings --%> - - - - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- Error Messages --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
-
:
-
:
-
- -
- - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "white", "white"); %> - - - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "white"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
- <%-- messages tag to show messages not handled by other specific message tags --%> - -
-
- - - - - - \ No newline at end of file + + + + + +
+ + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ \ No newline at end of file diff --git a/source/web/jsp/dialog/undocheckout-file.jsp b/source/web/jsp/dialog/undocheckout-file.jsp index d8953f2573..1dea0b1207 100644 --- a/source/web/jsp/dialog/undocheckout-file.jsp +++ b/source/web/jsp/dialog/undocheckout-file.jsp @@ -28,138 +28,21 @@ <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> - - - - - <%-- load a bundle of properties with I18N strings --%> - - - <%-- set the form name here --%> - - - <%-- Main outer table --%> - - - <%-- Title bar --%> - - - - - <%-- Main area --%> - - <%-- Shelf --%> - - - <%-- Work Area --%> - - -
- <%@ include file="../parts/titlebar.jsp" %> -
- <%@ include file="../parts/shelf.jsp" %> - - - <%-- Breadcrumb --%> - <%@ include file="../parts/breadcrumb.jsp" %> - - <%-- Status and Actions --%> - - - - - - - <%-- separator row with gradient shadow --%> - - - - - - - <%-- Details --%> - - - - - - - <%-- Error Messages --%> - - - - - - - <%-- separator row with bottom panel graphics --%> - - - - - - -
- - <%-- Status and Actions inner contents table --%> - <%-- Generally this consists of an icon, textual summary and actions for the current object --%> - - - - - -
- -
''
-
-
- -
- - - - - - - -
- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %> - - - - - -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %> - 		- <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "greyround", "#F5F5F5"); %> - - - - - - - - -
- -
- -
- <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "greyround"); %> -
-
- <%-- messages tag to show messages not handled by other specific message tags --%> - -
-
- - - - - - \ No newline at end of file + + + + + +
+ <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc"); %> + + + + + +
+ <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "yellowInner"); %> +
+ \ No newline at end of file diff --git a/source/web/jsp/dialog/update-file.jsp b/source/web/jsp/dialog/update-file.jsp index d6385d7b78..f7489a0238 100644 --- a/source/web/jsp/dialog/update-file.jsp +++ b/source/web/jsp/dialog/update-file.jsp @@ -32,7 +32,7 @@ <%@ page isELIgnored="false" %> <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %> <%@ page import="org.alfresco.web.app.servlet.FacesHelper" %> -<%@ page import="org.alfresco.web.bean.CheckinCheckoutBean" %> +<%@ page import="org.alfresco.web.bean.CheckinCheckoutDialog" %> <%@ page import="org.alfresco.web.app.Application" %> <%@ page import="javax.faces.context.FacesContext" %> @@ -82,7 +82,7 @@