Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Interactivesubtitle #1

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
e43ebb2
Added meta tag for viewport, to allow page content to be responsive t…
Sep 10, 2018
97dbba5
css optimization - first pass
Sep 10, 2018
be10f7c
fixed indentation inconsistencies in code
Sep 10, 2018
5b1ed6b
Merge remote-tracking branch 'boikle/add_viewport_to_indexhtml'
jpfiset Sep 18, 2018
2b3b685
Fix end tag on metadata
jpfiset Sep 18, 2018
2ec0281
nunaliit2-couch-application: Update validate_doc_update to catch a
jpfiset Sep 18, 2018
dd72dae
nunaliit2-js: Use throttling to speed up performance of Legend widget.
jpfiset Sep 18, 2018
216ef0d
nunaliit2-js: In computing geometry simplifications, save BBOX converted
jpfiset Sep 18, 2018
b865e66
correct parameter name
decheng-zhang Jul 30, 2018
c832740
prototype widget time tether
decheng-zhang Jul 31, 2018
14566a8
file-organizer
decheng-zhang Aug 9, 2018
597ba06
init widgetTimeTether
decheng-zhang Aug 9, 2018
6e8664a
no pollution of mediadisplay
decheng-zhang Aug 16, 2018
7bae523
resolving the jquery name
decheng-zhang Aug 16, 2018
5fe2354
resolving the jquery name
decheng-zhang Aug 16, 2018
ffc68ca
organize the tether, need to implement widget for tether
decheng-zhang Aug 28, 2018
23e7b88
put new widget into tether project
decheng-zhang Aug 28, 2018
0ee99ff
put new widget into tether project
decheng-zhang Aug 28, 2018
e4b7049
before finish the timeline config
decheng-zhang Aug 28, 2018
61a5f12
init timelinetethering
decheng-zhang Aug 28, 2018
0e593d4
init timelinetethering
decheng-zhang Aug 28, 2018
dc3d984
add srt2json
decheng-zhang Aug 30, 2018
590fded
Code Review
jpfiset Oct 2, 2018
35ebb72
fix code review += metadataseparator += inplacevideo boundedcontext n…
decheng-zhang Oct 2, 2018
793a8e1
Just an interim commit
jpfiset Oct 25, 2018
f4d673a
nunaliit2-js: Innterim commit
jpfiset Oct 25, 2018
b2df2c4
nunaliit2-js: In Transcript Widget, first version that works with a
jpfiset Oct 25, 2018
ee6085e
nunaliit2-js: nunaliit2-js: In Transcript Widget, accept transcript as
jpfiset Oct 25, 2018
4d37ded
nunaliit2-js: Revert changes to show service and media display. Logic is
jpfiset Oct 30, 2018
9aa4a3c
nunaliit2-js: Remove unused class.
jpfiset Oct 30, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ var n2validate = {

} else if( !userInfo.atlas[n2atlas.name]
|| !userInfo.atlas[n2atlas.name].agreement ) {
throw( {forbidden: 'Database submissions are restricted to users that have accepted the user agreement'} );
throw( {forbidden: 'Database submissions are restricted to users that have accepted the user agreement '+userCtxt.name+' roles: '+userCtxt.roles.join(',')} );

} else if( n2atlas.submissionDbEnabled
&& n2atlas.isDocumentDb
Expand Down
1 change: 1 addition & 0 deletions nunaliit2-couch-sdk/src/main/content/htdocs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<meta name="dc.format" content="html" />
<meta name="dc.rights" content="Materials are under copyright. Contact [email protected]" />
<meta name="dc.type" content="Interactive Resource" />
<meta name="viewport" content="width=device-width, initial-scale=1" />

<title>Atlas</title>

Expand Down
1 change: 1 addition & 0 deletions nunaliit2-js/compress/nunaliit2.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ n2.widgetLegend.js
n2.widgetCollapsibleContainer.js
n2.widgetResizingContainer.js
n2.widgetDuplicate.js
n2.widgetTranscript.js
n2.canvas.js
n2.canvasElementGenerator.js
n2.canvasForceGraph.js
Expand Down
64 changes: 13 additions & 51 deletions nunaliit2-js/src/main/js/nunaliit2/css/basic/n2.base.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
/**
* Correct `block` display not defined in IE 8/9.
*/

article,
aside,
details,
Expand All @@ -27,7 +26,6 @@ summary {
/**
* Correct `inline-block` display not defined in IE 8/9.
*/

audio,
canvas,
video {
Expand All @@ -38,7 +36,6 @@ video {
* Prevent modern browsers from displaying `audio` without controls.
* Remove excess height in iOS 5 devices.
*/

audio:not([controls]) {
display: none;
height: 0;
Expand All @@ -47,7 +44,6 @@ audio:not([controls]) {
/**
* Address styling not present in IE 8/9.
*/

[hidden] {
display: none;
}
Expand All @@ -61,7 +57,6 @@ audio:not([controls]) {
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
*/

html {
font-family: sans-serif; /* 1 */
-webkit-text-size-adjust: 100%; /* 2 */
Expand All @@ -71,7 +66,6 @@ html {
/**
* Remove default margin.
*/

body {
margin: 0;
}
Expand All @@ -83,15 +77,13 @@ body {
/**
* Address `outline` inconsistency between Chrome and other browsers.
*/

a:focus {
outline: thin dotted;
}

/**
* Improve readability when focused and also mouse hovered in all browsers.
*/

a:active,
a:hover {
outline: 0;
Expand All @@ -105,7 +97,6 @@ a:hover {
* Address variable `h1` font-size and margin within `section` and `article`
* contexts in Firefox 4+, Safari 5, and Chrome.
*/

h1 {
font-size: 2em;
margin: 0.67em 0;
Expand All @@ -114,15 +105,13 @@ h1 {
/**
* Address styling not present in IE 8/9, Safari 5, and Chrome.
*/

abbr[title] {
border-bottom: 1px dotted;
}

/**
* Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
*/

b,
strong {
font-weight: bold;
Expand All @@ -131,15 +120,13 @@ strong {
/**
* Address styling not present in Safari 5 and Chrome.
*/

dfn {
font-style: italic;
}

/**
* Address differences between Firefox and other browsers.
*/

hr {
-moz-box-sizing: content-box;
box-sizing: content-box;
Expand All @@ -149,7 +136,6 @@ hr {
/**
* Address styling not present in IE 8/9.
*/

mark {
background: #ff0;
color: #000;
Expand All @@ -158,7 +144,6 @@ mark {
/**
* Correct font family set oddly in Safari 5 and Chrome.
*/

code,
kbd,
pre,
Expand All @@ -170,23 +155,20 @@ samp {
/**
* Improve readability of pre-formatted text in all browsers.
*/

pre {
white-space: pre-wrap;
}

/**
* Set consistent quote types.
*/

q {
quotes: "\201C" "\201D" "\2018" "\2019";
}

/**
* Address inconsistent and variable font size in all browsers.
*/

small {
font-size: 80%;
}
Expand Down Expand Up @@ -218,15 +200,13 @@ sub {
/**
* Remove border when inside `a` element in IE 8/9.
*/

img {
border: 0;
}

/**
* Correct overflow displayed oddly in IE 9.
*/

svg:not(:root) {
overflow: hidden;
}
Expand All @@ -238,7 +218,6 @@ svg:not(:root) {
/**
* Address margin not present in IE 8/9 and Safari 5.
*/

figure {
margin: 0;
}
Expand All @@ -250,7 +229,6 @@ figure {
/**
* Define consistent border, margin, and padding.
*/

fieldset {
border: 1px solid #c0c0c0;
margin: 0 2px;
Expand All @@ -261,7 +239,6 @@ fieldset {
* 1. Correct `color` not being inherited in IE 8/9.
* 2. Remove padding so people aren't caught out if they zero out fieldsets.
*/

legend {
border: 0; /* 1 */
padding: 0; /* 2 */
Expand All @@ -272,7 +249,6 @@ legend {
* 2. Correct font size not being inherited in all browsers.
* 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
*/

button,
input,
select,
Expand All @@ -286,7 +262,6 @@ textarea {
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
* the UA stylesheet.
*/

button,
input {
line-height: normal;
Expand All @@ -298,7 +273,6 @@ input {
* Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
* Correct `select` style inheritance in Firefox 4+ and Opera.
*/

button,
select {
text-transform: none;
Expand All @@ -311,7 +285,6 @@ select {
* 3. Improve usability and consistency of cursor style between image-type
* `input` and others.
*/

button,
html input[type="button"], /* 1 */
input[type="reset"],
Expand All @@ -323,7 +296,6 @@ input[type="submit"] {
/**
* Re-set default cursor for disabled elements.
*/

button[disabled],
html input[disabled] {
cursor: default;
Expand All @@ -333,7 +305,6 @@ html input[disabled] {
* 1. Address box sizing set to `content-box` in IE 8/9.
* 2. Remove excess padding in IE 8/9.
*/

input[type="checkbox"],
input[type="radio"] {
box-sizing: border-box; /* 1 */
Expand All @@ -345,7 +316,6 @@ input[type="radio"] {
* 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
* (include `-moz` to future-proof).
*/

input[type="search"] {
-webkit-appearance: textfield; /* 1 */
-moz-box-sizing: content-box;
Expand All @@ -357,7 +327,6 @@ input[type="search"] {
* Remove inner padding and search cancel button in Safari 5 and Chrome
* on OS X.
*/

input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
Expand All @@ -366,7 +335,6 @@ input[type="search"]::-webkit-search-decoration {
/**
* Remove inner padding and border in Firefox 4+.
*/

button::-moz-focus-inner,
input::-moz-focus-inner {
border: 0;
Expand All @@ -377,7 +345,6 @@ input::-moz-focus-inner {
* 1. Remove default vertical scrollbar in IE 8/9.
* 2. Improve readability and alignment in all browsers.
*/

textarea {
overflow: auto; /* 1 */
vertical-align: top; /* 2 */
Expand All @@ -390,37 +357,32 @@ textarea {
/**
* Remove most spacing between table cells.
*/

table {
border-collapse: collapse;
border-spacing: 0;
}

html, body {
height: 100%;
overflow: auto;
color:#000;
font-family: helvetica, sans-serif;
font-weight: 400;
font-size:0.9em;
height: 100%;
overflow: auto;
color: #000;
font: 400 0.9em helvetica, sans-serif;
}

/*START - Font Styles*/
h1 { font-size: 2.2em; letter-spacing:0;}
h1 { font-size: 2.2em; letter-spacing: 0;}
h2 { font-size: 1.55em; line-height: 1.2em; }
h3 { font-size: 1.17em; line-height:20px; }
h4 { font-size: 1em; margin-bottom:10px; }
h3 { font-size: 1.17em; line-height: 20px; }
h4 { font-size: 1em; margin-bottom: 10px; }
h5 { font-size: 0.83em; }
h6 { font-size: 0.67em; }
a { text-decoration:none; }
a:hover { text-decoration:underline; }
p { margin:0 0 10px 0; line-height:1.4em}
i {font-style:italic}
ul { list-style:none; margin-bottom:10px; }
ul li { margin-bottom:5px; }
ul.bullets { list-style:disc; padding-left:40px; }
ul.bullets li { margin-bottom:0; }
p { margin :0 0 10px 0; line-height: 1.4em}
i {font-style: italic}
ul { list-style: none; margin-bottom: 10px; }
ul li { margin-bottom: 5px; }
ul.bullets { list-style: disc; padding-left: 40px; }
ul.bullets li { margin-bottom: 0; }
html.ie7 h1, html.ie8 h1 { font-weight: bold; }
/*END - Font Styles*/


Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
width: 150px;
height: 150px;
display: inline-block;
margin: 2px 2px;
margin: 2px;
position: relative;
cursor: pointer;
vertical-align: top; /* Required to fix alignment in safari */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@

.n2TableCanvas td,
.n2TableCanvas th {
border-color: #000000;
border-style: solid;
border-width: 1px;
border: 1px solid #000000;
}

.n2TableCanvas td.n2TableCanvas_lazyDisplay {
height: 10px;
}
}
10 changes: 2 additions & 8 deletions nunaliit2-js/src/main/js/nunaliit2/css/basic/n2.couchAuth.css
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
color: #0379CF;
}


/* Create user dialog window */
.n2Auth_create .n2Auth_create_label {
float: left;
Expand Down Expand Up @@ -292,7 +291,6 @@
color: #0379CF;
}


.n2Auth_userEdit .n2UserEdit_deleteButton {
display: none;
}
Expand All @@ -302,7 +300,8 @@
}

/* User Agreement */
.n2Auth_user_agreement_label {
.n2Auth_user_agreement_label,
.n2Auth_user_agreement_buttons {
margin-top: 10px;
margin-bottom: 10px;
}
Expand All @@ -311,8 +310,3 @@ textarea.n2Auth_user_agreement_content {
width: 600px;
height: 400px;
}

.n2Auth_user_agreement_buttons {
margin-top: 10px;
margin-bottom: 10px;
}
Loading