Author: taylor
Date: Fri Feb 27 23:34:39 2015
New Revision: 1662856
URL: http://svn.apache.org/r1662856
Log:
JS2-1316: make J2-Admin Profiler portlet with AngularJS framework default
profiler admin
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/profiler.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/responsive/folder.metadata
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/profiler.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/responsive/folder.metadata
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/folder.metadata?rev=1662856&r1=1662855&r2=1662856&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/folder.metadata
Fri Feb 27 23:34:39 2015
@@ -35,4 +35,5 @@ limitations under the License.
<security-constraints>
<security-constraints-ref>admin</security-constraints-ref>
</security-constraints>
+
</folder>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/profiler.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/profiler.psml?rev=1662856&r1=1662855&r2=1662856&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/profiler.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/portal-admin/profiler.psml
Fri Feb 27 23:34:39 2015
@@ -29,6 +29,12 @@ limitations under the License.
<metadata name="title" xml:lang="ko">íë¡íì¼ ê´ë¦¬</metadata>
<fragment id="pa-site" type="layout"
name="jetspeed-layouts::VelocityOneColumn">
- <fragment id="prof-2" type="portlet" name="j2-admin::WicketProfilerAdmin"
/>
+ <fragment id="prof-2" type="portlet" name="j2-admin::ProfilerAdmin" />
</fragment>
+
+ <defaults
+ layout-decorator="bootstrap"
+ portlet-decorator="bootstrap"
+ />
+
</page>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/responsive/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/responsive/folder.metadata?rev=1662856&r1=1662855&r2=1662856&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/responsive/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/responsive/folder.metadata
Fri Feb 27 23:34:39 2015
@@ -20,9 +20,9 @@ limitations under the License.
<title>Responsive</title>
<defaults
- layout-decorator="jetspeed"
- portlet-decorator="jetspeed"
- />
+ layout-decorator="bootstrap"
+ portlet-decorator="bootstrap"
+ />
<document-order>registration.psml</document-order>
<document-order>my-account2.psml</document-order>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/profiler.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/profiler.psml?rev=1662856&r1=1662855&r2=1662856&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/profiler.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/profiler.psml
Fri Feb 27 23:34:39 2015
@@ -30,7 +30,13 @@ limitations under the License.
<fragment id="pa-site" type="layout"
name="jetspeed-layouts::VelocityOneColumn">
- <fragment id="prof-2" type="portlet" name="j2-admin::WicketProfilerAdmin" >
+ <fragment id="prof-2" type="portlet" name="j2-admin::ProfilerAdmin" >
</fragment>
</fragment>
+
+ <defaults
+ layout-decorator="bootstrap"
+ portlet-decorator="bootstrap"
+ />
+
</page>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/responsive/folder.metadata
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/responsive/folder.metadata?rev=1662856&r1=1662855&r2=1662856&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/responsive/folder.metadata
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/responsive/folder.metadata
Fri Feb 27 23:34:39 2015
@@ -18,11 +18,6 @@ limitations under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.2/schemas/folder-metadata.xsd";>
<title>Responsive</title>
-
- <defaults
- layout-decorator="jetspeed"
- portlet-decorator="jetspeed"
- />
<document-order>registration.psml</document-order>
<document-order>my-account2.psml</document-order>
@@ -35,4 +30,10 @@ limitations under the License.
<security-constraints>
<security-constraints-ref>public-view</security-constraints-ref>
</security-constraints>
+
+ <defaults
+ layout-decorator="bootstrap"
+ portlet-decorator="bootstrap"
+ />
+
</folder>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
