You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2017/08/18 14:09:15 UTC
[1/2] syncope git commit: SYNCOPE-1197 SAML label inserted and combo
moved below login button
Repository: syncope
Updated Branches:
refs/heads/2_0_X 223f14397 -> d16c96623
refs/heads/master 4f7cb969c -> 5c10b4ba5
SYNCOPE-1197 SAML label inserted and combo moved below login button
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d16c9662
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d16c9662
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d16c9662
Branch: refs/heads/2_0_X
Commit: d16c96623fca64a86e50f723cb3f2c8f6a2bdeba
Parents: 223f143
Author: lorenzo <lo...@tirasa.net>
Authored: Fri Aug 18 15:07:41 2017 +0200
Committer: lorenzo <lo...@tirasa.net>
Committed: Fri Aug 18 15:20:19 2017 +0200
----------------------------------------------------------------------
.../resources/META-INF/resources/app/views/self.html | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d16c9662/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/self.html b/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
index 71c2d01..f895c1b 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
@@ -47,19 +47,19 @@ under the License.
id="language" style="width: 100%; text-align: left;" class="btn dropdown-toggle btn-default"
ng-options="language.name for language in languages.availableLanguages track by language.id"
ng-model="languages.selectedLanguage"></select>
- </div>
+ </div>
<div class="form-group">
+ <button type="submit" id="login-btn" class="btn btn-default btn-signin login-btn"
+ ng-click="login(credentials)">Login</button>
+ </div>
+ <div class="form-group">
+ <span>SAML 2.0</span>
<select id="saml2sp" style="width: 100%; text-align: left;" class="btn dropdown-toggle btn-default"
ng-if="$root.saml2spExtAvailable()"
ng-options="idp.name for idp in saml2idps.available track by idp.entityID"
ng-model="saml2idps.selected" ng-change="saml2login()">
- <option value="" disabled="disabled" selected="selected" hidden="hidden">SAML 2.0</option>
</select>
</div>
- <div class="form-group">
- <button type="submit" id="login-btn" class="btn btn-default btn-signin login-btn"
- ng-click="login(credentials)">Login</button>
- </div>
</fieldset>
</form>
</div>
[2/2] syncope git commit: SYNCOPE-1197 SAML label inserted and combo
moved below login button - This closes #59
Posted by il...@apache.org.
SYNCOPE-1197 SAML label inserted and combo moved below login button - This closes #59
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5c10b4ba
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5c10b4ba
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5c10b4ba
Branch: refs/heads/master
Commit: 5c10b4ba535918a809aa70d4c2c0897c59a2c3b0
Parents: 4f7cb96
Author: lorenzo <lo...@tirasa.net>
Authored: Fri Aug 18 15:07:41 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Aug 18 16:08:59 2017 +0200
----------------------------------------------------------------------
.../resources/META-INF/resources/app/views/self.html | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/5c10b4ba/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/self.html b/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
index 71c2d01..f895c1b 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
@@ -47,19 +47,19 @@ under the License.
id="language" style="width: 100%; text-align: left;" class="btn dropdown-toggle btn-default"
ng-options="language.name for language in languages.availableLanguages track by language.id"
ng-model="languages.selectedLanguage"></select>
- </div>
+ </div>
<div class="form-group">
+ <button type="submit" id="login-btn" class="btn btn-default btn-signin login-btn"
+ ng-click="login(credentials)">Login</button>
+ </div>
+ <div class="form-group">
+ <span>SAML 2.0</span>
<select id="saml2sp" style="width: 100%; text-align: left;" class="btn dropdown-toggle btn-default"
ng-if="$root.saml2spExtAvailable()"
ng-options="idp.name for idp in saml2idps.available track by idp.entityID"
ng-model="saml2idps.selected" ng-change="saml2login()">
- <option value="" disabled="disabled" selected="selected" hidden="hidden">SAML 2.0</option>
</select>
</div>
- <div class="form-group">
- <button type="submit" id="login-btn" class="btn btn-default btn-signin login-btn"
- ng-click="login(credentials)">Login</button>
- </div>
</fieldset>
</form>
</div>