Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
Annotation-System
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
14
Issues
14
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Annotation-Pushers
Annotation-System
Commits
d6e633cf
Commit
d6e633cf
authored
Mar 03, 2019
by
Matt Mascarenhas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cinera.css: Search page mobile style
cinera_search.js: Conditionally display the results summary
parent
21814d1e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
3 deletions
+41
-3
cinera/cinera.c
cinera/cinera.c
+1
-1
cinera/cinera.css
cinera/cinera.css
+36
-1
cinera/cinera_search.js
cinera/cinera_search.js
+4
-1
No files found.
cinera/cinera.c
View file @
d6e633cf
...
...
@@ -17,7 +17,7 @@ typedef struct
version
CINERA_APP_VERSION
=
{
.
Major
=
0
,
.
Minor
=
6
,
.
Patch
=
5
.
Patch
=
6
};
#include <stdarg.h> // NOTE(matt): varargs
...
...
cinera/cinera.css
View file @
d6e633cf
...
...
@@ -78,7 +78,7 @@
}
#cineraIndexEntries
div
a
::before
{
content
:
"
✓
"
;
content
:
"
\2713
"
;
margin
:
0
4px
;
}
...
...
@@ -105,6 +105,41 @@
#cineraResultsSummary
{
margin
:
10px
0
;
text-align
:
center
;
display
:
none
;
}
@media
(
max-width
:
512px
),
(
max-height
:
512px
)
{
.cineraQueryContainer
{
margin
:
4px
auto
;
}
#cineraIndex
#cineraIndexSort
,
#cineraResultsSummary
{
font-size
:
64%
;
}
#cineraIndex
#cineraIndexSort
{
margin-bottom
:
4px
;
}
#cineraResults
.dayContainer
{
flex-direction
:
column
;
}
#cineraResults
.dayContainer
.dayname
{
font-weight
:
bold
;
text-align
:
center
;
width
:
100%
;
}
#cineraResults
.dayContainer
.markerList
{
max-width
:
100%
;
}
#cineraIndexEntries
div
a
{
font-size
:
80%
;
}
}
/* Player */
...
...
cinera/cinera_search.js
View file @
d6e633cf
...
...
@@ -13,6 +13,7 @@ var projectID = indexContainer.attributes.getNamedItem("data-project").value;
var
theme
=
indexContainer
.
classList
.
item
(
0
);
var
baseURL
=
indexContainer
.
attributes
.
getNamedItem
(
"
data-baseURL
"
).
value
;
var
playerLocation
=
indexContainer
.
attributes
.
getNamedItem
(
"
data-playerLocation
"
).
value
;
var
resultsSummary
=
document
.
getElementById
(
"
cineraResultsSummary
"
);
var
indexSort
=
indexContainer
.
querySelector
(
"
#cineraIndexSort
"
);
var
indexEntries
=
indexContainer
.
querySelector
(
"
#cineraIndexEntries
"
);
...
...
@@ -106,6 +107,7 @@ function runSearch() {
var
totalSeconds
=
0
;
if
(
queryStr
&&
queryStr
.
length
>
0
)
{
indexContainer
.
style
.
display
=
"
none
"
;
resultsSummary
.
style
.
display
=
"
block
"
;
if
(
episodes
.
length
>
0
)
{
var
query
=
new
RegExp
(
queryStr
.
replace
(
"
(
"
,
"
\\
(
"
).
replace
(
"
)
"
,
"
\\
)
"
).
replace
(
/
\|
+/
,
"
\
|
"
).
replace
(
/
\|
$/
,
""
).
replace
(
/
(
^|
[^\\])\\
$/
,
"
$1
"
),
"
gi
"
);
for
(
var
i
=
0
;
i
<
episodes
.
length
;
++
i
)
{
...
...
@@ -143,11 +145,12 @@ function runSearch() {
else
{
indexContainer
.
style
.
display
=
"
block
"
;
resultsSummary
.
style
.
display
=
"
none
"
;
}
var
totalTime
=
Math
.
floor
(
totalSeconds
/
60
/
60
)
+
"
h
"
+
Math
.
floor
(
totalSeconds
/
60
)
%
60
+
"
m
"
+
totalSeconds
%
60
+
"
s
"
;
document
.
getElementById
(
"
cineraResultsSummary
"
)
.
textContent
=
"
Found:
"
+
numEpisodes
+
"
episodes,
"
+
numMarkers
+
"
markers,
"
+
totalTime
+
"
total.
"
;
resultsSummary
.
textContent
=
"
Found:
"
+
numEpisodes
+
"
episodes,
"
+
numMarkers
+
"
markers,
"
+
totalTime
+
"
total.
"
;
}
function
renderResults
()
{
...
...
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