Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
coopwire-hypothesis
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
孙灵跃 Leon Sun
coopwire-hypothesis
Commits
c30735ac
Commit
c30735ac
authored
Jul 05, 2016
by
Nick Stenning
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename signin-control directive to login-control
parent
60f2a3bb
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
15 deletions
+15
-15
app.js
h/static/scripts/app.js
+1
-1
login-control.js
h/static/scripts/directive/login-control.js
+1
-1
app.scss
h/static/styles/app.scss
+1
-1
login-control.scss
h/static/styles/login-control.scss
+3
-3
login_control.html
h/templates/client/login_control.html
+4
-4
top_bar.html
h/templates/client/top_bar.html
+5
-5
No files found.
h/static/scripts/app.js
View file @
c30735ac
...
@@ -137,13 +137,13 @@ module.exports = angular.module('h', [
...
@@ -137,13 +137,13 @@ module.exports = angular.module('h', [
.
directive
(
'hAutofocus'
,
require
(
'./directive/h-autofocus'
))
.
directive
(
'hAutofocus'
,
require
(
'./directive/h-autofocus'
))
.
directive
(
'hTooltip'
,
require
(
'./directive/h-tooltip'
))
.
directive
(
'hTooltip'
,
require
(
'./directive/h-tooltip'
))
.
directive
(
'loggedoutMessage'
,
require
(
'./directive/loggedout-message'
))
.
directive
(
'loggedoutMessage'
,
require
(
'./directive/loggedout-message'
))
.
directive
(
'loginControl'
,
require
(
'./directive/login-control'
))
.
directive
(
'loginForm'
,
require
(
'./directive/login-form'
).
directive
)
.
directive
(
'loginForm'
,
require
(
'./directive/login-form'
).
directive
)
.
directive
(
'markdown'
,
require
(
'./directive/markdown'
))
.
directive
(
'markdown'
,
require
(
'./directive/markdown'
))
.
directive
(
'publishAnnotationBtn'
,
require
(
'./directive/publish-annotation-btn'
))
.
directive
(
'publishAnnotationBtn'
,
require
(
'./directive/publish-annotation-btn'
))
.
directive
(
'searchStatusBar'
,
require
(
'./directive/search-status-bar'
))
.
directive
(
'searchStatusBar'
,
require
(
'./directive/search-status-bar'
))
.
directive
(
'shareDialog'
,
require
(
'./directive/share-dialog'
))
.
directive
(
'shareDialog'
,
require
(
'./directive/share-dialog'
))
.
directive
(
'sidebarTutorial'
,
require
(
'./directive/sidebar-tutorial'
).
directive
)
.
directive
(
'sidebarTutorial'
,
require
(
'./directive/sidebar-tutorial'
).
directive
)
.
directive
(
'signinControl'
,
require
(
'./directive/signin-control'
))
.
directive
(
'searchInput'
,
require
(
'./directive/search-input'
))
.
directive
(
'searchInput'
,
require
(
'./directive/search-input'
))
.
directive
(
'selectionTabs'
,
require
(
'./directive/selection-tabs'
))
.
directive
(
'selectionTabs'
,
require
(
'./directive/selection-tabs'
))
.
directive
(
'sortDropdown'
,
require
(
'./directive/sort-dropdown'
))
.
directive
(
'sortDropdown'
,
require
(
'./directive/sort-dropdown'
))
...
...
h/static/scripts/directive/
sign
in-control.js
→
h/static/scripts/directive/
log
in-control.js
View file @
c30735ac
...
@@ -33,6 +33,6 @@ module.exports = function () {
...
@@ -33,6 +33,6 @@ module.exports = function () {
*/
*/
newStyle
:
'<'
,
newStyle
:
'<'
,
},
},
template
:
require
(
'../../../templates/client/
sign
in_control.html'
),
template
:
require
(
'../../../templates/client/
log
in_control.html'
),
};
};
};
};
h/static/styles/app.scss
View file @
c30735ac
...
@@ -17,6 +17,7 @@ $base-line-height: 20px;
...
@@ -17,6 +17,7 @@ $base-line-height: 20px;
@import
'./group-list'
;
@import
'./group-list'
;
@import
'./help-panel'
;
@import
'./help-panel'
;
@import
'./loggedout-message'
;
@import
'./loggedout-message'
;
@import
'./login-control'
;
@import
'./markdown'
;
@import
'./markdown'
;
@import
'./primary-action-btn'
;
@import
'./primary-action-btn'
;
@import
'./publish-annotation-btn'
;
@import
'./publish-annotation-btn'
;
...
@@ -24,7 +25,6 @@ $base-line-height: 20px;
...
@@ -24,7 +25,6 @@ $base-line-height: 20px;
@import
'./selection-tabs'
;
@import
'./selection-tabs'
;
@import
'./share-link'
;
@import
'./share-link'
;
@import
'./sidebar-tutorial'
;
@import
'./sidebar-tutorial'
;
@import
'./signin-control'
;
@import
'./simple-search'
;
@import
'./simple-search'
;
@import
'./spinner'
;
@import
'./spinner'
;
@import
'./tags-input'
;
@import
'./tags-input'
;
...
...
h/static/styles/
sign
in-control.scss
→
h/static/styles/
log
in-control.scss
View file @
c30735ac
.
sign
in-control
{
.
log
in-control
{
flex-shrink
:
0
;
flex-shrink
:
0
;
}
}
.
sign
in-text
{
.
log
in-text
{
font-size
:
$body2-font-size
;
font-size
:
$body2-font-size
;
padding-left
:
6px
;
padding-left
:
6px
;
}
}
/* The user account dropdown menu */
/* The user account dropdown menu */
.
sign
in-control-menu
{
.
log
in-control-menu
{
.avatar
{
.avatar
{
border-radius
:
2px
;
border-radius
:
2px
;
}
}
...
...
h/templates/client/
sign
in_control.html
→
h/templates/client/
log
in_control.html
View file @
c30735ac
<!-- New controls -->
<!-- New controls -->
<span
class=
"
sign
in-text"
<span
class=
"
log
in-text"
ng-if=
"vm.newStyle && vm.auth.status === 'unknown'"
>
⋯
</span>
ng-if=
"vm.newStyle && vm.auth.status === 'unknown'"
>
⋯
</span>
<span
class=
"
sign
in-text"
<span
class=
"
log
in-text"
ng-if=
"vm.newStyle && vm.auth.status === 'signed-out'"
>
ng-if=
"vm.newStyle && vm.auth.status === 'signed-out'"
>
<a
href=
"{{vm.serviceUrl}}register"
target=
"_blank"
>
Sign up
</a>
<a
href=
"{{vm.serviceUrl}}register"
target=
"_blank"
>
Sign up
</a>
/
<a
href=
""
ng-click=
"vm.onLogin()"
>
Log in
</a>
/
<a
href=
""
ng-click=
"vm.onLogin()"
>
Log in
</a>
</span>
</span>
<div
ng-if=
"vm.newStyle"
<div
ng-if=
"vm.newStyle"
class=
"pull-right
sign
in-control-menu"
class=
"pull-right
log
in-control-menu"
dropdown
dropdown
keyboard-nav
>
keyboard-nav
>
<a
role=
"button"
<a
role=
"button"
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
<a
href=
""
ng-click=
"vm.onLogin()"
>
Log in
</a>
<a
href=
""
ng-click=
"vm.onLogin()"
>
Log in
</a>
</span>
</span>
<div
ng-if=
"!vm.newStyle"
<div
ng-if=
"!vm.newStyle"
class=
"pull-right
sign
in-control-menu"
class=
"pull-right
log
in-control-menu"
dropdown
dropdown
keyboard-nav
>
keyboard-nav
>
<span
role=
"button"
data-toggle=
"dropdown"
dropdown-toggle
>
<span
role=
"button"
data-toggle=
"dropdown"
dropdown-toggle
>
...
...
h/templates/client/top_bar.html
View file @
c30735ac
...
@@ -10,13 +10,13 @@
...
@@ -10,13 +10,13 @@
always-expanded=
"true"
>
always-expanded=
"true"
>
</search-input>
</search-input>
<div
class=
"top-bar__expander"
></div>
<div
class=
"top-bar__expander"
></div>
<
sign
in-control
<
log
in-control
auth=
"auth"
auth=
"auth"
new-style=
"false"
new-style=
"false"
on-show-help-panel=
"onShowHelpPanel()"
on-show-help-panel=
"onShowHelpPanel()"
on-login=
"onLogin()"
on-login=
"onLogin()"
on-logout=
"onLogout()"
>
on-logout=
"onLogout()"
>
</
sign
in-control>
</
log
in-control>
</div>
</div>
<!-- New design for the top bar, as used in the sidebar.
<!-- New design for the top bar, as used in the sidebar.
...
@@ -42,13 +42,13 @@
...
@@ -42,13 +42,13 @@
title=
"Share this page"
>
title=
"Share this page"
>
<i
class=
"h-icon-annotation-share"
></i>
<i
class=
"h-icon-annotation-share"
></i>
</a>
</a>
<
sign
in-control
<
log
in-control
class=
"
sign
in-control"
class=
"
log
in-control"
auth=
"auth"
auth=
"auth"
new-style=
"true"
new-style=
"true"
on-show-help-panel=
"onShowHelpPanel()"
on-show-help-panel=
"onShowHelpPanel()"
on-login=
"onLogin()"
on-login=
"onLogin()"
on-logout=
"onLogout()"
>
on-logout=
"onLogout()"
>
</
sign
in-control>
</
log
in-control>
</div>
</div>
</div>
</div>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment