Merge branch 'release/1.7.0'

llaske · Mar 28, 2023 · 9630e2a · 9630e2a
2 parents f766b33 + fb6e862
commit 9630e2a
Show file tree

Hide file tree

Showing 824 changed files with 380,263 additions and 290,051 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,4 +20,4 @@ jobs:
           port: ${{ secrets.PORT }} 
           script: | 
             cd sugarizer-dev/sugarizer 
-            git pull
+            git pull
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,65 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.7.0] - 2023-03-28
+### Added
+- Evaluation mode in Exerciser activity
+- Assignments support
+
+### Changed
+- Replace Bootstrap Tour by IntroJS in Sugarizer Core
+- Replace Bootstrap Tour by IntroJS in activities #1090
+- Fix touch support on smart board and touch PC
+- Better compatibility with iPad on iOS 13+
+- Add statistics feature in activities
+
+### Fixed
+- Scratch instructions are not localized #970
+- Wrong arrow icon in Exerciser activity #748
+- Improve responsive in Calculate activity #982
+- Overlap hover effect in circular mode view #974
+- No tooltip on home page and journal page #913
+- Localize and detail tooltip in Paint activity #1004
+- Off-center pictures in Abecedarium Activity #1001
+- Generate QRCode with enter in QRCode activity #1007
+- Implode Activity: fix Warning message button alignment #1025
+- Hover effect to Planet Activity #1029
+- Fraction jump tutorial navigation text issue #1035
+- Some button text is not in centre with the icon #1052
+- Dollar street activity not loading #985
+- Overlapping of "activity-palette" with "back-button" in Tangran and Curriculum activity #1055
+- Settings of Falabracman activity was overlapping with activity palette #1060
+- Overlapping of "activity-palette" in LabyrinthJS.activity #1073
+- Blank screen after using Sugarizer Server Dashboard #1079
+- Planet type is not localized in Planets activity #1076
+- Displaying message when MediaViewer activity is empty #1003
+- Add Previous/Next button in DollarStreet activity to navigate in images #1075
+- Fix SharedNotes tutorial don't start at end of home tutorial
+- Fix SharedNotes content is lost once disconnected #1144 
+- Tutorial steps missing at first launch #1089
+- Disabling Text selection for buttons #1151
+- Physics element are coming above toolbar #1064
+- Forbid create elements in Physics that're Bigger than canvas #1171
+- Template container interfering the Calligra Activity #1174
+- Background color of journal-container and body are same in some activities #1181
+- Bad handling of multitouch in Physics activity #849
+- Add score counter in Fractions Activity #1032
+- Increase Record video limit to 15s, remove size limit
+- Chess Activity : Step Number are not visible after 99 #1196
+- Speak activity UI enhancement #1201
+- TamTam Micro : Piano Color keys doesn't work when pressed near Black keys #1206
+- Dollar Street Activity sliders can overlap #1212
+- Blockrain Activity : rotate button unaligned #1232
+- Get Things Done Activity : plus button unaligned #1245
+- QR code Activity: buttons are unaligned #1253
+- Markdown Activity: Mouse pointer UI issue on scrollbar #1255
+- Physics Js Activity : Navbar still active in fullscreen mode #1290
+- Abecedarium Activity: Unexpected behaviour with language change button #1321
+- VideoViewer Activity add key mapping #1274
+- Chess Activity Moves Alignment Fix #1329
+- Stopwatch activity: Activity dropdown UI issue #1297
+- Ebook Activity : Add keys to paginate #1273
+
 ## [1.6.0] - 2022-01-04
 ### Added
 - Measure activity

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,12 +1,12 @@
 As all Open Source software, contributions to Sugarizer are welcome.
 
-A good way to start to contribute is testing and trying Sugarizer to find some issues. If you find one, don't be shy, submit your issue [here](https://github.com/llaske/Sugarizer/issues) by giving the maximum information on it, specifically detailed steps to reproduce it. We will check your issue and ask your more information if needed.
+A good way to start to contribute is testing and trying Sugarizer to find some issues. If you find one, don't be shy, submit your issue [here](https://github.com/llaske/Sugarizer/issues) by giving the maximum information on it, specifically detailed steps to reproduce it. We will check your issue and ask you more information if needed.
 
-If you're a developper, the best way to start is to read the [architecture](docs/architecture.md) then to do the whole [tutorial](docs/tutorial.md). It will give you a good understanding of Sugarizer internal.
+If you're a developer, the best way to start is to read the [architecture](docs/architecture.md) then to do the whole [tutorial](docs/tutorial.md). It will give you a good understanding of Sugarizer internal.
 
-When you think you're ready, you could try to fix some existing issues [here](https://github.com/llaske/Sugarizer/issues). If you find a fix, send a Pull Request, we will be please to review it.
+When you think you're ready, you could try to fix some existing issues [here](https://github.com/llaske/Sugarizer/issues). If you find a fix, send a Pull Request, we will be pleased to review it.
 
-Note than the **master** branch of the repository is for released/stable version, the **dev** branch is for development.
+Note that the **master** branch of the repository is for released/stable version, the **dev** branch is for development.
 
 So to send your Pull Request:
 

diff --git a/README.md b/README.md
@@ -24,21 +24,21 @@ Sugarizer on Android is also available as a launcher to replace the current laun
 
 You could also build yourself the Sugarizer Application APK using instruction below.
 
-![](images/googleplay.png)
-![](images/amazonstore.png)
-![](images/fdroid.png)
+<a href="https://play.google.com/store/apps/details?id=org.olpc_france.sugarizer">![](images/googleplay.png)</a>
+<a href="http://www.amazon.com/gp/product/B00NKK7PZA">![](images/amazonstore.png)</a>
+<a href="https://f-droid.org/repository/browse/?fdid=org.olpc_france.sugarizer">![](images/fdroid.png)</a>
 
 
 
 To run **Sugarizer Application on iOS**, download it on [Apple Store](https://itunes.apple.com/us/app/sugarizer/id978495303) or build yourself the Sugarizer Application IPA using instructions below.
 
-![](images/applestore.png)
+<a href="https://apps.apple.com/us/app/sugarizer/id978495303">![](images/applestore.png)</a>
 
 To run **Sugarizer Application on GNU Linux/Mac OS/Windows**, download it [here](https://sugarizer.org#desktop).
 The Sugarizer desktop application has four possible arguments:
 
 * `--window` to open Sugarizer in a window (instead of fullscreen)
-* `--debug` to open Sugarizer with the debug console
+* `--sdebug` to open Sugarizer with the debug console
 * `--logoff` to logoff the previous user if one is connected (unsynchronized content will be lost)
 * `--init` to remove all existing Journal and settings (all will be lost)
 
@@ -214,7 +214,7 @@ Refer [this](docs/ios/ios_doc.md) documentation for building sugarizer for iOS.
 
 # Reduce package size
 
-The current size of Sugarizer is more than 350 Mb. This huge size is related to media content and resources include in three activities:
+The current size of Sugarizer is more than 400 Mb. This huge size is related to media content and resources include in three activities:
 
 * **Abecedarium activity**: about 150 Mb
 * **Etoys activity**: about 100 Mb

diff --git a/activities/Abacus.activity/css/activity.css b/activities/Abacus.activity/css/activity.css
@@ -1,3 +1,8 @@
+body {
+	overflow-x: hidden;
+	overflow-y: hidden;
+} 
+
 #main-toolbar #activity-button {
   background-image: url(../activity/activity-icon.svg);
 }
@@ -192,119 +197,119 @@ border-radius: 5.5px;
 #copytext {
   z-index: -1;
 }
-
-.tutorial-title {
-	background-color: #808080 !important;
-	color: #ffffff !important;
-}
-
-.tutorial-prev-icon {
-	display: inline-flex;
-	width: 90px;
-}
-
-.tutorial-prev-icon.icon-button {
-	color: white;
+introjs-overlay {
+	background-color: #000 !important;
+	opacity: .8 !important;
 }
 
-.tutorial-prev-icon.icon-button.disabled {
-	color: black;
-}
-
-.tutorial-prev-icon1 {
-	margin-left: 6px;
-	margin-top: 6px;
-}
-
-.tutorial-prev-icon2 {
-	background-image: url(../icons/go-left.svg);
-	width: 20px;
-	height: 20px;
-	background-size: 20px 20px;
-}
-
-.tutorial-prev-icon3 {
-	display: none;
-	width: 20px;
-	height: 20px;
-	background-size: 20px 20px;
-	background-color: white;
-	margin-top: -20px;
+.introjs-tooltip {
+	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif!important;
+	border-radius: 6px !important;
+	padding: 2px 1px !important;
+	font-size: 14px !important;
 }
 
-.tutorial-next-icon {
-	display: inline-flex;
-	width: 90px;
-}
+.introjs-helperLayer{
+	background: inherit !important;
+	opacity: 0.6 !important;
+}  
 
-.tutorial-next-icon.icon-button {
-	color: white;
+.customTooltip .introjs-tooltip-header {
+	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+	color : #ffffff;
+	text-shadow: none;
+	background-color: #808080;
+	margin: 0;
+	padding: 0px 10px;
+	border-bottom: 1px solid #ebebeb;
+	border-radius: 5px 5px 0 0;
 }
 
-.tutorial-next-icon.icon-button.disabled {
-	color: black;
+.customTooltip .introjs-tooltip-title {
+	font-size: 14px;
+	padding: 0px 8px;
+	font-weight: 800;
 }
 
-.tutorial-next-icon1 {
-	margin-left: 6px;
-	margin-top: 6px;
+.customTooltip .introjs-tooltiptext {
+	color: #000000;
+	line-height: 1.42857143;
 }
 
-.tutorial-next-icon2 {
+.customTooltip .introjs-skipbutton {
+	float: right;
+	cursor: pointer;
+	background-image: url(../icons/dialog-cancel.svg);
+	width: 25px;
+	height: 25px;
+	background-size: 25px 25px;
+	margin-top: 2px;
+	padding: 0px;
+	text-indent: 100%;
+	white-space: nowrap;
+	overflow: hidden;
+}  
+
+.customTooltip .introjs-nextbutton::before {
+	content: "";
+	margin-right: 6px;
 	background-image: url(../icons/go-right.svg);
 	width: 20px;
 	height: 20px;
 	background-size: 20px 20px;
 }
 
-.tutorial-next-icon3 {
-	display: none;
+.customTooltip .introjs-prevbutton::before {
+	content: "";
+	margin-right: 6px;
+	background-image: url(../icons/go-left.svg);
 	width: 20px;
 	height: 20px;
 	background-size: 20px 20px;
-	background-color: white;
-	margin-top: -20px;
 }
 
-.tutorial-end-icon {
-	display: inline-flex;
-	width: 90px;
+.customTooltip .introjs-tooltipbuttons {
+	display: flex;
+	flex-wrap:wrap;
+	justify-content: center;
+	align-items: center;
+	cursor: pointer;
+	border-top: 0px;
+	padding: 0px;
+	text-align: center;
+	white-space: normal;
 }
 
-.tutorial-end-icon.icon-button {
-	color: white;
-}
-
-.tutorial-end-icon.icon-button.disabled {
-	color: black;
-}
-
-.tutorial-end-icon1 {
-	margin-left: 6px;
-	margin-top: 6px;
+.customTooltip .introjs-button {
+	text-shadow: none;
+	border-radius: 22px;
+	margin: 5px 8px 8px 8px;
+	width: fit-content;
+	background-color: #808080 !important;
+	display: flex !important;
+	align-items: center !important;
+	color: white !important;
+	padding: 6px 20px 6px 10px;
+	border: 0px;
 }
 
-.tutorial-end-icon2 {
-	background-image: url(../icons/dialog-cancel.svg);
-	width: 20px;
-	height: 20px;
-	background-size: 20px 20px;
+.customTooltip .introjs-button:focus {
+	-webkit-box-shadow: 0 0 0 0rem rgba(158, 158, 158, .5);
+	box-shadow: 0 0 0 0rem rgba(158, 158, 158, .5);
+	border: 0px;
+	background-color: #808080 !important;
 }
 
-.tutorial-end-icon3 {
-	display: none;
-	width: 20px;
-	height: 20px;
-	background-size: 20px 20px;
-	background-color: white;
-	margin-top: -20px;
+.customTooltip .introjs-disabled {
+	color: black !important;
+	border: 0px;
+	opacity: .65;
 }
 
-.icon-tutorial-text {
-	margin-top: 7px;
-	padding-left: 4px;
-	padding-right: 38px;
-	display: inline-block;
+.customTooltip .introjs-disabled:focus {
+	-webkit-box-shadow: 0 0 0 0rem rgba(158, 158, 158, .5);
+	box-shadow: 0 0 0 0rem rgba(158, 158, 158, .5);
+	border: 0px;
 }
 
 .web-activity-icon {