Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
persona
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hexang 息壤平台
persona
Commits
c035dbc6
Commit
c035dbc6
authored
13 years ago
by
Shane Tomlinson
Browse files
Options
Downloads
Patches
Plain Diff
Getting rid of the inner "dialog" and just using the form as what we overwrite.
parent
8a949c80
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
browserid/static/dialog/controllers/page_controller.js
+3
-2
3 additions, 2 deletions
browserid/static/dialog/controllers/page_controller.js
browserid/views/dialog.ejs
+10
-11
10 additions, 11 deletions
browserid/views/dialog.ejs
with
13 additions
and
13 deletions
browserid/static/dialog/controllers/page_controller.js
+
3
−
2
View file @
c035dbc6
...
...
@@ -76,8 +76,9 @@
if
(
body
)
{
var
bodyHtml
=
$
.
View
(
"
//dialog/views/
"
+
body
,
body_vars
);
$
(
"
#dialog
"
).
html
(
bodyHtml
).
hide
().
fadeIn
(
ANIMATION_TIME
,
function
()
{
$
(
"
#dialog input
"
).
eq
(
0
).
focus
();
var
form
=
$
(
"
#formWrap > form
"
);
form
.
html
(
bodyHtml
).
hide
().
fadeIn
(
ANIMATION_TIME
,
function
()
{
form
.
find
(
"
input
"
).
eq
(
0
).
focus
();
});
}
},
...
...
This diff is collapsed.
Click to expand it.
browserid/views/dialog.ejs
+
10
−
11
View file @
c035dbc6
...
...
@@ -24,20 +24,19 @@
</header>
<div
id=
"formWrap"
class=
"cf"
>
<form
novalidate
>
<form
novalidate
class=
"cf"
>
<div
id=
"dialog"
class=
"dialog cf"
>
<!-- All of this is going to be replaced on startup, but we need some temporary placeholder -->
<h2>
Communicating with server
</h2>
<p>
Just a moment while we talk with the server.
</p>
</div>
<div
id=
"error_dialog"
>
<h3
class=
"title"
></h3>
<p
class=
"content"
></p>
</div>
<!-- All of this is going to be replaced on startup, but we need some temporary placeholder -->
<h2>
Communicating with server
</h2>
<p>
Just a moment while we talk with the server.
</p>
</form>
<div
id=
"error_dialog"
>
<h3
class=
"title"
></h3>
<p
class=
"content"
></p>
</div>
</div>
<footer>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment