Skip to content

Update time elements #36

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.

Sign up for GitHub

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

Merged
illbecma merged 2 commits into from
Nov 30, 2016
Merged

Update time elements #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed95773
Updated time-elements and activity-tracker.
istvank Nov 30, 2016
c4a705e
Added masonry-layout dependency that was previously indirectly refere…
istvank Nov 30, 2016
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
1 change: 0 additions & 1 deletion app/elements/elements.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
<link rel="import" href="../components/paper-tabs/paper-tabs.html">
<link rel="import" href="../components/paper-checkbox/paper-checkbox.html">
<link rel="import" href="../components/i18n-msg/i18n-msg.html">
<link rel="import" href="../components/requirements-grid/requirements-grid.html">

<!-- Neon elements -->
<link rel="import" href="../components/neon-animation/animations/fade-in-animation.html">
Expand Down
7 changes: 3 additions & 4 deletions app/elements/requirements-list/requirements-list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<link rel="import" href="../../components/polymer/polymer.html">
<link rel="import" href="../../components/iron-flex-layout/iron-flex-layout.html">
<link rel="import" href="../../components/masonry-layout/masonry-layout.html">

<dom-module id="requirements-list">
<template>
Expand Down Expand Up @@ -348,9 +349,7 @@ <h2>Your Github Repositories</h2>
<paper-card heading="{{req.title}}" elevation="2" id="[[req.id]]">
<!--<paper-checkbox></paper-checkbox>-->
<div style="display:inline-flex; padding-left: 16px;"><span><i18n-msg msgid="by"></i18n-msg> <req-user user="[[req.creator]]" normal-view></req-user></span></div>
<time is="relative-time" class="time"
datetime$="[[req.creation_time]]">
</time>
<relative-time class="time" datetime$="[[req.creation_time]]"></relative-time>
<div style="position:relative; padding: 16px;"><file-gallery attachments="{{req.attachments}}" grid></file-gallery></div>
<div class="card-content" class="truncate">{{req.description}}</div>
<div class="card-actions">
Expand Down Expand Up @@ -405,7 +404,7 @@ <h2>Your Github Repositories</h2>
<paper-toolbar class="title" on-tap="onRequirementTap">
<div class="title">[[req.title]]</div>
<div class="bottom fit helper" style="margin-top:20px;">
<time is="relative-time" datetime$="[[req.creation_time]]"></time>
<relative-time datetime$="[[req.creation_time]]"></relative-time>
<i18n-msg msgid="by"></i18n-msg>
<req-user user="[[req.creator]]" normal-view></req-user>
</div>
Expand Down
11 changes: 1 addition & 10 deletions app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,11 +248,8 @@ <h1><i18n-msg msgid="lp-title"></i18n-msg></h1>
<!--Notification Drawer-->
<paper-drawer-panel right-drawer="true" id="notDrawer0">
<paper-scroll-header-panel drawer fixed id="letsscroll1">
<template is="dom-if" if="{{! activities}}">
<paper-spinner active></paper-spinner>
</template>
<!-- Drawer Content -->
<activity-tracker url="{{activityHref}}" activities="{{activities}}"></activity-tracker>
<activity-tracker url="{{activityHref}}"></activity-tracker>
</paper-scroll-header-panel>
</paper-drawer-panel>

Expand Down Expand Up @@ -332,9 +329,6 @@ <h2><i18n-msg msgid="createProject"></i18n-msg></h2>
<!--Notification Drawer-->
<paper-drawer-panel right-drawer="true" id="notDrawer1">
<paper-scroll-header-panel drawer fixed id="letsscroll2">
<template is="dom-if" if="{{! activities}}">
<paper-spinner active></paper-spinner>
</template>
<!-- Drawer Content -->
<activity-tracker url="{{activityHref}}"></activity-tracker>
</paper-scroll-header-panel>
Expand Down Expand Up @@ -464,9 +458,6 @@ <h2><i18n-msg msgid="createComponent"></i18n-msg></h2>
<!--Notification Drawer-->
<paper-drawer-panel right-drawer="true" id="notDrawer">
<paper-scroll-header-panel drawer fixed id="letsscroll3">
<template is="dom-if" if="{{! activities}}">
<paper-spinner active></paper-spinner>
</template>
<!-- Drawer Content -->
<activity-tracker url="{{activityHref}}"></activity-tracker>
</paper-scroll-header-panel>
Expand Down
17 changes: 0 additions & 17 deletions app/scripts/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,6 @@
if (app.route == "component-info"){
document.querySelectorAll("#scrollThreshold")[2].scrollTarget = document.querySelector("#letsscroll3").scroller;
}
document.querySelector('activity-tracker').refresh();

// opens right drawer in the project view
if (document.querySelector('#drawer').style.display != 'block'){
Expand Down Expand Up @@ -837,7 +836,6 @@

// opens right drawer in the components view
if (document.querySelectorAll('#drawer')[1].style.display != 'block'){
// document.querySelectorAll('activity-tracker')[1].refresh();
document.querySelectorAll('#drawer')[1].style.display = 'block';
document.querySelectorAll('#drawer')[1].style.zIndex = 1;
if (!this.isMobile) {
Expand All @@ -856,7 +854,6 @@

// opens right drawer in the requirements view
if (document.querySelectorAll('#drawer')[2].style.display != 'block'){
// document.querySelectorAll('activity-tracker')[2].refresh();
document.querySelectorAll('#drawer')[2].style.display = 'block';
document.querySelectorAll('#drawer')[2].style.zIndex = 1;
if (!this.isMobile) {
Expand Down Expand Up @@ -1237,20 +1234,6 @@
tst.open();
};

/**
* Check if activities of activity tracker are loaded.
*
* @returns {boolean}
*/
app.activitiesLoaded = function() {
if (this.activities === null) {
return false;
} else {
return true;
}
};


/**
* Displays Hi message when user is logged in.
*/
Expand Down
8 changes: 4 additions & 4 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
"platinum-elements": "PolymerElements/platinum-elements#^1.1.0",
"neon-elements": "PolymerElements/neon-elements#^1.0.0",
"page": "visionmedia/page.js#~1.6.3",
"time-elements": "~0.4.0",
"time-elements": "^0.6.0",
"openidconnect-signin": "rwth-acis/openidconnect-signin#^1.0.1",
"activity-tracker": "rwth-acis/activity-tracker#~1.0.1",
"activity-tracker": "rwth-acis/activity-tracker#^1.1.0",
"paper-dialog-behavior": "PolymerElements/paper-dialog-behavior#^1.2.2",
"emoji-selector": "https://github.com/notwaldorf/emoji-selector.git#^1.1.1",
"requirements-grid": "rwth-acis/requirements-grid#^1.1.0",
"i18n-msg": "ebidel/i18n-msg#^1.1.0",
"iron-flex-layout": "PolymerElements/iron-flex-layout#^1.3.1"
"iron-flex-layout": "PolymerElements/iron-flex-layout#^1.3.1",
"masonry-layout": "^1.0.4"
},
"devDependencies": {
"web-component-tester": "*",
Expand Down