Skip to content
This repository has been archived by the owner on Feb 10, 2022. It is now read-only.

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	mammooc-rating-widget.html
  • Loading branch information
@MrSerth
MrSerth committed Sep 15, 2017
2 parents c107f50 + 3b6ddd7 commit 063d1db
Show file tree
Hide file tree
Showing 21 changed files with 4,570 additions and 1,337 deletions.
1,143 changes: 1,143 additions & 0 deletions analysis.json
View file

Large diffs are not rendered by default.

41 changes: 21 additions & 20 deletions bower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,28 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.7.0",
"iron-form-element-behavior": "PolymerElements/iron-form-element-behavior#^1.0.6",
"iron-form": "PolymerElements/iron-form#^1.1.4",
"iron-ajax": "PolymerElements/iron-ajax#^1.4.3",
"flexible-rating": "mammooc/flexible-rating#^1.0.3",
"paper-card": "PolymerElements/paper-card#^1.1.4",
"paper-styles": "PolymerElements/paper-styles#^1.1.4",
"paper-input": "PolymerElements/paper-input#^1.1.20",
"paper-button": "PolymerElements/paper-button#^1.0.14",
"paper-radio-group": "PolymerElements/paper-radio-group#^1.2.1",
"paper-radio-button": "PolymerElements/paper-radio-button#^1.2.1",
"paper-checkbox": "PolymerElements/paper-checkbox#^1.4.1",
"iron-jsonp-library": "PolymerElements/iron-jsonp-library#^1.0.4",
"paper-toast": "PolymerElements/paper-toast#^1.0.3",
"iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.2.5",
"iron-scroll-threshold": "PolymerElements/iron-scroll-threshold#^1.0.3",
"iron-list": "PolymerElements/iron-list#^1.3.13",
"app-localize-behavior": "PolymerElements/app-localize-behavior#^0.10.0"
"polymer": "Polymer/polymer#^2.0.0",
"iron-form-element-behavior": "PolymerElements/iron-form-element-behavior#^2.0.0",
"iron-form": "PolymerElements/iron-form#^2.0.0",
"iron-ajax": "PolymerElements/iron-ajax#^2.0.0",
"flexible-rating": "mammooc/flexible-rating#^2.0.0",
"paper-card": "PolymerElements/paper-card#^2.0.0",
"paper-styles": "PolymerElements/paper-styles#^2.0.0",
"paper-input": "PolymerElements/paper-input#^2.0.0",
"paper-button": "PolymerElements/paper-button#^2.0.0",
"paper-radio-group": "PolymerElements/paper-radio-group#^2.0.0",
"paper-radio-button": "PolymerElements/paper-radio-button#^2.0.0",
"paper-checkbox": "PolymerElements/paper-checkbox#^2.0.0",
"iron-jsonp-library": "PolymerElements/iron-jsonp-library#^2.0.0",
"paper-toast": "PolymerElements/paper-toast#^2.0.0",
"iron-demo-helpers": "PolymerElements/iron-demo-helpers#^2.0.0",
"iron-scroll-threshold": "PolymerElements/iron-scroll-threshold#^2.0.0",
"iron-list": "PolymerElements/iron-list#^2.0.0",
"app-localize-behavior": "PolymerElements/app-localize-behavior#^2.0.0"
},
"devDependencies": {
"iron-component-page": "PolymerElements/iron-component-page#^1.1.7",
"web-component-tester": "Polymer/web-component-tester#^5.0.0"
"iron-component-page": "PolymerElements/iron-component-page#^3.0.0",
"web-component-tester": "Polymer/web-component-tester#^6.0.0",
"polymer-bundler": "Polymer/polymer-bundler#^3.0.0"
}
}
47 changes: 25 additions & 22 deletions demo/customstyling.html
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,36 @@
<!DOCTYPE html>
<html>
<head>
<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
<script src="../../webcomponentsjs/webcomponents-loader.js"></script>
<link rel="import" href="../mammooc-rating-widget.html">
<link rel="import" href="../../polymer/polymer-element.html">
<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
<link rel="import" href="../../iron-demo-helpers/demo-pages-shared-styles.html">
<style is="custom-style" include="demo-pages-shared-styles">
.vertical-section-container {
max-width: 550px;
}
</style>
<custom-style>
<style include="demo-pages-shared-styles">
.vertical-section-container {
max-width: 550px;
}
</style>
</custom-style>
</head>
<body>
<div class="vertical-section-container centered">
<h4>An element with custom styling</h4>
<demo-snippet class="centered-demo">
<template>
<style is="custom-style">
mammooc-rating-widget.customStyling {
--mammooc-rating-widget-primary-color: #5F8C1C;
--mammooc-rating-widget-secondary-color: #999;
--mammooc-rating-widget-background-color: #eee;
}
</style>
<mammooc-rating-widget class="customStyling" provider="open_mammooc" course-id="1" ></mammooc-rating-widget>
</template>
</demo-snippet>
<a href="index.html">Back</a>
</div>
<div class="vertical-section-container centered">
<h4>An element with custom styling</h4>
<demo-snippet class="centered-demo">
<template>
<style is="custom-style">
mammooc-rating-widget.customStyling {
--mammooc-rating-widget-primary-color: #5F8C1C;
--mammooc-rating-widget-secondary-color: #999;
--mammooc-rating-widget-background-color: #eee;
}
</style>
<mammooc-rating-widget class="customStyling" provider="open_mammooc" course-id="1" ></mammooc-rating-widget>
</template>
</demo-snippet>
<a href="index.html">Back</a>
</div>
</body>


Expand Down
25 changes: 14 additions & 11 deletions demo/default.html
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
<!DOCTYPE html>
<html>
<head>
<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
<script src="../../webcomponentsjs/webcomponents-loader.js"></script>
<link rel="import" href="../mammooc-rating-widget.html">
<link rel="import" href="../../polymer/polymer-element.html">
<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
<link rel="import" href="../../iron-demo-helpers/demo-pages-shared-styles.html">
<style is="custom-style" include="demo-pages-shared-styles">
.vertical-section-container {
max-width: 550px;
}
</style>
<custom-style>
<style include="demo-pages-shared-styles">
.vertical-section-container {
max-width: 550px;
}
</style>
</custom-style>
</head>
<body>
<div class="vertical-section-container centered">
<div class="vertical-section-container centered">
<h4>The default element</h4>
<demo-snippet class="centered-demo">
<template>
<mammooc-rating-widget provider="open_mammooc" course-id="1" ></mammooc-rating-widget>
</template>
<template>
<mammooc-rating-widget provider="open_mammooc" course-id="1"></mammooc-rating-widget>
</template>
</demo-snippet>
<a href="index.html">Back</a>
</div>
</div>
</body>


Expand Down
60 changes: 35 additions & 25 deletions demo/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,43 @@
<!doctype html>
<!DOCTYPE html>
<html>
<head>
<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
<link rel="import" href="../../paper-styles/demo-pages.html">
<style>
a {
display: block;
margin-bottom: 10px;
}
<script src="../../webcomponentsjs/webcomponents-loader.js"></script>
<link rel="import" href="../../polymer/polymer-element.html">
<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
<link rel="import" href="../../iron-demo-helpers/demo-pages-shared-styles.html">
<custom-style>
<style include="demo-pages-shared-styles">
.vertical-section-container {
max-width: 500px;
}
</style>
</custom-style>

li {
list-style: none;
}
</style>
</head>
<body unresolved>
<style>
a {
display: block;
margin-bottom: 10px;
}

<div class="horizontal-section-container">
li {
list-style: none;
}
</style>
</head>
<body>
<div class="horizontal-section-container">
<div>
<h4>mammooc-rating-widget demos</h4>
<ul class="horizontal-section">
<li><a href="default.html">The default element</a></li>
<li><a href="withoutform.html">Without the form</a></li>
<li><a href="onlyoverall.html">Only overall rating</a></li>
<li><a href="customstyling.html">Custom styling</a></li>
<li><a href="localized.html">Localized</a></li>
</ul>
<h4>mammooc-rating-widget demos</h4>
<ul class="horizontal-section">
<li><a href="default.html">The default element</a></li>
<li><a href="withoutform.html">Without the form</a></li>
<li><a href="onlyoverall.html">Only overall rating</a></li>
<li><a href="customstyling.html">Custom styling</a></li>
<li><a href="localized.html">Localized</a></li>
</ul>
</div>
</div>

</div>
</body>


</html>
25 changes: 14 additions & 11 deletions demo/localized.html
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
<!DOCTYPE html>
<html lang="de">
<head>
<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
<script src="../../webcomponentsjs/webcomponents-loader.js"></script>
<link rel="import" href="../mammooc-rating-widget.html">
<link rel="import" href="../../polymer/polymer-element.html">
<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
<link rel="import" href="../../iron-demo-helpers/demo-pages-shared-styles.html">
<style is="custom-style" include="demo-pages-shared-styles">
.vertical-section-container {
max-width: 550px;
}
</style>
<custom-style>
<style include="demo-pages-shared-styles">
.vertical-section-container {
max-width: 550px;
}
</style>
</custom-style>
</head>
<body>
<div class="vertical-section-container centered">
<div class="vertical-section-container centered">
<h4>A localized element (German)</h4>
<demo-snippet class="centered-demo">
<template>
<mammooc-rating-widget provider="open_mammooc" course-id="1" ></mammooc-rating-widget>
</template>
<template>
<mammooc-rating-widget provider="open_mammooc" course-id="1"></mammooc-rating-widget>
</template>
</demo-snippet>
<a href="index.html">Back</a>
</div>
</div>
</body>


Expand Down
25 changes: 14 additions & 11 deletions demo/onlyoverall.html
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
<!DOCTYPE html>
<html>
<head>
<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
<script src="../../webcomponentsjs/webcomponents-loader.js"></script>
<link rel="import" href="../mammooc-rating-widget.html">
<link rel="import" href="../../polymer/polymer-element.html">
<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
<link rel="import" href="../../iron-demo-helpers/demo-pages-shared-styles.html">
<style is="custom-style" include="demo-pages-shared-styles">
.vertical-section-container {
max-width: 550px;
}
</style>
<custom-style>
<style include="demo-pages-shared-styles">
.vertical-section-container {
max-width: 550px;
}
</style>
</custom-style>
</head>
<body>
<div class="vertical-section-container centered">
<div class="vertical-section-container centered">
<h4>An element only showing the overall rating</h4>
<demo-snippet class="centered-demo">
<template>
<mammooc-rating-widget disable-evaluations disable-evaluation-form provider="open_mammooc" course-id="1" ></mammooc-rating-widget>
</template>
<template>
<mammooc-rating-widget disable-evaluations disable-evaluation-form provider="open_mammooc" course-id="1"></mammooc-rating-widget>
</template>
</demo-snippet>
<a href="index.html">Back</a>
</div>
</div>
</body>


Expand Down
25 changes: 14 additions & 11 deletions demo/withoutform.html
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
<!DOCTYPE html>
<html>
<head>
<script src="../../webcomponentsjs/webcomponents-lite.min.js"></script>
<script src="../../webcomponentsjs/webcomponents-loader.js"></script>
<link rel="import" href="../mammooc-rating-widget.html">
<link rel="import" href="../../polymer/polymer-element.html">
<link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
<link rel="import" href="../../iron-demo-helpers/demo-pages-shared-styles.html">
<style is="custom-style" include="demo-pages-shared-styles">
.vertical-section-container {
max-width: 550px;
}
</style>
<custom-style>
<style include="demo-pages-shared-styles">
.vertical-section-container {
max-width: 550px;
}
</style>
</custom-style>
</head>
<body>
<div class="vertical-section-container centered">
<div class="vertical-section-container centered">
<h4>An element without the form</h4>
<demo-snippet class="centered-demo">
<template>
<mammooc-rating-widget disable-evaluation-form provider="open_mammooc" course-id="1" ></mammooc-rating-widget>
</template>
<template>
<mammooc-rating-widget disable-evaluation-form provider="open_mammooc" course-id="1"></mammooc-rating-widget>
</template>
</demo-snippet>
<a href="index.html">Back</a>
</div>
</div>
</body>


Expand Down
2 changes: 1 addition & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<script src="../webcomponentsjs/webcomponents-lite.js"></script>
<script src="../webcomponentsjs/webcomponents-loader.js"></script>
<link rel="import" href="../iron-component-page/iron-component-page.html">

</head>
Expand Down
Loading

0 comments on commit 063d1db

Please sign in to comment.