Merge branch 'master' into bootstrap3

Conflicts: shared/oae/css/oae.skin.less ui/bundles/hi_IN.properties
oaeproject · Feb 17, 2014 · 894997f · 894997f
2 parents 064257a + 7c91414
commit 894997f
Show file tree

Hide file tree

Showing 110 changed files with 1,441 additions and 40 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,7 @@ before_install:
 
   # Hilary dependencies
   - sudo apt-get install -qq graphicsmagick
-  - sudo apt-get install -y -o Dpkg::Options::=--force-confnew cassandra=1.2.13 dsc12
+  - sudo apt-get install -y -o Dpkg::Options::=--force-confnew cassandra=1.2.15 dsc12
   - sudo sed -i 's/-Xss180k/-Xss256k/g' /etc/cassandra/cassandra-env.sh
   - sudo sh -c "echo 'JVM_OPTS=\"\${JVM_OPTS} -Djava.net.preferIPv4Stack=false\"' >> /etc/cassandra/cassandra-env.sh"
   - sudo service cassandra stop
@@ -64,14 +64,16 @@ before_install:
   - cd ../Hilary
   - npm install --production
   - node app.js &
-  - sleep 20
+
+  # Wait for Hilary to have started up
+  - cd ../3akai-ux
+  - ./tools/travis/checkHilaryStart.sh
+
+  # Create a test tenant
   - ADMIN_COOKIE=$(curl -s --cookie-jar - -d"username=administrator" -d"password=administrator"  -e "/" http://admin.oae.com/api/auth/login | grep connect.sess | cut -f 7)
   - curl --cookie connect.sess=${ADMIN_COOKIE} -e "/" -d"alias=cam" -d"displayName=Cambridge" -d"host=cam.oae.com" http://admin.oae.com/api/tenant/create
   - curl --cookie connect.sess=${ADMIN_COOKIE} -e "/" -d"oae-principals/recaptcha/enabled=false" http://admin.oae.com/api/config
 
-  # Position ourselves to start the tests
-  - cd ../3akai-ux
-
 services:
   - elasticsearch
   - rabbitmq

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -121,7 +121,9 @@ module.exports = function(grunt) {
                         ],
 
                         // Rename and hash these files
+                        // TODO: Remove /optimized/custom when we have configurable landing pages
                         'files': _hashFiles([
+                            '<%= target %>/optimized/custom',
                             '<%= target %>/optimized/shared',
                             '<%= target %>/optimized/ui',
                             '<%= target %>/optimized/admin',
@@ -133,7 +135,9 @@ module.exports = function(grunt) {
                         ]),
 
                         // Look for and replace references to the above (non-excluded) files and folders in these files
+                        // // TODO: Remove /optimized/custom when we have configurable landing pages
                         'references': [
+                            '<%= target %>/optimized/custom/**/*.html',
                             '<%= target %>/optimized/shared/**/*.html',
                             '<%= target %>/optimized/shared/**/*.js',
                             '<%= target %>/optimized/shared/**/*.css',

diff --git a/custom/researchprofessional.oaeproject.org/css/index.css b/custom/researchprofessional.oaeproject.org/css/index.css
@@ -0,0 +1,130 @@
+/*!
+ * Copyright 2014 Apereo Foundation (AF) Licensed under the
+ * Educational Community License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may
+ * obtain a copy of the License at
+ *
+ *     http://opensource.org/licenses/ECL-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS"
+ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/* Top navigation overrides */
+
+#topnavigation-container .row-fluid {
+    margin: 0 auto;
+    max-width: 1280px;
+}
+
+#topnavigation-container #topnavigation-search-form {
+    display: none;
+}
+
+
+/* Default style overrides */
+
+.oae-main-content {
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+            box-shadow: none;
+    padding: 0 !important;
+}
+
+#index-container.oae-main-content.oae-branding-container {
+    background-color: transparent;
+    background-image: none;
+}
+
+.oae-main-content #index-content {
+    margin: 0 auto;
+    max-width: 1280px;
+    padding: 0;
+}
+
+.oae-main-content #index-content .index-search-container {
+    margin: -20px auto 10px;
+}
+
+.oae-main-content #index-content .index-search-container input#index-search-query {
+    background-color: #FEFEFE;
+    -webkit-box-shadow: 0 0 3px #999;
+       -moz-box-shadow: 0 0 3px #999;
+            box-shadow: 0 0 3px #999;
+}
+
+.oae-main-content #index-content #index-slogan {
+    width: 350px;
+}
+
+.oae-main-content #index-content .index-bottom .index-bottom-slogan {
+    color: #FFF;
+    line-height: 1.4;
+    margin-bottom: 12px;
+}
+
+.oae-panel-primary {
+    background-color: #006B91;
+    height: 250px !important;
+    width: 66.66% !important;
+}
+
+.oae-panel-primary + .oae-panel-secondary {
+    height: 250px;
+}
+
+.oae-panel-primary,
+.oae-panel-secondary {
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+    height: 220px;
+    margin: 0 !important;
+    padding: 40px;
+}
+
+.oae-panel-secondary {
+    background-color: #1D386E;
+    width: 33.33% !important;
+}
+
+.oae-panel-tertiary {
+    background-color: transparent;
+}
+
+#index-container .oae-panel-secondary#index-video {
+    background-color: #728653;
+}
+
+.oae-panel-secondary#index-video a {
+    margin-top: 20px;
+}
+
+.oae-main-content #index-content .row-fluid:last-child .oae-panel-secondary {
+    background-color: #e9b351;
+}
+
+.oae-main-content #index-content .row-fluid:last-child .oae-panel-secondary .index-bottom-slogan {
+    color: #FFF;
+}
+
+.oae-main-content #index-content .row-fluid:last-child .oae-panel-secondary a {
+    word-wrap: break-word;
+}
+
+.oae-main-content #index-content .row-fluid:last-child .oae-panel-secondary:first-child {
+    background-color: #76394E;
+}
+
+/* Custom page CSS */
+
+#index-branding-container.oae-main-content.oae-branding-container {
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+    height: 420px;
+    max-width: 1280px;
+}
diff --git a/custom/researchprofessional.oaeproject.org/index.html b/custom/researchprofessional.oaeproject.org/index.html
@@ -0,0 +1,68 @@
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+        <noscript>
+            <meta http-equiv="Refresh" content="1; URL=/noscript">
+        </noscript>
+
+        <!-- CORE CSS -->
+        <link rel="stylesheet" type="text/css" href="/shared/oae/css/oae.core.css" />
+        <link rel="stylesheet" type="text/css" href="/api/ui/skin" />
+
+        <!-- PAGE CSS -->
+        <link rel="stylesheet" type="text/css" href="/ui/css/oae.index.css" />
+        <link rel="stylesheet" type="text/css" href="/custom/researchprofessional.oaeproject.org/css/index.css" />
+    </head>
+    <body>
+         <!-- HEADER -->
+        <div data-widget="topnavigation"><!-- --></div>
+
+        <!-- BODY -->
+        <div id="index-container" class="oae-branding-container oae-main-content">
+            <div id="index-content">
+                <div class="row-fluid">
+                    <div class="span12 oae-panel-tertiary index-search-container">
+                        <form id="index-search-form" aria-label="__MSG__SEARCH_FOR_CONTENT_PEOPLE_GROUPS__" role="search" class="form-inline">
+                            <label for="index-search-query" class="oae-aural-text">__MSG__SEARCH__</label>
+                            <input type="text" id="index-search-query" class="input-xxlarge pull-left span9" title="__MSG__SEARCH_FOR_CONTENT_PEOPLE_GROUPS__">
+                            <button type="submit" class="btn btn-primary btn-large" title="__MSG__SEARCH__">__MSG__SEARCH__</button>
+                        </form>
+                    </div>
+                </div>
+
+                <div class="row-fluid">
+                    <div id="index-branding-container" class="span12 oae-branding-container oae-main-content"></div>
+                    <div class="span8 oae-panel-primary">
+                        <h1 id="index-slogan">Research Professional User Group</h1>
+                    </div>
+                    <div class="span4 oae-panel-secondary index-bottom">
+                        <h2 class="index-bottom-slogan">Join the worldwide community of expert users of Research Professional</h2>
+                    </div>
+                </div>
+                <div class="row-fluid">
+                    <div class="span4 oae-panel-secondary index-bottom">
+                        <h2 class="index-bottom-slogan">Register for the User Group</h2>
+                        <p class="index-bottom-description">For an account email <a href="mailto:ClientServices@ResearchResearch.com?subject=Research Professional Account" title="Mail to ClientServices@ResearchResearch.com">ClientServices@ResearchResearch.com</a></p>
+                    </div>
+                    <div class="span4 oae-panel-secondary index-bottom">
+                        <h2 class="index-bottom-slogan">Research Professional</h2>
+                        <p class="index-bottom-description">Discuss how to get the best out of <a href="http://www.researchprofessional.com" title="Visit ResearchProfessional.com" target="_blank">ResearchProfessional.com</a></p>
+                    </div>
+                    <div id="index-video" class="span4 oae-panel-secondary index-bottom">
+                        <h2 class="index-bottom-slogan">Open Academic Environment</h2>
+                        <p class="index-bottom-description">Shape the future of academia by guiding the development of the OAE</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <!-- FOOTER -->
+        <div data-widget="footer"><!-- --></div>
+
+        <!-- JAVASCRIPT -->
+        <script data-main="/shared/oae/api/oae.bootstrap.js" data-loadmodule="/ui/js/index.js" src="/shared/vendor/js/requirejs/require-jquery.js"></script>
+
+    </body>
+</html>
diff --git a/custom/thefold.oaeproject.org/css/index.css b/custom/thefold.oaeproject.org/css/index.css
@@ -0,0 +1,121 @@
+/*!
+ * Copyright 2014 Apereo Foundation (AF) Licensed under the
+ * Educational Community License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may
+ * obtain a copy of the License at
+ *
+ *     http://opensource.org/licenses/ECL-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS"
+ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/* Top navigation overrides */
+
+#topnavigation-container .row-fluid {
+    margin: 0 auto;
+    max-width: 1280px;
+}
+
+#topnavigation-container #topnavigation-search-form {
+    display: none;
+}
+
+
+/* Default style overrides */
+
+.oae-main-content {
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+            box-shadow: none;
+    padding: 0 !important;
+}
+
+#index-container.oae-main-content.oae-branding-container {
+    background-color: transparent;
+    background-image: none;
+}
+
+.oae-main-content #index-content {
+    margin: 0 auto;
+    max-width: 1280px;
+    padding: 0;
+}
+
+.oae-main-content #index-content .index-search-container {
+    margin: -20px auto 10px;
+}
+
+.oae-main-content #index-content .index-search-container input#index-search-query {
+    background-color: #FEFEFE;
+    -webkit-box-shadow: 0 0 3px #999;
+       -moz-box-shadow: 0 0 3px #999;
+            box-shadow: 0 0 3px #999;
+}
+
+.oae-main-content #index-content #index-slogan {
+    width: 350px;
+}
+
+.oae-main-content #index-content .index-bottom .index-bottom-slogan {
+    color: #000;
+    line-height: 1.4;
+    margin-bottom: 12px;
+}
+
+.oae-panel-primary {
+    background-color: #234A74;
+    width: 66.66% !important;
+}
+
+.oae-panel-primary,
+.oae-panel-secondary {
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+    height: 290px;
+    margin: 0 !important;
+    padding: 40px;
+}
+
+.oae-panel-secondary {
+    background-color: #69c2b8;
+    width: 33.33% !important;
+}
+
+.oae-panel-tertiary {
+    background-color: transparent;
+}
+
+#index-container .oae-panel-secondary#index-video {
+    background-color: #C12127;
+}
+
+.oae-panel-secondary#index-video a {
+    margin-top: 20px;
+}
+
+.oae-main-content #index-content .row-fluid:last-child .oae-panel-secondary {
+    background-color: #1A3762;
+}
+
+.oae-main-content #index-content .row-fluid:last-child .oae-panel-secondary .index-bottom-slogan {
+    color: #FFF;
+}
+
+.oae-main-content #index-content .row-fluid:last-child .oae-panel-secondary:first-child {
+    background-color: #CAC8B5;
+}
+
+/* Custom page CSS */
+
+#index-branding-container.oae-main-content.oae-branding-container {
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+    height: 420px;
+    max-width: 1280px;
+}