From 9de6f997c1485c73c032fbb0057ea3dea557e539 Mon Sep 17 00:00:00 2001 From: Toxantron Date: Wed, 7 Nov 2018 22:14:33 +0100 Subject: [PATCH 1/5] Move sponsoring instruction to page --- README.md | 10 ---------- src/sponsors.php | 6 ++++++ src/templates/home.php | 4 ++-- src/templates/sponsors_view.php | 25 +++++++++++++++++++++++++ 4 files changed, 33 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 7060b6b..d5a3d61 100644 --- a/README.md +++ b/README.md @@ -32,13 +32,3 @@ For every story the Scrum Master will than start a poll and each member of the s If you want to contribute you can just clone the repository and follow the deployment instructions. We also offer support for [Vagrant](doc/Vagrant.md) and [Docker](doc/Docker.md). Any changes must be commited to a fork and then merged by issuing a pull request. For information on the REST API or ticketing plugins please have a look at the [wiki documentation](https://github.com/Toxantron/scrumonline/blob/master/doc/). You can also use the [REST API](https://github.com/Toxantron/scrumonline/blob/master/doc/Developer-Documentation.md) to build a mobile for iOS or Android. In that case I am happy to link your app in the README and on the page. - -## Sponsoring -If you want to support the project, you can become an official sponsor. There are three different levels of sponsoring and each is rewarded with your logo and link in different places. The price for the next level always includes the previous levels privileges. Prices only show the current price for each type and may -change over time based on demand. To become an official sponsor please contact sponsoring@scrumpoker.online with the [necessary information](https://github.com/Toxantron/scrumonline/blob/master/src/sponsors.php) and your desired sponsoring level. You will recieve an official invoice for your sponsorship, which makes it tax deductible for companies. Within 7 days after payment the page will be updated with your logo. Alternatively if you contribute developer time or server resources, you can also be listed as a sponsor. - -| Level | Price annually | Logo placement | -|---|---:|---| -| Basic | 20€ | Sponsors tab | -| Footer | 100€ | Footer | -| Repo | 150€ | README on GitHub | diff --git a/src/sponsors.php b/src/sponsors.php index 5208595..d170aec 100644 --- a/src/sponsors.php +++ b/src/sponsors.php @@ -21,6 +21,12 @@ public function render() return "linkURL . "\">logoURL . "\">"; } + public static $prices = [ + 20, // Basic + 100, // Footer + 150 // README + ]; + public static function renderFooter() { $sponsors = [ diff --git a/src/templates/home.php b/src/templates/home.php index 6ea8ab9..0c8638d 100644 --- a/src/templates/home.php +++ b/src/templates/home.php @@ -16,8 +16,8 @@ Developing, maintaining and hosting this application costs personal time and money. Almost 20.000 users access the application each month to perform over 28.000 polls. This increase in traffic will exceed the current hosting soon and requires additional funding. I would also like to setup mirrors around the world for comparable loading times. To keep the page ad-free, I am asking - for your help. If you would like to support my efforts and help keep the lights on, you can either donate trough the button below - or become an official sponsor. + for your help. If you would like to support my efforts and help keep the lights on, you can either donate through the button below + or become an official sponsor.

diff --git a/src/templates/sponsors_view.php b/src/templates/sponsors_view.php index 28406b8..c61161a 100644 --- a/src/templates/sponsors_view.php +++ b/src/templates/sponsors_view.php @@ -1,3 +1,28 @@ +
+

Becoming a sponsor

+

+ If you want to support the project, you can become an official sponsor. There are three different levels of sponsoring and each is rewarded + with your logo and link in different places. The price for the next level always includes the previous levels privileges. Prices only show + the current price for each type and may change over time based on demand. To become an official sponsor please contact + sponsoring@scrumpoker.online with your company and logo URL, as well as the desired + sponsoring level. You will recieve an official invoice for your sponsorship, which makes it tax deductible for companies. Within 7 days after + payment the page will be updated with your logo. Alternatively if you contribute developer time or server resources, you can also be listed as a sponsor. +

+ +
+ + + + + + + + + +
LevelPrice annuallyLogo placement
Basic€Sponsors tab
Footer€Footer
Repo€README on GitHub
+
+
+

Other Sponsors:

From 7fae3ed2a5b094184a4317905f71beef1188becc Mon Sep 17 00:00:00 2001 From: Toxantron Date: Wed, 7 Nov 2018 22:24:13 +0100 Subject: [PATCH 2/5] Remove all cloud pages from dev --- src/index.php | 6 --- src/js/main.js | 6 --- src/sponsors.php | 80 --------------------------------- src/templates/home.php | 6 +-- src/templates/impressum.html | 65 --------------------------- src/templates/sponsors_view.php | 39 ---------------- src/templates/templates.php | 2 - 7 files changed, 2 insertions(+), 202 deletions(-) delete mode 100644 src/sponsors.php delete mode 100644 src/templates/impressum.html delete mode 100644 src/templates/sponsors_view.php diff --git a/src/index.php b/src/index.php index 28644fc..022c96c 100644 --- a/src/index.php +++ b/src/index.php @@ -80,12 +80,6 @@ render(false) ?>
- -
-

Sponsored by

- -
- diff --git a/src/js/main.js b/src/js/main.js index 22e349a..1f715ae 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -94,12 +94,6 @@ scrum.app.config( controllerAs: 'member', pageTrack: '/member' }) - .when('/sponsors', { - templateUrl: 'sponsors.html', - }) - .when('/impressum', { - templateUrl: 'impressum.html', - }) .when('/removal', { templateUrl: 'removal.html', }) diff --git a/src/sponsors.php b/src/sponsors.php deleted file mode 100644 index d170aec..0000000 --- a/src/sponsors.php +++ /dev/null @@ -1,80 +0,0 @@ -linkURL = $linkURL; - $this->logoURL = $logoURL; - } - - // Render this sponsor instance - public function render() - { - return "linkURL . "\">logoURL . "\">"; - } - - public static $prices = [ - 20, // Basic - 100, // Footer - 150 // README - ]; - - public static function renderFooter() - { - $sponsors = [ - // All sponsors for the footer - //new Sponsor("https://example.com", "https://example.com/logo.png"), - ]; - - Sponsor::renderSponsors($sponsors); - } - - public static function renderOthers() - { - $sponsors = [ - // All sponsors for the sponsors tab - //new Sponsor("https://example.com", "https://example.com/logo.png"), - ]; - - Sponsor::renderSponsors($sponsors); - } - - private static function renderSponsors($sponsors) - { - echo "
"; - - foreach($sponsors as $sponsor) - echo $sponsor->render(); - - echo "
"; - } - - private static $donors = [ - //"Author" => "Message" - ]; - - public static function donorCount() - { - return sizeof(Sponsor::$donors); - } - - public static function renderDonors() - { - echo "
"; - - foreach (Sponsor::$donors as $donorName => $message) { - echo "
\"" . $message ."\"
" . $donorName . "
"; - } - - echo "
"; - } -} - diff --git a/src/templates/home.php b/src/templates/home.php index 0c8638d..fc40646 100644 --- a/src/templates/home.php +++ b/src/templates/home.php @@ -13,11 +13,9 @@

- Developing, maintaining and hosting this application costs personal time and money. Almost 20.000 users access the application - each month to perform over 28.000 polls. This increase in traffic will exceed the current hosting soon and requires additional - funding. I would also like to setup mirrors around the world for comparable loading times. To keep the page ad-free, I am asking + Developing, maintaining and hosting this application costs personal time and money. To keep the page ad-free, I am asking for your help. If you would like to support my efforts and help keep the lights on, you can either donate through the button below - or become an official sponsor. + or become an official sponsor.

diff --git a/src/templates/impressum.html b/src/templates/impressum.html deleted file mode 100644 index 6edfe8c..0000000 --- a/src/templates/impressum.html +++ /dev/null @@ -1,65 +0,0 @@ -

Impressum

-

Angaben gemäß § 5 TMG:

-

Thomas Fuchs
-Gartenstr. 10
-32825 Blomberg -

- -

Kontakt:

- - - - - - - - - -
Telefon:052354890140
E-Mail:webmaster@scrumpoker.online
- -

Haftungsausschluss (Disclaimer)

-

Haftung für Inhalte

-

Als Diensteanbieter sind wir gemäß § 7 Abs.1 TMG für eigene Inhalte auf diesen Seiten nach den - allgemeinen Gesetzen verantwortlich. Nach §§ 8 bis 10 TMG sind wir als Diensteanbieter jedoch nicht verpflichtet, übermittelte oder gespeicherte - fremde Informationen zu überwachen oder nach Umständen zu forschen, die auf eine rechtswidrige Tätigkeit hinweisen. Verpflichtungen zur - Entfernung oder Sperrung der Nutzung von Informationen nach den allgemeinen Gesetzen bleiben hiervon unberührt. Eine diesbezügliche Haftung ist - jedoch erst ab dem Zeitpunkt der Kenntnis einer konkreten Rechtsverletzung möglich. Bei Bekanntwerden von entsprechenden Rechtsverletzungen werden - wir diese Inhalte umgehend entfernen.

- -

Haftung für Links

-

Unser Angebot enthält Links zu externen Webseiten Dritter, - auf deren Inhalte wir keinen Einfluss haben. Deshalb können wir für diese fremden Inhalte auch keine Gewähr übernehmen. Für die Inhalte der - verlinkten Seiten ist stets der jeweilige Anbieter oder Betreiber der Seiten verantwortlich. Die verlinkten Seiten wurden zum Zeitpunkt der - Verlinkung auf mögliche Rechtsverstöße überprüft. Rechtswidrige Inhalte waren zum Zeitpunkt der Verlinkung nicht erkennbar. Eine permanente - inhaltliche Kontrolle der verlinkten Seiten ist jedoch ohne konkrete Anhaltspunkte einer Rechtsverletzung nicht zumutbar. Bei Bekanntwerden von - Rechtsverletzungen werden wir derartige Links umgehend entfernen.

- -

Datenschutzerklärung:

-

Datenschutz

-

Die Betreiber dieser Seiten nehmen den Schutz Ihrer persönlichen Daten sehr ernst. Wir behandeln Ihre personenbezogenen Daten vertraulich und - entsprechend der gesetzlichen Datenschutzvorschriften sowie dieser Datenschutzerklärung.

-

Die Nutzung unserer Webseite ist in der Regel ohne Angabe personenbezogener Daten möglich. Soweit auf unseren Seiten personenbezogene Daten - (beispielsweise Name, Anschrift oder E-Mail-Adressen) erhoben werden, erfolgt dies, soweit möglich, stets auf freiwilliger Basis. Diese Daten - werden ohne Ihre ausdrückliche Zustimmung nicht an Dritte weitergegeben.

-

Wir weisen darauf hin, dass die Datenübertragung im Internet (z.B. bei der Kommunikation per E-Mail) Sicherheitslücken aufweisen kann. Ein lückenloser - Schutz der Daten vor dem Zugriff durch Dritte ist nicht möglich.

- -

Datenschutzerklärung für die Nutzung von Google Analytics

-

Diese Website nutzt Funktionen des  Webanalysedienstes Google Analytics. Anbieter ist die Google Inc. 1600 Amphitheatre Parkway Mountain View, - CA 94043, USA. Google Analytics verwendet sog. "Cookies". Das sind Textdateien, die auf Ihrem Computer gespeichert werden und die eine Analyse der - Benutzung der Website durch Sie ermöglichen. Die durch den Cookie erzeugten Informationen über Ihre Benutzung dieser Website werden in der Regel - an einen Server von Google in den USA übertragen und dort gespeichert.

-

Im Falle der Aktivierung der IP-Anonymisierung auf dieser Webseite - wird Ihre IP-Adresse von Google jedoch innerhalb von Mitgliedstaaten der Europäischen Union oder in anderen Vertragsstaaten des Abkommens über - den Europäischen Wirtschaftsraum zuvor gekürzt. Nur in Ausnahmefällen wird die volle IP-Adresse an einen Server von Google in den USA übertragen - und dort gekürzt. Im Auftrag des Betreibers dieser Website wird Google diese Informationen benutzen, um Ihre Nutzung der Website auszuwerten, um - Reports über die Websiteaktivitäten zusammenzustellen und um weitere mit der Websitenutzung und der Internetnutzung verbundene Dienstleistungen - gegenüber dem Websitebetreiber zu erbringen. Die im Rahmen von Google Analytics von Ihrem Browser übermittelte IP-Adresse wird nicht mit anderen - Daten von Google zusammengeführt.

-

Sie können die Speicherung der Cookies durch eine entsprechende Einstellung Ihrer Browser-Software verhindern; wir weisen Sie jedoch darauf hin, - dass Sie in diesem Fall gegebenenfalls nicht sämtliche Funktionen dieser Website vollumfänglich werden nutzen können. Sie können darüber hinaus - die Erfassung der durch das Cookie erzeugten und auf Ihre Nutzung der Website bezogenen Daten (inkl. Ihrer IP-Adresse) an Google sowie die Verarbeitung - dieser Daten durch Google verhindern, indem sie das unter dem folgenden Link verfügbare Browser-Plugin herunterladen und installieren: - http://tools.google.com/dlpage/gaoptout?hl=de

- -

Quelle: eRecht24

diff --git a/src/templates/sponsors_view.php b/src/templates/sponsors_view.php deleted file mode 100644 index c61161a..0000000 --- a/src/templates/sponsors_view.php +++ /dev/null @@ -1,39 +0,0 @@ -
-

Becoming a sponsor

-

- If you want to support the project, you can become an official sponsor. There are three different levels of sponsoring and each is rewarded - with your logo and link in different places. The price for the next level always includes the previous levels privileges. Prices only show - the current price for each type and may change over time based on demand. To become an official sponsor please contact - sponsoring@scrumpoker.online with your company and logo URL, as well as the desired - sponsoring level. You will recieve an official invoice for your sponsorship, which makes it tax deductible for companies. Within 7 days after - payment the page will be updated with your logo. Alternatively if you contribute developer time or server resources, you can also be listed as a sponsor. -

- -
- - - - - - - - - -
LevelPrice annuallyLogo placement
Basic€Sponsors tab
Footer€Footer
Repo€README on GitHub
-
-
- -
-

Other Sponsors:

- - -
- -
-

Donors ( total):

- - -
- - - diff --git a/src/templates/templates.php b/src/templates/templates.php index 8db4b56..c2c65fa 100644 --- a/src/templates/templates.php +++ b/src/templates/templates.php @@ -61,8 +61,6 @@ public static function getAll() new Template("default_source.html", "templates/default_source.html"), new Template("add_source.html", "templates/add_source.html"), new Template("member.html", "templates/member.php"), - new Template("sponsors.html", "templates/sponsors_view.php", "Sponsors"), - new Template("impressum.html", "templates/impressum.html", "Impressum"), new Template("removal.html", "templates/removal.html"), new Template("404.html", "templates/404.html") ]; From f8854cdca4859fb09b4a164978b707cd2f8ee43b Mon Sep 17 00:00:00 2001 From: Toxantron Date: Sat, 10 Nov 2018 12:45:43 +0100 Subject: [PATCH 3/5] Remove sponsor styling --- src/css/scrumonline.css | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/src/css/scrumonline.css b/src/css/scrumonline.css index 5527f2d..b10f20e 100644 --- a/src/css/scrumonline.css +++ b/src/css/scrumonline.css @@ -311,32 +311,4 @@ div.issue-list { border-width: 1px 0; border-style: dotted; border-color: rgba(255, 255, 255, 0.7); -} - -/* Styling of sponsors */ -footer div.sponsors { - margin-left: 10%; - max-width: 80%; -} -div.sponsors a, span { - margin: 5px; -} -div.sponsors a img { - height: 40px; -} -/* Donors */ -div.donors>div { - margin: 10px; - display: inline-block; - vertical-align: top; -} -div.message { - font-style: italic; - max-width: 200px; - margin-bottom: 5px; -} -div.donor { - width: 100; - text-align: center; - font-weight: bold; } \ No newline at end of file From b2f24906bb1e85a3f090e67bbd2e934aacc47a7a Mon Sep 17 00:00:00 2001 From: Toxantron Date: Sat, 10 Nov 2018 20:04:19 +0100 Subject: [PATCH 4/5] Add markdown instructions --- doc/Poker-Tutorial.md | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/doc/Poker-Tutorial.md b/doc/Poker-Tutorial.md index a08460d..750a3f1 100644 --- a/doc/Poker-Tutorial.md +++ b/doc/Poker-Tutorial.md @@ -1 +1,34 @@ -_The poker process should be described here_ \ No newline at end of file +# Instructions +This page has detailed instructions how to use the app. It is written for the perspective of the session owner, which will be the Scrum Master or Product Owner in most cases, but also includes instructions for the team members. + +## Setup a Session +The first step is to setup a new session using the Create Session from on the front page. Pick a name for your session. It does not have to be unique or special, it is mostly for the overview of running sessions and as a title for your session view. Next select a card set for your session from the drop-down box. Those are the card-sets that are most popular and some were contributed by other users. If you need a different card set just click the question mark next to the drop-down to navigate to the file and open a pull request on GitHub. + +After setting the name and card set for your session, you can choose to declare your session as private. Unlike public sessions they can only be observed if spectators provide the password. Private sessions also require joining members to either join through invite or session id and password. Once you completed the form press Create and you will be redirected to your new session. + +## Invite Members +After you created the session, it is time to invite members and start estimating stories. Your team members have three options to join the session: + +1. **Session Id:** Members can join the session by entering the session id, displayed in the top right corner, on the main page. If you choose a private session you must also tell joining members the password for this joining process. +2. **Join URL:** In the bottom left of the session view, below the QR code is the URL to join the session. If you created the session the URL also contains the session token, which is necessary for authorization and access control. You can send this link to your team members to join the session. +3. **QR-Code:** The QR-Code equals the previously mentioned join ULR. It is only a convenience feature for teams who sit in the same room. Instead of typing the session id or copy&pasting the link your team members can use any QR-Code reader on their smartphones to quickly join the session. + +Independent from the method your team members pick, they all go through the Join Session form. After entering a member name, and in some cases the session password, they are redirected to the member view of your session. They can pick anything the want as a member name, it must however be unique within your session, otherwise it would not be possible to identify their votes later. In fact, it is not possible to have two members with the same name. Instead both members would then simly share the same view and overwrite each others vote in the process. + +The member view is optimized for mobile devices. It displays the title and description of the current poll at the top and all cards from the selected card set below. At the bottom of the page there is also a short explaination of the voting process. + +## Load Stories (optional) +Scrumpoker Online offers integrations for GitHub and JIRA, with more plugins under development. If you would like to use either one of those, select it from the tab control at the top and enter the necessary information to fetch issues from the server. Your credentials are not stored anywhere and only transmitted through an encrypted connection. If you are worried you can check for yourself on GitHub or follow the instructions to deploy the app on-premise. + +## First Estimation +To start the first estimation, enter topic and description of your feature or select an issue from the list, if you chose one the plugins in the previous step. As soon as you click Start, the poll begins and the stopwatch in the top right corner starts. Members of your team now see title and description of the current story on their devices and can start voting. + +Members of your team place votes by selecting on of the cards from their screen. The card is highlighted red to indicate the server is processing the vote. Once the vote was placed successfully the card is highlighted green. You will now see a card with a question mark (?) above that members name in your session view. Until the poll is completed and everyone has voted, members can still change their mind. They can retract their vote by pressing on the selected card again or simply select a different card. + +## Poll Completed +Once every member placed his vote, the poll is closed and the cards are flipped. At this time the stopwatch also stops and shows the overall estimation time. If the team directly reached a consensus, all cards are highlighted green to indicate a successful estimation. Otherwise the highest and lowest estimations are highlighted in red. The team members with the highlighted cards should now explain their decision. After all arguments were heared, you can simply restart the poll by clicking Start. This process is usually repeated until the team agres on a value. + +After you completed the first poll, the statistics are enabled. Statistics are shown in the table on the bottom left of the session view and are updated with every completed poll. You can enable and disable individual values depending on your interests. + +## Wrapping up +Once you are finished with the tasks for your next sprint or when the meeting is over, there is no need to close the session or "sign out". Simply close the window and go along with the rest of your day. If you estimate reguarly in the same team constilation you can bookmark your session as well as each member login and return anytime. \ No newline at end of file From 719f30482c64ab414a60df85ab551627fc2997f7 Mon Sep 17 00:00:00 2001 From: Toxantron Date: Sat, 10 Nov 2018 20:10:26 +0100 Subject: [PATCH 5/5] Reduce width on large screens --- src/templates/home.php | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/templates/home.php b/src/templates/home.php index fc40646..f85ae80 100644 --- a/src/templates/home.php +++ b/src/templates/home.php @@ -3,19 +3,17 @@ ?>
-
+

Scrum Online

- Welcome to my open source Planning Poker® web app. Use of this app is free of charge for everyone. As a scrum master just start - a named session and invite your team to join you. It is recommended to display the scrum master view on the big screen - (TV or projector) and let everyone else join via smartphone. To join a session just enter the id displayed in the - heading of the scrum master view. + Welcome to my open source Planning Poker® web app. Use of this app is free of charge for everyone. As a scrum master just start a named session + and invite your team to join you. It is recommended to display the scrum master view on the big screen (TV or projector) and let everyone else + join via smartphone. To join a session just enter the id displayed in the heading of the scrum master view or use the QR-Code.

- Developing, maintaining and hosting this application costs personal time and money. To keep the page ad-free, I am asking - for your help. If you would like to support my efforts and help keep the lights on, you can either donate through the button below - or become an official sponsor. + Developing, maintaining and hosting this application costs personal time and money. If you would like to support my efforts and help keep the + lights on, you can either donate through the button below or become an official sponsor.

@@ -27,10 +25,10 @@
-

Create or join a session

+

Create or join a session

-
+
Create session
@@ -73,7 +71,7 @@
-
+
Join session