Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SADE-Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
fontane-notizbuecher
SADE-Project
Commits
d9dbdd34
Commit
d9dbdd34
authored
5 years ago
by
Simon Sendler
Browse files
Options
Downloads
Patches
Plain Diff
Add loader-icons to edition, including necessary changes to .css
parent
97122f35
Branches
feature/loader-icon
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!8
Add loader-icons
Pipeline
#98482
passed
5 years ago
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
sade-projects/textgrid/templates/tmpl1/css/goldenLayoutLight.css
+14
-3
14 additions, 3 deletions
...ojects/textgrid/templates/tmpl1/css/goldenLayoutLight.css
sade-projects/textgrid/templates/tmpl1/js/goldenconfig.js
+10
-6
10 additions, 6 deletions
sade-projects/textgrid/templates/tmpl1/js/goldenconfig.js
with
24 additions
and
9 deletions
sade-projects/textgrid/templates/tmpl1/css/goldenLayoutLight.css
+
14
−
3
View file @
d9dbdd34
...
...
@@ -136,7 +136,18 @@
#goldenEdition
{
height
:
calc
(
100vh
-
150px
);
}
.ffacs
,
.ftran
{
margin
:
20px
;}
.ffacs
,
.ftran
{
margin
:
20px
;
}
.facsLoader
{
position
:
absolute
;
}
.codeLoader
{
margin
:
20px
;
}
body
.lm_content
{
overflow
:
auto
;
}
...
...
@@ -154,5 +165,5 @@ body .lm_content{
font-weight
:
300
;
}
.lm_goldenlayout
{
background
:
none
;
}
\ No newline at end of file
background
:
none
;
}
This diff is collapsed.
Click to expand it.
sade-projects/textgrid/templates/tmpl1/js/goldenconfig.js
+
10
−
6
View file @
d9dbdd34
...
...
@@ -91,20 +91,20 @@ if( savedState !== null ) {
// register components
myLayout
.
registerComponent
(
'
code
'
,
function
(
container
,
state
){
container
.
getElement
().
html
(
'
<
div id="placeholder">…</div
>
'
);
container
.
getElement
().
html
(
'
<
img alt="" class="codeLoader" src="https://fontane-nb.dariah.eu/public/img/loader.svg" width="500"
>
'
);
$
.
ajax
({
url
:
"
get/code.html
"
+
window
.
location
.
search
,
dataType
:
"
text
"
}).
done
(
function
(
data
){
$
(
"
#placehol
der
"
).
replaceWith
(
data
);
$
(
"
.codeLoa
der
"
).
replaceWith
(
data
);
});
});
myLayout
.
registerComponent
(
'
tran
'
,
function
(
container
,
state
){
if
(
getParameter
(
"
page
"
).
indexOf
(
"
-
"
)
>
0
&&
getParameter
(
"
page
"
).
indexOf
(
"
alt
"
)
==
-
1
)
{
var
newElement
=
'
<div class="ftran sourceDoc double"></div>
'
var
newElement
=
'
<div class="ftran sourceDoc double"><
img alt="" class="facsLoader" src="https://fontane-nb.dariah.eu/public/img/loader.svg" width="500"><
/div>
'
}
else
{
var
newElement
=
'
<div class="ftran sourceDoc"></div>
'
}
else
{
var
newElement
=
'
<div class="ftran sourceDoc"><
img alt="" class="transLoader" src="https://fontane-nb.dariah.eu/public/img/loader.svg" width="500"><
/div>
'
}
container
.
getElement
().
html
(
newElement
);
$
.
ajax
({
url
:
"
get/trans.html
"
+
window
.
location
.
search
,
...
...
@@ -122,14 +122,15 @@ container.getElement().html( newElement );
}
highlightLinkedAreas
();
indexTranscriptionHighlighting
();
$
(
"
.transLoader
"
).
remove
();
});
});
myLayout
.
registerComponent
(
'
facs
'
,
function
(
container
,
state
){
if
(
getParameter
(
"
page
"
).
indexOf
(
"
-
"
)
>
0
&&
getParameter
(
"
page
"
).
indexOf
(
"
alt
"
)
==
-
1
)
{
var
newElement
=
'
<div class="ffacs double"></div>
'
var
newElement
=
'
<div class="ffacs double"><
img alt="" class="facsLoader" src="https://fontane-nb.dariah.eu/public/img/loader.svg" width="500"><
/div>
'
}
else
{
var
newElement
=
'
<div class="ffacs"></div>
'
}
else
{
var
newElement
=
'
<div class="ffacs"><
img alt="" class="facsLoader" src="https://fontane-nb.dariah.eu/public/img/loader.svg" width="500"><
/div>
'
}
container
.
getElement
().
html
(
newElement
);
$
.
ajax
({
url
:
"
get/facs.html
"
+
window
.
location
.
search
,
...
...
@@ -141,6 +142,9 @@ container.getElement().html( newElement );
rotate
(
myLayout
.
root
.
getItemsById
(
"
facs
"
)[
0
].
config
.
componentState
.
rotation
);
}
altFacs
();
document
.
getElementsByClassName
(
"
facs
"
)[
1
].
onload
=
function
(){
$
(
"
.facsLoader
"
).
remove
();
};
});
});
...
...
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