Skip to content

Commit

Permalink
Revert "Merge branch 'master' of https://github.com/ecraft2learn/uui"
Browse files Browse the repository at this point in the history 
This reverts commit 369ad1a, reversing
changes made to 9c24605.
  • Loading branch information
@phlindstedt
phlindstedt committed Sep 11, 2018
1 parent b119142 commit 6535c4d
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 32 deletions.
1 change: 0 additions & 1 deletion about/3d-slice-help.html
View file

This file was deleted.

2 changes: 1 addition & 1 deletion dialogs/new_project.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h3>New Project</h3>
<span class="input-state-error mif-warning"></span> Project name cannot be empty
</span>
<br>
<button class="button primary" onclick="$(this).closest('form').submit();">Create</button>
<button onclick="$(this).closest('form').submit();" class="button primary">Create</button>
</form>
<script>
function createNewProject() {
Expand Down
54 changes: 24 additions & 30 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@
<!-- UEF Tools -->
<!--UEF Ideation-->
<div data-role="tile" class="tile bg-ideation fg-white" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','eCraft Search');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','eCraft Search');"></span>
<span class="mif-question badge-medium-top m-0 bg-transparent" onclick="infoClick('./about/ecraft-search-help.html', '#eCraftSearchDialog');"></span>
<div class="slide-front" onclick="tileClick('./uef/search/index.html', 'eCraft Search', event);">
<img class="icon" src="./images/google-drive-logo-flat.png">
Expand All @@ -755,7 +755,7 @@
</div>
</div>
<div data-role="tile" class="tile bg-ideation fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Inspiratorium');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Inspiratorium');"></span>
<span class="mif-question badge-medium-top m-0 bg-transparent" onclick="infoClick('./about/inspiratorium-help.html', '#inspiratoriumDialog');"></span>
<div class="slide-front" onclick="tileClick('http://ecraft.zsi.at/', undefined, event);">
<img class="icon" src="./images/inspiratorium_logo.svg">
Expand All @@ -770,7 +770,7 @@
<div class="tiles-grid tiles-group size-2 fg-white mb-15" data-group-title="Plan">
<!--UEF Ideation-->
<div data-role="tile" class="tile bg-plan fg-white" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','eCraft Plan');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','eCraft Plan');"></span>
<span class="mif-question badge-medium-top m-0 bg-transparent" onclick="infoClick('./about/ecraft-idea-help.html', '#eCraftIdeaDialog');"></span>
<div class="slide-front" onclick="tileClick('./uef/ideation/index.html', 'eCraft Idea', event);">
<img class="icon" src="./images/google-drive-logo-flat.png">
Expand All @@ -793,7 +793,7 @@
</div>
<!-- Trello -->
<div data-role="tile" data-size="small" class="tile bg-plan fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Trello');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Trello);"></span>
<span class="mif-question badge-small-top m-0 p-0 bg-transparent" onclick="infoClick('./about/trello-help.html', '#TrelloDialog');"></span>
<div class="slide-front" onclick="tileClick('https://trello.com/', undefined, event);">
<img class="icon" width="50%" src="./images/trello-logo.png">
Expand All @@ -807,7 +807,7 @@
<div class="tiles-grid tiles-group size-2 fg-white mb-15" data-group-title="Create">
<!-- TinkerCad 3D Design -->
<div data-role="tile" class="tile bg-create fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','TinkerCad 3D Design');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','TinkerCad 3D Design');"></span>
<span class="mif-question badge-medium-top m-0 bg-transparent" onclick="infoClick('./about/tinkercad-3d-design-help.html', '#TinkerCad3DDesignDialog');"></span>
<div class="slide-front" onclick="tileClick('https://www.tinkercad.com/#/?type=tinkercad&collection=designs', 'TinkerCad 3D Design', event);">
<img class="icon" src="./images/tinkercad-logo.png">
Expand All @@ -819,7 +819,7 @@
</div>
<!-- TinkerCad Circuit Design -->
<div data-role="tile" class="tile bg-create fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','TinkerCad Circuits');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','TinkerCad Circuits');"></span>
<span class="mif-question badge-medium-top m-0 bg-transparent" onclick="infoClick('./about/tinkercad-circuit-design-help.html', '#TinkerCadCircuitDesignDialog');"></span>
<div class="slide-front" onclick="tileClick('https://www.tinkercad.com/#/?type=circuits&collection=designs', 'TinkerCad Circuit Design', event);">
<img class="icon" src="./images/tinkercad-logo.png">
Expand All @@ -831,19 +831,19 @@
</div>
<!-- Beetle Blocks -->
<div data-role="tile" class="tile bg-create fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Beetle Blocks');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Beetle Blocks');"></span>
<span class="mif-question badge-medium-top m-0 bg-transparent" onclick="infoClick('./about/beetleblocks-help.html', '#BeetleBloxDialog');"></span>
<div class="slide-front" onclick="tileClick('http://beetleblocks.com/run/', undefined, event);">
<div class="slide-front" onclick="tileClick('http://beetleblocks.com/', undefined, event);">
<img class="icon" src="./images/beetle-blocks.png">
<span class="branding-bar">Beetle Blocks</span>
</div>
<div class="slide-back text-small d-flex flex-justify-center flex-align-center p-3" onclick="tileClick('http://beetleblocks.com/run/', undefined, event);">
<div class="slide-back text-small d-flex flex-justify-center flex-align-center p-3" onclick="tileClick('http://beetleblocks.com/', undefined, event);">
Design a 3D model through programming
</div>
</div>
<!-- 3D slincing -->
<div data-role="tile" class="tile bg-create fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-question badge-medium-top m-0 bg-transparent" onclick="infoClick('./about/3d-slice-help.html', 'Slicer', event);"></span>
<span class="mif-question badge-medium-top m-0 bg-transparent" onclick="tileClick('./uef/slice/index.html', 'Slicer', event);"></span>
<div class="slide-front" onclick="tileClick('./uef/slice/index.html', 'Slicer', event);">
<img class="icon" src="./images/slice.png">
<span class="branding-bar">3D slicing</span>
Expand All @@ -854,7 +854,7 @@
</div>
<!-- 3D Slah -->
<div data-role="tile" data-size="small" class="tile bg-create fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','3D Slash');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','3D Slash');"></span>
<span class="mif-question badge-small-top m-0 p-0 bg-transparent" onclick="infoClick('./about/3d-slash-help.html', '#3DSlashDialog');"></span>
<div class="slide-front" onclick="tileClick('https://www.3dslash.net/slash.php', '3D Slash', event);">
<img class="icon" width="50%" src="./images/3d-slash-logo.png">
Expand All @@ -865,7 +865,7 @@
</div>
<!-- Cura -->
<div data-role="tile" data-size="small" class="tile bg-create fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Cura');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Cura');"></span>
<span class="mif-question badge-small-top m-0 p-0 bg-transparent" onclick="infoClick('./about/cura-help.html', '#CuraDialog');"></span>
<div class="slide-front" onclick="infoClick('./about/cura-help.html', '#CuraDialog');">
<img class="icon" width="50%" src="./images/cura-logo.png">
Expand All @@ -879,7 +879,7 @@
<div class="tiles-grid tiles-group size-2 fg-white mb-15" data-group-title="Program">
<!-- SNAP -->
<div data-role="tile" class="tile bg-ardu-pi fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Snap!');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Snap!');"></span>
<span class="mif-question badge-medium-top m-0 bg-transparent" onclick="infoClick('./about/snap-help.html', '#SnapDialog');"></span>
<div class="slide-front" onclick="tileClick('./snap/snap.html','Snap!', event);">
<img class="icon" src="./images/snap_logo-110.png">
Expand All @@ -891,7 +891,7 @@
</div>
<!-- SNAP4ARDUINO -->
<div data-role="tile" class="tile bg-arduino fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Snap4Arduino');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Snap4Arduino');"></span>
<span class="mif-question badge-medium-top m-0 bg-transparent" onclick="infoClick('./about/snap4arduino-help.html', '#Snap4ArduinoDialog');"></span>
<div class="slide-front" onclick="tileClick('./snap4arduino/index.html','Snap4Arduino', event);">
<img class="icon" src="./images/snap_logo-110.png">
Expand All @@ -903,7 +903,7 @@
</div>
<!-- ARDUBLOCK -->
<div data-role="tile" data-size="small" class="tile bg-arduino fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Ardublock');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Ardublock');"></span>
<span class="mif-question badge-small-top m-0 p-0 bg-transparent" onclick="infoClick('./about/ardublock-help.html', '#ArdublockDialog');"></span>
<div class="slide-front" onclick="infoClick('./about/cura-help.html', '#ArdublockDialog');">
<span class="tile-image icon"><span class='notranslate' translate='no'>A</span></span>
Expand All @@ -914,7 +914,7 @@
</div>
<!-- SCRATCH 4 RPi -->
<div data-role="tile" data-size="small" class="tile bg-raspberry fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Scratch for RPi');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Scratch for RPi');"></span>
<span class="mif-question badge-small-top m-0 p-0 bg-transparent" onclick="infoClick('./about/scratch-4-raspberry-pi.html', '#Scratch4RPiDialog');"></span>
<div class="slide-front" onclick="tileClick('https://scratch.mit.edu/', undefined, event);">
<img class="icon" src="./images/scratch-logo-small.png">
Expand All @@ -925,7 +925,7 @@
</div>
<!-- SCRATCH 4 ARDUINO -->
<div data-role="tile" data-size="small" class="tile bg-arduino fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Scratch for Arduino');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Scratch for Arduino');"></span>
<span class="mif-question badge-small-top m-0 p-0 bg-transparent" onclick="infoClick('./about/scratch-4-arduino.html', '#Scratch4ArduDialog');"></span>
<div class="slide-front" onclick="tileClick('http://s4a.cat/', undefined, event);">
<img class="icon" src="./images/scratch-logo-small.png">
Expand All @@ -936,7 +936,7 @@
</div>
<!-- APP INVENTOR -->
<div data-role="tile" data-size="small" class="tile bg-ardu-pi fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','App Inventor');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','App Inventor');"></span>
<span class="mif-question badge-small-top m-0 p-0 bg-transparent" onclick="infoClick('./about/app-inventor-help.html', '#AppInventorDialog');"></span>
<div class="slide-front" onclick="tileClick('http://ai2.appinventor.mit.edu/', undefined, event);">
<img class="icon" src="./images/app-inventor-allwhite.png">
Expand All @@ -947,7 +947,7 @@
</div>
<!-- POCKET CODE -->
<div data-role="tile" data-size="small" class="tile bg-ardu-pi fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Pocket Code');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Pocket Code');"></span>
<span class="mif-question badge-small-top m-0 p-0 bg-transparent" onclick="infoClick('./about/pocket-code-help.html', '#PocketCodeDialog');"></span>
<div class="slide-front" onclick="tileClick('https://www.catrobat.org/intro/', undefined, event);">
<img class="icon" src="./images/pocket-code-allwhite.png">
Expand All @@ -958,7 +958,7 @@
</div>
<!-- NETSBLOX -->
<div data-role="tile" data-size="small" class="tile bg-ardu-pi fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','NetsBlox');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','NetsBlox');"></span>
<span class="mif-question badge-small-top m-0 p-0 bg-transparent" onclick="infoClick('./about/netsblox-help.html', '#NetsBloxDialog');"></span>
<div class="slide-front" onclick="tileClick('https://editor.netsblox.org/','NetsBlox', event);">
<img class="icon" src="./images/netsblox.png">
Expand All @@ -969,7 +969,7 @@
</div>
<!-- ARDUINO IDE -->
<div data-role="tile" data-size="small" class="tile bg-arduino fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Arduino IDE');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Arduino IDE');"></span>
<span class="mif-question badge-small-top m-0 p-0 bg-transparent" onclick="infoClick('./about/arduino-ide-help.html', '#ArduinoIdeDialog');"></span>
<div class="slide-front" onclick="tileClick('https://create.arduino.cc/editor', undefined, event);">
<img class="icon" src="./images/arduino-ide.png">
Expand All @@ -993,7 +993,7 @@
<div class="tiles-grid tiles-group size-1 fg-white mb-15" data-group-title="Share">
<!--Thingiverse-->
<div data-role="tile" class="tile bg-share fg-white no-mobile" data-effect="hover-slide-up">
<span class="mif-bubble badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Thingiverse');"></span>
<span class="mif-bubbles badge-medium-top pr-4 bg-transparent" onclick="openFeedbackWindow('./lnu/commenting/index.html','Thingiverse');"></span>
<span class="mif-question badge-medium-top m-0 bg-transparent" onclick="infoClick('./about/thingiverse-help.html', '#ThingiverseDialog');"></span>
<div class="slide-front" onclick="tileClick('https://www.thingiverse.com/','Thingiverse', event);">
<img class="icon" src="./images/thingiverse-logo.png">
Expand Down Expand Up @@ -1129,7 +1129,7 @@ <h1 class="text-light mt-4">Login to eCraft2Learn</h1>

var sessionId = $('#manual-session').val();

if (sessionId && sessionId.trim() !== '') {
if (sessionId.trim() !== '') {

$.ajax({

Expand Down Expand Up @@ -1160,14 +1160,8 @@ <h1 class="text-light mt-4">Login to eCraft2Learn</h1>
function HandleLoginCallback(phpResponse){
handleSelectUserResponse(phpResponse);
if(window.sessionStorage.getItem("errorStatus")=="fail"){

var sessionId = $('#manual-session').val();

if (sessionId && sessionId.trim() !== '')
addUser($('#username').val(), sessionId, 1);
else
//TODO: I am assuming that the new user IS a group user. Later we should ask the user and act accordingly
addUser($("#username").val(), $("#pilotsite").val(), 1);
addUser($("#username").val(), $("#pilotsite").val(), 1);
location.reload();
}
else{
Expand Down

0 comments on commit 6535c4d

Please sign in to comment.