safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-332: Correct appearance of CAS redirect notification.

Browse Source
This commit is contained in:
Michael Jumper
2017-06-26 09:50:24 -07:00
parent 04c70c7e49
commit 5781a8dba5
9 changed files with 151 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/guacamole-auth-cas/src/main/resources/casConfig.js → extensions/guacamole-auth-cas/src/main/resources/config/casConfig.js
View File

@@ -25,7 +25,7 @@ angular.module('guacCAS').config(['formServiceProvider',
// Define field for ticket from CAS service
formServiceProvider.registerFieldType("GUAC_CAS_TICKET", {
templateUrl : '',
templateUrl : 'app/ext/guac-cas/templates/casTicketField.html',
controller : 'guacCASController',
module : 'guacCAS'
});

0
extensions/guacamole-auth-cas/src/main/resources/casController.js → extensions/guacamole-auth-cas/src/main/resources/controllers/casController.js
View File

14
extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
View File

@@ -14,9 +14,15 @@
],
"js" : [
"casModule.js",
"casController.js",
"casConfig.js"
]
"cas.min.js"
],
"css" : [
"cas.min.css"
],
"resources" : {
"templates/casTicketField.html" : "text/html"
}
}

18
extensions/guacamole-auth-cas/src/main/resources/license.txt Normal file
View File

@@ -0,0 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache 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://www.apache.org/licenses/LICENSE-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.
*/

35
extensions/guacamole-auth-cas/src/main/resources/styles/cas.css Normal file
View File

@@ -0,0 +1,35 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache 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://www.apache.org/licenses/LICENSE-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.
*/
.cas-ticket-field-container {
height: 100%;
width: 100%;
position: fixed;
left: 0;
top: 0;
display: table;
background: white;
}
.cas-ticket-field {
width: 100%;
display: table-cell;
vertical-align: middle;
text-align: center;
}

5
extensions/guacamole-auth-cas/src/main/resources/templates/casTicketField.html Normal file
View File

@@ -0,0 +1,5 @@
<div class="cas-ticket-field-container">
<div class="cas-ticket-field">
<p>{{ 'LOGIN.INFO_CAS_REDIRECT_PENDING' | translate }}</p>
</div>
</div>

2
extensions/guacamole-auth-cas/src/main/resources/translations/en.json
View File

@@ -6,7 +6,7 @@
"LOGIN" : {
"FIELD_HEADER_TICKET" : "",
"INFO_CAS_REDIRECT_PENDING" : "Please wait, redirecting to CAS authentication."
"INFO_CAS_REDIRECT_PENDING" : "Please wait, redirecting to CAS authentication..."
}
}