Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

80926: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80888: ACE-2091 EOL Explorer.
       - Basic /alfresco index page added with links to documentation, Share, Admin Console, WebScripts, CMIS etc.
       - Rearranged some core CSS files from Admin Console so they are reusable in standard webapp


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83134 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-04 05:55:27 +00:00
parent 6722639949
commit 53e3bbdce1
9 changed files with 195 additions and 89 deletions

135
source/web/css/alfresco.css Normal file
View File

@@ -0,0 +1,135 @@
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: url(opensans.woff) format('woff');
}
@font-face {
font-family: 'Open Sans Bold';
font-style: normal;
font-weight: 600;
src: url(opensansbold.woff) format('woff');
}
@font-face {
font-family: 'Open Sans Condensed';
font-style: normal;
font-weight: 300;
src: url(opensanscondensed.woff) format('woff');
}
/* Root styles, footer and links */
body, html
{
height: 100%;
font: 13px/1.231 Open Sans, Arial, sans-serif;
}
.sticky-wrapper
{
min-height: 100%;
height: auto !important;
height: 100%;
margin: 0 auto -32px; /* the bottom margin is the negative value of the footer's height */
}
.footer, .push
{
height: 32px; /* .push must be the same height as .footer and inverse of .sticky-wrapper height */
}
.footer
{
clear: both;
text-align: center;
line-height: 32px; /* centers text within .footer height */
}
a,
a:visited,
a:hover
{
color: #333;
}
a,
a:visited
{
text-decoration: none;
}
a:hover
{
text-decoration: underline;
}
h1
{
font-size: 220%;
font-family: Open Sans Condensed, Arial, sans-serif;
color: #333;
}
h2
{
font-size: 108%;
font-family: Open Sans Bold, Arial, sans-serif;
padding-top: 1em;
border-bottom: 1px solid #ccc;
padding-bottom: 0.166em;
}
h3
{
font-size: 125%;
font-family: Open Sans, Arial, sans-serif;
border-bottom: 1px solid #ccc;
padding: 4px 0;
}
.title
{
margin: 1em 0 0;
}
.title .logo
{
position: relative;
top: 8px;
}
.title .logo-separator
{
display: inline-block;
border-right: 1px solid #ccc;
position: relative;
top: -22px;
height: 40px;
margin-bottom: -12px;
}
.title > h1
{
display: inline;
position: relative;
left: 7px;
top: -5px;
}
.index
{
margin-left: 18em;
padding-top: 1em;
}
.index-list
{
padding-top: 4em;
border-top: 1px solid #eee;
}
p
{
line-height: 1.333em;
padding-bottom: 0.333em;
}

View File

@@ -1,80 +0,0 @@
body
{
margin: 4px;
font-family: Trebuchet MS, Arial, sans-serif;
font-size: 12px;
color: #515D6B;
}
div
{
font-family: Trebuchet MS, Arial, sans-serif;
font-size: 12px;
color: #515D6B;
}
div.title
{
font-weight: bold;
font-size: 13px;
}
div.titlebar
{
font-weight: bold;
padding: 2px 0px 2px 8px;
background-color: #DCE4EB;
border-bottom: 1px solid #CCD4DB;
}
div.indent
{
padding-left: 3px;
}
span
{
font-size: 11px;
}
span.title
{
font-weight: bold;
font-size: 13px;
color: #666677;
}
span.indent
{
padding-left: 3px;
}
a:link, a:visited
{
font-family: Trebuchet MS, Arial, sans-serif;
text-decoration: none;
color: #168ECE;
}
a:hover
{
color: #168ECE;
text-decoration: underline;
}
form
{
padding: 0px;
margin: 0px;
}
input
{
font-family: Trebuchet MS, Arial, sans-serif;
font-size: 12px;
margin: 2px;
padding: 1px 2px 1px 2px;
color: #515D6B;
background-color: #F8FCFD;
border: 1px solid #CCD4DB;
}

View File

@@ -1,8 +0,0 @@
/* IE6 Fixes */
/*
*** .png fix
*/
img {
behavior: url(/alfresco/scripts/iepngfix.htc)
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

15
source/web/css/reset.css Normal file
View File

@@ -0,0 +1,15 @@
/*
Copyright (c) 2007, Yahoo! Inc. All rights reserved.
Code licensed under the BSD License:
http://developer.yahoo.net/yui/license.txt
version: 2.2.0
*/
body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td{margin:0;padding:0;}
table{border-collapse:collapse;border-spacing:0;}
fieldset,img{border:0;}
address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}
ol,ul {list-style:none;}
caption,th {text-align:left;}
h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}
q:before,q:after{content:'';}
abbr,acronym {border:0;}

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

View File

@@ -17,8 +17,13 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
--%>
<!-- Enterprise index-jsp placeholder -->
<%@ page import="org.springframework.web.context.WebApplicationContext" %>
<%@ page import="org.springframework.web.context.support.WebApplicationContextUtils" %>
<%@ page import="org.alfresco.repo.admin.SysAdminParams" %>
<%@ page import="org.alfresco.service.descriptor.DescriptorService" %>
<%@ page import="org.alfresco.util.UrlUtil" %>
<!-- Enterprise index-jsp placeholder -->
<%
// route WebDAV requests
if (request.getMethod().equalsIgnoreCase("PROPFIND") || request.getMethod().equalsIgnoreCase("OPTIONS"))
@@ -27,12 +32,51 @@ if (request.getMethod().equalsIgnoreCase("PROPFIND") || request.getMethod().equa
}
%>
<%
WebApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(session.getServletContext());
SysAdminParams sysAdminParams = (SysAdminParams)context.getBean("sysAdminParams");
DescriptorService descriptorService = (DescriptorService)context.getBean("descriptorComponent");
%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Alfresco</title>
<link rel="stylesheet" type="text/css" href="./css/reset.css" />
<link rel="stylesheet" type="text/css" href="./css/alfresco.css" />
</head>
<body>
<div class="sticky-wrapper">
<div class="index">
<div class="title">
<span class="logo"><img src="./images/logo/logo.png" width="145" height="48" alt="" /></span>
<span class="logo-separator">&nbsp;</span>
<h1>Welcome to Alfresco</h1>
</div>
<div class="index-list">
<p><a href="http://docs.alfresco.com/">Online Documentation</a></p>
<p></p>
<p><a href="<%=UrlUtil.getShareUrl(sysAdminParams)%>">Alfresco Share</a></p>
<p><a href="./webdav">Alfresco WebDav</a></p>
<p></p>
<p><a href="./s/index">Alfresco WebScripts Home</a> (admin only)</p>
<%
if (descriptorService.getLicenseDescriptor().getLicenseMode().toString().equals("ENTERPRISE"))
{
%>
<p><a href="./s/enterprise/admin">Alfresco Administration Console</a> (admin only)</p>
<% } %>
<p></p>
<p><a href="./cmisatom">CMIS AtomPub Binding: AtomPub Service Document</a></p>
<p><a href="./cmisws/cmis?wsdl">CMIS Web Services Binding: WSDL Documents</a></p>
<p><a href="./cmisbrowser">CMIS Browser Binding (CMIS 1.1, experimental): Repository Info (JSON)</a></p>
</div>
</div>
<div class="push"></div>
</div>
<div class="footer">
Alfresco Software, Inc. &copy; 2005-2014 All rights reserved.
</div>