Page 1 of 1
Dashticz v3.7.2 beta (read update instructions!!)
Posted: Monday 28 December 2020 22:53
by Lokonli
A new beta release.
Update instructions
I've removed 'custom/custom.css' and 'custom/custom.js' from the Dashticz repository, because these are user configuration files, and should not be part of the Dashticz repository.
However, that means this update cannot be installed with git pull directly, because then git will report an error if you have modified one or both files.
To solve this, first make a backup of these two files:
Code: Select all
mv custom/custom.js custom/custom.js.bak
mv custom/custom.css custom/custom.css.bak
And if you use the custom_2 folder, then repeat this for that folder:
Code: Select all
mv custom_2/custom.js custom_2/custom.js.bak
mv custom_2/custom.css custom_2/custom.css.bak
Then update to the latest version as usual:
And restore your backups::
Code: Select all
mv custom/custom.js.bak custom/custom.js
mv custom/custom.css.bak custom/custom.css
and for custom_2:
Code: Select all
mv custom_2/custom.js.bak custom_2/custom.js
mv custom_2/custom.css.bak custom_2/custom.css
You only have to do this once: Next updates can be installed with a normal 'git pull'
Enhancements
- Calendar: New block parameter 'emptytext' to define the text to show where there are no calendar appointments. Only works for the new calendar block.
- Custom graph: aggregate parameter can be an array to specify different aggregation methods per data element.
- Graph: New parameters 'axisRight' to show the first Y axis on the right (default is 'false'), and 'axisAlternating' to show Y axes alternating left/right (default: 'true').
- Support for device (sub)type Managed Counter
- Flipclock: New block parameters showSeconds (true or false) and clockFace (12 or 24)
- Security panel: New block parameters ( decorate, headerText, footerText, scale).
Fixes
- Graph: Fix for data acquistion day graph gas device.
- Colorpicker: Some fixes in warm white/cold white color setting.
- Improved styling of modal popup windows.
Release notes
https://dashticz.readthedocs.io/en/beta ... notes.html
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Tuesday 29 December 2020 9:36
by pvklink
Hi @lokonli
I use two custom folders
custom and custom_2
Do i have to rename both folders before upgrading ?
and you move the bak file to the same name !
mv custom/custom.css.bak custom/custom.css.bak
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Tuesday 29 December 2020 10:11
by Lokonli
pvklink wrote: ↑Tuesday 29 December 2020 9:36
Hi @lokonli
I use two custom folders
custom and custom_2
Do i have to rename both folders before upgrading ?
and you move the bak file to the same name !
mv custom/custom.css.bak custom/custom.css.bak
Yes, and thanks, I've updated the instructions in the first post.
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Tuesday 29 December 2020 10:26
by pvklink
Hi, i changed my update procedure, but still no update!
Code: Select all
#!/bin/bash
# update van dashticz/ Eerst een copy,m dan update. Als t fout gaat nieuwe folder rename naar oud en de bck de nieuwe naam geven
echo "please standby... (Bezig met backuppen Dashticz)"
sudo cp -R /home/pi/dashticz /home/pi/dashticz_bck
cd /home/pi/dashticz
echo "please standby... (Bezig met renamen custom files)"
mv custom/custom.js custom/custom.js.bak
mv custom/custom.css custom/custom.css.bak
mv custom_2/custom.js custom_2/custom.js.bak
mv custom_2/custom.css custom_2/custom.css.bak
#echo "please standby... (Bezig met updaten Dashticz)"
sudo git pull
echo "please standby... (Bezig met renamen custom files)"
mv custom/custom.js.bak custom/custom.js
mv custom/custom.css.bak custom/custom.css
mv custom_2/custom.js.bak custom_2/custom.js
mv custom_2/custom.css.bak custom_2/custom.css
#echo "please standby... (Bezig met updaten Dashticz patch)"
#sudo git checkout beta
#sudo git pull
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Tuesday 29 December 2020 10:31
by pvklink
when i move the files and do a git pull
git pull i get:
Updating bd8b65e..cd4f3a6
error: Your local changes to the following files would be overwritten by merge:
dist/bundle.js
docs/blocks/domoticzblocks.rst
docs/blocks/graphs.rst
docs/blocks/specials/clock.rst
docs/blocks/specials/security_panel.rst
docs/releasenotes/releasenotes.rst
index.html
js/blocktypes.js
js/colorpicker.js
js/components/calendar.js
js/components/flipclock.js
js/components/garbage.js
js/components/graph.js
js/components/secpanel.js
js/dt_function.js
src/templateengine.js
tpl/secpanel.tpl
version.txt
Please commit your changes or stash them before you merge.
Aborting
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Tuesday 29 December 2020 11:10
by Lokonli
pvklink wrote: ↑Tuesday 29 December 2020 10:31
when i move the files and do a git pull
git pull i get:
Updating bd8b65e..cd4f3a6
error: Your local changes to the following files would be overwritten by merge:
dist/bundle.js
docs/blocks/domoticzblocks.rst
docs/blocks/graphs.rst
docs/blocks/specials/clock.rst
docs/blocks/specials/security_panel.rst
docs/releasenotes/releasenotes.rst
index.html
js/blocktypes.js
js/colorpicker.js
js/components/calendar.js
js/components/flipclock.js
js/components/garbage.js
js/components/graph.js
js/components/secpanel.js
js/dt_function.js
src/templateengine.js
tpl/secpanel.tpl
version.txt
Please commit your changes or stash them before you merge.
Aborting
Can it be that you did some manual copying of files in the past?
Can you post the output of 'git status'?
Recipe to return to an unchanged state:
First make a backup of the complete Dashticz folder (just to be able to recover from errors ...)
Start from the Dashticz home folder. Then:
The script below assumes that your dashticz folder is named 'dashticz'.
Change it to your own dashticz folder name (two lines)
Code: Select all
#Go to the parent
cd ..
#Create a copy (can take some time! Be patient ...)
cp -r dashticz dashticzbak
#Enter Dashticz folder
cd dashticz
#Move the configuration files if not done already
mv custom/custom.css custom/custom.css.bak
mv custom/custom.js custom/custom.js.bak
mv custom_2/custom.css custom_2/custom.css.bak
mv custom_2/custom.js custom_2/custom.js.bak
#Bring back your local repository to a clean state. This will delete all files that you changed
#The renamed files custom.css and custom.js will not be deleted.
git reset --hard HEAD
#Update to the latest version
git pull
#Move back your configuration files
mv custom/custom.css.bak custom/custom.css
mv custom/custom.js.bak custom/custom.js
mv custom_2/custom.css.bak custom_2/custom.css
mv custom_2/custom.js.bak custom_2/custom.js
You can remove your Dashticz backup folder after testing.
From the dashticz parent folder:
And then next time, just a simple 'git pull' in the Dashticz folder will be sufficient
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Tuesday 29 December 2020 11:17
by pvklink
Code: Select all
git status
On branch beta
Your branch is behind 'origin/beta' by 23 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: .babelrc
modified: .eslintrc.js
modified: .gitignore
modified: .jsbeautifyrc
modified: .prettierignore
modified: .prettierrc
modified: .vscode/settings.json
modified: Dockerfile
modified: Makefile
modified: README.md
modified: babel.config.js
modified: bin/glob-ls.js
modified: css/helpers.css
modified: css/plugins.css
modified: css/sortable.css
deleted: custom/CONFIG_DEFAULT.js
deleted: custom/custom.DEFAULT.js
deleted: custom/custom.css
deleted: custom/custom.js
deleted: custom_2/CONFIG_DEFAULT.js
deleted: custom_2/custom.css
deleted: custom_2/custom.js
modified: dist/assets/fonts/fa-brands-400.eot
modified: dist/assets/fonts/fa-brands-400.svg
modified: dist/assets/fonts/fa-brands-400.ttf
modified: dist/assets/fonts/fa-brands-400.woff
modified: dist/assets/fonts/fa-brands-400.woff2
modified: dist/assets/fonts/fa-regular-400.eot
modified: dist/assets/fonts/fa-regular-400.svg
modified: dist/assets/fonts/fa-regular-400.ttf
modified: dist/assets/fonts/fa-regular-400.woff
modified: dist/assets/fonts/fa-regular-400.woff2
modified: dist/assets/fonts/fa-solid-900.eot
modified: dist/assets/fonts/fa-solid-900.svg
modified: dist/assets/fonts/fa-solid-900.ttf
modified: dist/assets/fonts/fa-solid-900.woff
modified: dist/assets/fonts/fa-solid-900.woff2
modified: dist/assets/fonts/glyphicons-halflings-regular.eot
modified: dist/assets/fonts/glyphicons-halflings-regular.svg
modified: dist/assets/fonts/glyphicons-halflings-regular.ttf
modified: dist/assets/fonts/glyphicons-halflings-regular.woff
modified: dist/assets/fonts/glyphicons-halflings-regular.woff2
modified: dist/assets/images/ui-icons_444444_256x240.png
modified: dist/assets/images/ui-icons_555555_256x240.png
modified: dist/assets/images/ui-icons_777620_256x240.png
modified: dist/assets/images/ui-icons_777777_256x240.png
modified: dist/assets/images/ui-icons_cc0000_256x240.png
modified: dist/assets/images/ui-icons_ffffff_256x240.png
modified: dist/bundle.js
modified: docs/Makefile
modified: docs/_static/.gitignore
modified: docs/_static/css/custom.css
modified: docs/_themes/sphinx_rtd_theme/__init__.py
modified: docs/_themes/sphinx_rtd_theme/breadcrumbs.html
modified: docs/_themes/sphinx_rtd_theme/footer.html
modified: docs/_themes/sphinx_rtd_theme/layout.html
modified: docs/_themes/sphinx_rtd_theme/search.html
modified: docs/_themes/sphinx_rtd_theme/searchbox.html
modified: docs/_themes/sphinx_rtd_theme/static/css/badge_only.css
modified: docs/_themes/sphinx_rtd_theme/static/css/theme.css
modified: docs/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf
modified: docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot
modified: docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
modified: docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf
modified: docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff
modified: docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff2
modified: docs/_themes/sphinx_rtd_theme/static/js/modernizr.min.js
modified: docs/_themes/sphinx_rtd_theme/static/js/theme.js
modified: docs/_themes/sphinx_rtd_theme/theme.conf
modified: docs/_themes/sphinx_rtd_theme/versions.html
modified: docs/blocks/blocks.rst
modified: docs/blocks/buttons.rst
modified: docs/blocks/domoticzblocks.rst
modified: docs/blocks/frames.rst
modified: docs/blocks/framesexample.jpg
modified: docs/blocks/graphs.rst
modified: docs/blocks/img/659_1_2.jpg
modified: docs/blocks/img/block659.jpg
modified: docs/blocks/img/block659_4_custom.jpg
modified: docs/blocks/img/block659_w3.jpg
modified: docs/blocks/img/block_another.jpg
modified: docs/blocks/img/climate.jpg
modified: docs/blocks/img/climate_te_hu.jpg
modified: docs/blocks/img/colorpicker1.jpg
modified: docs/blocks/img/cprgb.jpg
modified: docs/blocks/img/cprgbw.jpg
modified: docs/blocks/img/cprgbwwz.jpg
modified: docs/blocks/img/customlabels.jpg
modified: docs/blocks/img/dial.png
modified: docs/blocks/img/evohome.png
modified: docs/blocks/img/graph_bar.jpg
modified: docs/blocks/img/graph_buttons1.png
modified: docs/blocks/img/graph_buttons2.png
modified: docs/blocks/img/graph_buttons3.png
modified: docs/blocks/img/graph_buttons4.png
modified: docs/blocks/img/graph_customheader_after.png
modified: docs/blocks/img/graph_customheader_before.png
modified: docs/blocks/img/graph_debug.jpg
modified: docs/blocks/img/graph_groupByDevice_tooltip1.png
modified: docs/blocks/img/graph_groupby_day.png
modified: docs/blocks/img/graph_stacked.png
modified: docs/blocks/img/graph_zoom_x.jpg
modified: docs/blocks/img/graph_zoom_x2.jpg
modified: docs/blocks/img/group_by_device_1.png
modified: docs/blocks/img/group_by_device_2.png
modified: docs/blocks/img/group_by_device_3.png
modified: docs/blocks/img/muligraph_patch4_1.png
modified: docs/blocks/img/muligraph_patch4_2.png
modified: docs/blocks/img/muligraph_patch4_3.png
modified: docs/blocks/img/muligraph_patch4_4.png
modified: docs/blocks/img/muligraph_patch4_5.png
modified: docs/blocks/img/multigraph3.png
modified: docs/blocks/img/multigraph4.png
modified: docs/blocks/img/multigraph5.png
modified: docs/blocks/img/multigraph6.png
modified: docs/blocks/img/multigraph_button_styling.jpg
modified: docs/blocks/img/multigraph_custom.png
modified: docs/blocks/img/multigraph_point_styling.jpg
modified: docs/blocks/img/multigraph_setpoints.png
modified: docs/blocks/img/p1.jpg
modified: docs/blocks/img/p1_custom.jpg
modified: docs/blocks/img/p1_legend.jpg
modified: docs/blocks/img/p1_legend_2.jpg
modified: docs/blocks/img/solar_1_default.jpg
modified: docs/blocks/img/solar_custom_legend.jpg
modified: docs/blocks/img/solar_default.jpg
modified: docs/blocks/img/solar_legend.jpg
modified: docs/blocks/img/solar_yellow_bar.jpg
modified: docs/blocks/img/tooltiptotal_array.png
modified: docs/blocks/img/tooltiptotal_false.png
modified: docs/blocks/img/tooltiptotal_true.png
modified: docs/blocks/img/water.jpg
modified: docs/blocks/specials.rst
modified: docs/blocks/specials/Stationclock.jpg
modified: docs/blocks/specials/alarmmeldingen.JPG
modified: docs/blocks/specials/alarmmeldingen.rst
modified: docs/blocks/specials/blocktitle.rst
modified: docs/blocks/specials/calendar.jpg
modified: docs/blocks/specials/calendar.rst
modified: docs/blocks/specials/camera_block.gif
modified: docs/blocks/specials/camera_block.jpg
modified: docs/blocks/specials/cameras.rst
modified: docs/blocks/specials/clock.jpg
modified: docs/blocks/specials/clock.rst
modified: docs/blocks/specials/clocks.jpg
modified: docs/blocks/specials/custom9292.png
modified: docs/blocks/specials/customstreamplayer.png
modified: docs/blocks/specials/dial.rst
modified: docs/blocks/specials/domoticzlog.png
modified: docs/blocks/specials/domoticzlog.rst
modified: docs/blocks/specials/garbage.rst
modified: docs/blocks/specials/gmChooseMaps.png
modified: docs/blocks/specials/googlemaps.png
modified: docs/blocks/specials/googlemaps.rst
modified: docs/blocks/specials/haymanclock.jpg
modified: docs/blocks/specials/html.rst
modified: docs/blocks/specials/img/blocktitle.jpg
modified: docs/blocks/specials/img/calendar0.png
modified: docs/blocks/specials/img/calendar1.jpg
modified: docs/blocks/specials/img/calendar1.png
modified: docs/blocks/specials/img/calendar2.png
modified: docs/blocks/specials/img/calendar2_modal.png
modified: docs/blocks/specials/img/dial_dimmer.jpg
modified: docs/blocks/specials/img/dial_on-of_switch.jpg
modified: docs/blocks/specials/img/dial_p1-meter-cons.jpg
modified: docs/blocks/specials/img/dial_p1-meter-prod.jpg
modified: docs/blocks/specials/img/dial_temp-hum-baro.jpg
modified: docs/blocks/specials/img/dial_temp-humidity.jpg
modified: docs/blocks/specials/img/dial_wind.jpg
modified: docs/blocks/specials/img/dials.jpg
modified: docs/blocks/specials/img/flipclock.jpg
modified: docs/blocks/specials/img/haymanclock.jpg
modified: docs/blocks/specials/img/hb-dial.jpg
modified: docs/blocks/specials/img/humbar-dial.jpg
modified: docs/blocks/specials/img/longfonds.jpg
modified: docs/blocks/specials/img/miniclock.jpg
modified: docs/blocks/specials/img/timechart.gif
modified: docs/blocks/specials/img/timechart2.jpg
modified: docs/blocks/specials/img/timechart3.jpg
modified: docs/blocks/specials/img/toon_dial.jpg
modified: docs/blocks/specials/img/trafficinfo.jpg
modified: docs/blocks/specials/img/weatherwidget.jpg
modified: docs/blocks/specials/longfonds.rst
modified: docs/blocks/specials/moon.17.png
modified: docs/blocks/specials/moon.rst
modified: docs/blocks/specials/news.jpg
modified: docs/blocks/specials/news.rst
modified: docs/blocks/specials/nzbget.rst
modified: docs/blocks/specials/publictransport.rst
modified: docs/blocks/specials/secpanel.jpg
modified: docs/blocks/specials/security_panel.rst
modified: docs/blocks/specials/security_panel_block.jpg
modified: docs/blocks/specials/security_panel_frame.jpg
modified: docs/blocks/specials/sonarr.rst
modified: docs/blocks/specials/spotify.rst
modified: docs/blocks/specials/streamplayer.rst
modified: docs/blocks/specials/sunrise.jpg
modified: docs/blocks/specials/sunrise.rst
modified: docs/blocks/specials/timegraph.rst
modified: docs/blocks/specials/topbar.rst
modified: docs/blocks/specials/trafficinfo.rst
modified: docs/blocks/specials/traffictrain.png
modified: docs/blocks/specials/tv-guide.png
modified: docs/blocks/specials/tvguide.rst
modified: docs/blocks/specials/weather.rst
modified: docs/blocks/specials/weather_owm.png
modified: docs/blocks/specials/ziggohorizon.rst
modified: docs/columns.rst
modified: docs/conf.py
modified: docs/configuration.rst
modified: docs/customcss/Bulb_rgba.jpg
modified: docs/customcss/Customcode_bulb.jpg
modified: docs/customcss/Lmslargebuttons.jpg
modified: docs/customcss/block_120_css.jpg
modified: docs/customcss/block_120_lastupdate.jpg
modified: docs/customcss/cust_drop_down_block.jpg
modified: docs/customcss/customcss.rst
modified: docs/customcss/specialclasses.jpg
modified: docs/customization.rst
modified: docs/customjs/customjs.rst
modified: docs/dashticzconfiguration.rst
modified: docs/develop/code.rst
modified: docs/develop/design.rst
modified: docs/develop/develop.rst
modified: docs/develop/documentation.rst
modified: docs/develop/translations.rst
modified: docs/gettingstarted/automaticinstall.rst
modified: docs/gettingstarted/basicdashboard.rst
modified: docs/gettingstarted/guide_step_1.png
modified: docs/gettingstarted/guide_step_2.png
modified: docs/gettingstarted/index.rst
modified: docs/gettingstarted/installation.rst
modified: docs/gettingstarted/manualinstall.rst
modified: docs/img/dashticz-websocket.gif
modified: docs/index.rst
modified: docs/introduction.rst
modified: docs/make.bat
modified: docs/releasenotes/index.rst
modified: docs/releasenotes/releasenotes.rst
modified: docs/releasenotes/upgrading/upgrading.rst
modified: docs/releasenotes/upgrading/v320.rst
modified: docs/releasenotes/upgrading/v341.rst
modified: docs/releasenotes/upgrading/v349.rst
modified: docs/screens.rst
modified: docs/tipsandtricks.rst
modified: docs/tipsandtricks/buttonimage.jpg
modified: docs/troubleshooting/docker.rst
modified: docs/troubleshooting/index.rst
modified: dz_logo.png
modified: font/Audiowide.eot
modified: font/Audiowide.svg
modified: font/Audiowide.ttf
modified: font/Audiowide.woff
modified: font/Digital.eot
modified: font/Digital.svg
modified: font/Digital.ttf
modified: font/Digital.woff
modified: img/Coltemp48.png
modified: img/Customw48.png
modified: img/Customww48.png
modified: img/RGB48.png
modified: img/White48.png
modified: img/air.png
modified: img/alarm.png
modified: img/alarmeringen.png
modified: img/bg0.jpg
modified: img/bg1.jpg
modified: img/bg10.jpg
modified: img/bg11.jpg
modified: img/bg12.jpg
modified: img/bg13.jpg
modified: img/bg14.jpg
modified: img/bg2.jpg
modified: img/bg3.jpg
modified: img/bg4.jpg
modified: img/bg5.jpg
modified: img/bg6.jpg
modified: img/bg7.jpg
modified: img/bg8.jpg
modified: img/bg9.jpg
modified: img/bg_afternoon.jpg
modified: img/bg_morning.jpg
modified: img/bg_night.jpg
modified: img/bg_noon.jpg
modified: img/blinds_closed.png
modified: img/blinds_open.png
modified: img/buien_radar.png
modified: img/bulb.png
modified: img/bulb_off.png
modified: img/bulb_on.png
modified: img/bulbyellow.png
modified: img/bulbyellow_off.png
modified: img/bulbyellow_on.png
modified: img/coldwarm.jpg
modified: img/curtainclosed.png
modified: img/curtainopen.png
modified: img/dishwasher_240px.png
modified: img/dishwasher_off.png
modified: img/dishwasher_on.png
modified: img/door_closed.png
modified: img/door_open.png
modified: img/evohome.png
modified: img/fan.png
modified: img/fan_off.png
modified: img/fan_on.png
modified: img/favicon/android-chrome-192x192.png
modified: img/favicon/apple-touch-icon-114x114.png
modified: img/favicon/apple-touch-icon-120x120.png
modified: img/favicon/apple-touch-icon-144x144.png
modified: img/favicon/apple-touch-icon-152x152.png
modified: img/favicon/apple-touch-icon-180x180.png
modified: img/favicon/apple-touch-icon-57x57.png
modified: img/favicon/apple-touch-icon-60x60.png
modified: img/favicon/apple-touch-icon-72x72.png
modified: img/favicon/apple-touch-icon-76x76.png
modified: img/favicon/favicon-16x16.png
modified: img/favicon/favicon-32x32.png
modified: img/favicon/favicon-96x96.png
modified: img/favicon/favicon.ico
modified: img/favicon/largetile.png
modified: img/favicon/mediumtile.png
modified: img/favicon/smalltile.png
modified: img/favicon/widetile.png
modified: img/fr24.png
modified: img/garbage/kliko.png
modified: img/garbage/kliko_black.png
modified: img/garbage/kliko_blue.png
modified: img/garbage/kliko_brown.png
modified: img/garbage/kliko_green.png
modified: img/garbage/kliko_grey.png
modified: img/garbage/kliko_orange.png
modified: img/garbage/kliko_red.png
modified: img/garbage/kliko_white.png
modified: img/garbage/kliko_yellow.png
modified: img/garbage/tree.png
modified: img/heating.png
modified: img/heating_off.png
modified: img/heating_on.png
modified: img/hot_water_on.png
modified: img/kodi.png
modified: img/longfonds.png
modified: img/mi_robot.svg
modified: img/microphone_off.png
modified: img/microphone_on.png
modified: img/moon/moon.0.png
modified: img/moon/moon.00.png
modified: img/moon/moon.01.png
modified: img/moon/moon.02.png
modified: img/moon/moon.03.png
modified: img/moon/moon.04.png
modified: img/moon/moon.05.png
modified: img/moon/moon.06.png
modified: img/moon/moon.07.png
modified: img/moon/moon.08.png
modified: img/moon/moon.09.png
modified: img/moon/moon.10.png
modified: img/moon/moon.11.png
modified: img/moon/moon.12.png
modified: img/moon/moon.13.png
modified: img/moon/moon.14.png
modified: img/moon/moon.15.png
modified: img/moon/moon.16.png
modified: img/moon/moon.17.png
modified: img/moon/moon.18.png
modified: img/moon/moon.19.png
modified: img/moon/moon.20.png
modified: img/moon/moon.21.png
modified: img/moon/moon.22.png
modified: img/moon/moon.23.png
modified: img/moon/moon.24.png
modified: img/moon/moon.25.png
modified: img/moon/moon.26.png
modified: img/moon/moon.27.png
modified: img/moon/moon.28.png
modified: img/moon/moon.29.png
modified: img/moon/moon.30.png
modified: img/moon/moon.31.png
modified: img/moon/moon.32.png
modified: img/moon/moon.33.png
modified: img/moon/moon.34.png
modified: img/moon/moon.35.png
modified: img/moon/moon.36.png
modified: img/moon/moon.37.png
modified: img/moon/moon.38.png
modified: img/moon/moon.39.png
modified: img/moon/moon.40.png
modified: img/moon/moon.41.png
modified: img/moon/moon.42.png
modified: img/moon/moon.43.png
modified: img/moon/moon.44.png
modified: img/moon/moon.45.png
modified: img/moon/moon.46.png
modified: img/moon/moon.47.png
modified: img/moon/moon.48.png
modified: img/moon/moon.49.png
modified: img/moon/moon.50.png
modified: img/moon/moon.51.png
modified: img/moon/moon.52.png
modified: img/moon/moon.53.png
modified: img/moon/moon.54.png
modified: img/moon/moon.55.png
modified: img/moon/moon.56.png
modified: img/moon/moon.57.png
modified: img/moon/moon.58.png
modified: img/moon/moon.59.png
modified: img/moon/moon.60.png
modified: img/moon/moon.61.png
modified: img/moon/moon.62.png
modified: img/moon/moon.63.png
modified: img/moon/moon.64.png
modified: img/moon/moon.65.png
modified: img/moon/moon.66.png
modified: img/moon/moon.67.png
modified: img/moon/moon.68.png
modified: img/moon/moon.69.png
modified: img/moon/moon.70.png
modified: img/moon/moon.71.png
modified: img/moon/moon.72.png
modified: img/moon/moon.73.png
modified: img/moon/moon.74.png
modified: img/moon/moon.75.png
modified: img/moon/moon.76.png
modified: img/moon/moon.77.png
modified: img/moon/moon.78.png
modified: img/moon/moon.79.png
modified: img/moon/moon.80.png
modified: img/moon/moon.81.png
modified: img/moon/moon.82.png
modified: img/moon/moon.83.png
modified: img/moon/moon.84.png
modified: img/moon/moon.85.png
modified: img/moon/moon.86.png
modified: img/moon/moon.87.png
modified: img/moon/moon.88.png
modified: img/moon/moon.89.png
modified: img/moon/moon.90.png
modified: img/moon/moon.91.png
modified: img/moon/moon.92.png
modified: img/moon/moon.93.png
modified: img/moon/moon.94.png
modified: img/moon/moon.95.png
modified: img/moon/moon.96.png
modified: img/moon/moon.97.png
modified: img/moon/moon.98.png
modified: img/moon/moon.99.png
modified: img/motion_off.png
modified: img/motion_on.png
modified: img/ns.png
modified: img/radiator.svg
modified: img/radio-streaming.png
modified: img/radio.png
modified: img/radio_on.png
modified: img/roofwindow_closed.svg
modified: img/roofwindow_open.svg
modified: img/rpi.svg
modified: img/sleep.png
modified: img/sleep_off.png
modified: img/sleep_on.png
modified: img/speaker_off.png
modified: img/speaker_on.png
modified: img/toon.png
modified: img/tv.png
modified: img/tv_off.png
modified: img/uptime.png
modified: img/volumio.png
modified: img/wii.svg
modified: index.html
modified: index2.html
modified: js/blocktypes.js
modified: js/calendar.js
modified: js/chromecast.js
modified: js/coins.js
modified: js/colorpicker.js
modified: js/components/alarmmeldingen.js
modified: js/components/basicclock.css
modified: js/components/basicclock.js
modified: js/components/blocktitle.js
modified: js/components/button.js
modified: js/components/calendar.js
modified: js/components/camera.js
modified: js/components/coronavirus.js
modified: js/components/dial.js
modified: js/components/flipclock.css
modified: js/components/flipclock.js
modified: js/components/frame.js
modified: js/components/garbage.js
modified: js/components/graph.js
modified: js/components/haymanclock.css
modified: js/components/haymanclock.js
modified: js/components/html.js
modified: js/components/longfonds.js
modified: js/components/news.js
modified: js/components/nzbget.js
modified: js/components/publictransport.js
modified: js/components/secpanel.js
modified: js/components/stationclock.js
modified: js/components/streamplayer.js
modified: js/components/timegraph.js
modified: js/components/traffic.js
modified: js/components/trafficinfo.js
modified: js/components/train.js
modified: js/components/tvguide.js
modified: js/dashticz.js
modified: js/domoticz-api.js
modified: js/dt_function.js
modified: js/fullscreen.js
modified: js/log.js
modified: js/login.js
modified: js/main.js
modified: js/moon.js
modified: js/polyfills.js
modified: js/savesettings.php
modified: js/settings.js
modified: js/sonarr.js
modified: js/sortable.js
modified: js/spotify.js
modified: js/switches.js
modified: js/thermostat.js
modified: js/version.js
modified: js/weather.js
modified: js/weather_owm.js
modified: jsconfig.json
modified: lang/bs_BA.json
modified: lang/ca_ES.json
modified: lang/cs_CZ.json
modified: lang/da_DK.json
modified: lang/de_DE.json
modified: lang/en_US.json
modified: lang/es_ES.json
modified: lang/fi_FI.json
modified: lang/fr_FR.json
modified: lang/hu_HU.json
modified: lang/it_IT.json
modified: lang/ja_JP.json
modified: lang/lt_LT.json
modified: lang/nb_NO.json
modified: lang/nl_NL.json
modified: lang/nn_NO.json
modified: lang/pl_PL.json
modified: lang/pt_PT.json
modified: lang/ro_RO.json
modified: lang/ru_RU.json
modified: lang/sk_SK.json
modified: lang/sl_SI.json
modified: lang/sr_RS.json
modified: lang/sv_SE.json
modified: lang/tr_TR.json
modified: lang/uk_UA.json
modified: lang/zh_CN.json
modified: nginx.conf
modified: package-lock.json
modified: package.json
modified: sounds/airplane.aac
modified: sounds/airplane.mp3
modified: sounds/airplane.ogg
modified: sounds/arm.aac
modified: sounds/arm.mp3
modified: sounds/arm.ogg
modified: sounds/beer_can_opening.aac
modified: sounds/beer_can_opening.mp3
modified: sounds/beer_can_opening.ogg
modified: sounds/bell_ring.aac
modified: sounds/bell_ring.mp3
modified: sounds/bell_ring.ogg
modified: sounds/branch_break.aac
modified: sounds/branch_break.mp3
modified: sounds/branch_break.ogg
modified: sounds/button_click.aac
modified: sounds/button_click.mp3
modified: sounds/button_click.ogg
modified: sounds/button_click_on.aac
modified: sounds/button_click_on.mp3
modified: sounds/button_click_on.ogg
modified: sounds/button_push.aac
modified: sounds/button_push.mp3
modified: sounds/button_push.ogg
modified: sounds/camera_flashing.aac
modified: sounds/camera_flashing.mp3
modified: sounds/camera_flashing.ogg
modified: sounds/computer_error.aac
modified: sounds/computer_error.mp3
modified: sounds/computer_error.ogg
modified: sounds/disarm.aac
modified: sounds/disarm.mp3
modified: sounds/disarm.ogg
modified: sounds/door_bell.aac
modified: sounds/door_bell.mp3
modified: sounds/door_bell.ogg
modified: sounds/door_bump.aac
modified: sounds/door_bump.mp3
modified: sounds/door_bump.ogg
modified: sounds/doorbell.aac
modified: sounds/doorbell.mp3
modified: sounds/doorbell.ogg
modified: sounds/glass.aac
modified: sounds/glass.mp3
modified: sounds/glass.ogg
modified: sounds/key.aac
modified: sounds/key.mp3
modified: sounds/key.ogg
modified: sounds/light_bulb_breaking.aac
modified: sounds/light_bulb_breaking.mp3
modified: sounds/light_bulb_breaking.ogg
modified: sounds/ping.aac
modified: sounds/ping.mp3
modified: sounds/ping.ogg
modified: sounds/pop_cork.aac
modified: sounds/pop_cork.mp3
modified: sounds/pop_cork.ogg
modified: sounds/snap.aac
modified: sounds/snap.mp3
modified: sounds/snap.ogg
modified: sounds/sonar.aac
modified: sounds/sonar.mp3
modified: sounds/sonar.ogg
modified: sounds/tap.aac
modified: sounds/tap.mp3
modified: sounds/tap.ogg
modified: sounds/water_droplet.aac
modified: sounds/water_droplet.mp3
modified: sounds/water_droplet.ogg
modified: sounds/wrongcode.aac
modified: sounds/wrongcode.mp3
modified: sounds/wrongcode.ogg
modified: src/functions.js
modified: src/handlebars-helpers.js
modified: src/index.js
modified: src/templateengine.js
modified: switch_horizon.php
modified: themes/white/white.css
modified: tpl/calendar_0.tpl
modified: tpl/calendar_1.tpl
modified: tpl/calendar_2_event.tpl
modified: tpl/calendar_2_modal.tpl
modified: tpl/calendar_2_template.tpl
modified: tpl/calendar_modal_iframe.tpl
modified: tpl/camera_image.tpl
modified: tpl/camera_video.tpl
modified: tpl/clock_hayman.tpl
modified: tpl/colorpicker.tpl
modified: tpl/corona_graph_header.tpl
modified: tpl/corona_report.tpl
modified: tpl/dial.tpl
modified: tpl/garbage_0.tpl
modified: tpl/garbage_1.tpl
modified: tpl/garbage_2.tpl
modified: tpl/graph_header.tpl
modified: tpl/graph_tooltip.tpl
modified: tpl/graph_tooltip_table.tpl
modified: tpl/news_modal.tpl
modified: tpl/news_row.tpl
modified: tpl/secpanel.tpl
modified: tpl/secpanel_modal.tpl
modified: tpl/thermostat_block.tpl
modified: tpl/thermostat_evo_cont.tpl
modified: tpl/thermostat_evo_hw.tpl
modified: tpl/thermostat_evo_zone.tpl
modified: tpl/traffic.tpl
modified: vendor/dashticz/cors.php
modified: vendor/dashticz/garbage/index.php
modified: vendor/dashticz/ical/composer.json
modified: vendor/dashticz/ical/composer.lock
modified: vendor/dashticz/ical/ical5/SG_iCal.php
modified: vendor/dashticz/ical/ical5/blocks/SG_iCal_VCalendar.php
modified: vendor/dashticz/ical/ical5/blocks/SG_iCal_VEvent.php
modified: vendor/dashticz/ical/ical5/blocks/SG_iCal_VTimeZone.php
modified: vendor/dashticz/ical/ical5/helpers/SG_iCal_Duration.php
modified: vendor/dashticz/ical/ical5/helpers/SG_iCal_Factory.php
modified: vendor/dashticz/ical/ical5/helpers/SG_iCal_Freq.php
modified: vendor/dashticz/ical/ical5/helpers/SG_iCal_Line.php
modified: vendor/dashticz/ical/ical5/helpers/SG_iCal_Parser.php
modified: vendor/dashticz/ical/ical5/helpers/SG_iCal_Query.php
modified: vendor/dashticz/ical/ical5/helpers/SG_iCal_Recurrence.php
modified: vendor/dashticz/ical/ical5/index.php
modified: vendor/dashticz/ical/index.php
modified: vendor/dashticz/ical/vendor/autoload.php
modified: vendor/dashticz/ical/vendor/composer/ClassLoader.php
modified: vendor/dashticz/ical/vendor/composer/LICENSE
modified: vendor/dashticz/ical/vendor/composer/autoload_classmap.php
modified: vendor/dashticz/ical/vendor/composer/autoload_namespaces.php
modified: vendor/dashticz/ical/vendor/composer/autoload_psr4.php
modified: vendor/dashticz/ical/vendor/composer/autoload_real.php
modified: vendor/dashticz/ical/vendor/composer/autoload_static.php
modified: vendor/dashticz/ical/vendor/composer/installed.json
modified: vendor/dashticz/ical/vendor/om/icalparser/.github/workflows/php.yml
modified: vendor/dashticz/ical/vendor/om/icalparser/.gitignore
modified: vendor/dashticz/ical/vendor/om/icalparser/LICENSE
modified: vendor/dashticz/ical/vendor/om/icalparser/composer.json
modified: vendor/dashticz/ical/vendor/om/icalparser/example/index.php
modified: vendor/dashticz/ical/vendor/om/icalparser/readme.md
modified: vendor/dashticz/ical/vendor/om/icalparser/src/Freq.php
modified: vendor/dashticz/ical/vendor/om/icalparser/src/IcalParser.php
modified: vendor/dashticz/ical/vendor/om/icalparser/src/Recurrence.php
modified: vendor/dashticz/ical/vendor/om/icalparser/src/WindowsTimezones.php
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/blank_description.phpt
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/cal/38_weekly_recurring_event_missing_day.ics
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/cal/FrenchHolidays.ics
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/cal/basic.ics
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/cal/missing_RRULE_notice.ics
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/cal/multiline_description.ics
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/cal/readme.md
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/cal/recur_instances_with_modifications.ics
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/cal/recur_instances_with_modifications_and_interval.ics
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/cal/url.ics
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/cal/weird_windows_timezones.ics
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/cal/wrong_dates.ics
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/multiline_description.phpt
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/multiple_attachments.phpt
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/recurring_events.phpt
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/sort_events.phpt
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/timezone.phpt
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/url.phpt
modified: vendor/dashticz/ical/vendor/om/icalparser/tests/wrong_dates.phpt
modified: vendor/dashticz/ical/vendor/om/icalparser/tools/windowstimezones.php
modified: vendor/dashticz/info.php
modified: vendor/dashticz/nocache.php
modified: vendor/jquery.newsTicker.min.js
modified: vendor/stationclock.js
modified: vendor/weather/css/weather-icons-wind.min.css
modified: vendor/weather/css/weather-icons.min.css
modified: vendor/weather/font/weathericons-regular-webfont.eot
modified: vendor/weather/font/weathericons-regular-webfont.svg
modified: vendor/weather/font/weathericons-regular-webfont.ttf
modified: vendor/weather/font/weathericons-regular-webfont.woff
modified: vendor/weather/font/weathericons-regular-webfont.woff2
modified: version.txt
modified: webpack.config.js
Untracked files:
(use "git add <file>..." to include in what will be committed)
img/pvk_blind_off.png
img/pvk_blind_on.png
img/pvk_blindorg_off.png
img/pvk_microphone_off.png
img/pvk_microphone_on.png
no changes added to commit (use "git add" and/or "git commit -a")
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Tuesday 29 December 2020 11:37
by pvklink
ok, i used your script.
I changed the first line in cd /home/pi thats where my dashticz folder is...
And then runned the script...
everything went OK.
can i use your script as a future standard for updating beta dashticz or is this script only useful for this situatation ?
I will check my two configuartions
- one for my desktop (custom)
- one for my wall tablet
Only thing i can see this far is that my security panel has become greater and has an overlap with my other buttons (that are on the right of the panel
i use these setting in my css file
/* security panel */
/* div[data-id='secpanel'] {background-color: rgba(87, 64, 56, 1) !important; } dit is het block achter het zwarte secpanel, als je dit weglaat is het bruine block niet zichtbaar wel nodig als je eronder blokken wil tonen */
[data-id='secpanel'] .dt_content {height: 360px!important; width: 260px!important; }
div[data-id='secpanel'] {height: 400px !important;width: 340px!important;}
- panel2.jpg (86.29 KiB) Viewed 1759 times
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Tuesday 29 December 2020 12:40
by Lokonli
pvklink wrote: ↑Tuesday 29 December 2020 11:37
ok, i used your script.
I changed the first line in cd /home/pi thats where my dashticz folder is...
And then runned the script...
everything went OK.
can i use your script as a future standard for updating beta dashticz or is this script only useful for this situatation ?
I will check my two configuartions
- one for my desktop (custom)
- one for my wall tablet
Only thing i can see this far is that my security panel has become greater and has an overlap with my other buttons (that are on the right of the panel
i use these setting in my css file
/* security panel */
/* div[data-id='secpanel'] {background-color: rgba(87, 64, 56, 1) !important; } dit is het block achter het zwarte secpanel, als je dit weglaat is het bruine block niet zichtbaar wel nodig als je eronder blokken wil tonen */
[data-id='secpanel'] .dt_content {height: 360px!important; width: 260px!important; }
div[data-id='secpanel'] {height: 400px !important;width: 340px!important;}
panel2.jpg
The script is only needed in case something is messed up.
Normally you only have to do 'git pull'. This will always be risk free: git pull will not overwrite files you've changed.
In 3.7.2 there are indeed some changes in the css styling of the security panel.
I would expect there is no need anymore to set the height/width manually in custom.css. You can remove both lines from custom.css.
The security panel automatically scales to the width of the column. If it's too wide, set the block parameter 'scale ' to for instance 0.8 to scale it to 80% of the column width.
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Tuesday 29 December 2020 13:19
by pvklink
ok, clear!
I also tried:
blocks['secpanel'] = {width: 12, headerText: 'test',footerText: 'test2'}
This works ok on my desktop with custom folder settings on safari
When i use this in custom_2 folder for my rpi with small touchschreen and default buster browser it does not show the headerText and footerText ( shows the default)...
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Tuesday 29 December 2020 13:39
by Lokonli
pvklink wrote: ↑Tuesday 29 December 2020 13:19
ok, clear!
I also tried:
blocks['secpanel'] = {width: 12, headerText: 'test',footerText: 'test2'}
This works ok on my desktop with custom folder settings on safari
When i use this in custom_2 folder for my rpi with small touchschreen and default buster browser it does not show the headerText and footerText ( shows the default)...
Probably a caching issue. I fixed this in index.html, but forgot to update index2.html.
I already made a change to beta.
Can you update to the latest version?
Just do a 'git pull'
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Tuesday 29 December 2020 14:13
by pvklink
i will..
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Tuesday 29 December 2020 14:19
by pvklink
And it works !!!
Do i have to test more securitypanel stuff ?
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Tuesday 29 December 2020 14:52
by Lokonli
pvklink wrote: ↑Tuesday 29 December 2020 14:19
And it works !!!
Do i have to test more securitypanel stuff ?
Can you test with decorate:false and your pi screen?
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Tuesday 29 December 2020 17:58
by pvklink
Works!
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Thursday 31 December 2020 2:02
by ThirstyThursten
Man Dashticz is giving me so much trouble lately..
I wanna try to update to the beta to see if it than at least uses my custom css, because right now it doesn't use ANY of my custom css.. But I'll open another topic for that.
So how does this work every time I try to do a git command I get the "fatal: not a git repository (or any of the parent directories): .git"
Now I just did a git clone into the folder /home/pi/dashticz which created an extra nested folder called dashticz with the actual stuff in it.
So how do I update it to the latest beta?
Secondly, is the documentation completely up to date?
I sometimes have a little trouble getting stuff to work because of the different syntaxes. I started way back when Dashticz V2 was just new, than I didn't touch it for a while DashticzV3 I believe or even after that changed the whole way the config was written.
Hope you guys can help me!
Thanks in advance!
Greets!
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Thursday 31 December 2020 11:01
by Lokonli
I can help
In case you come from an early version then I would recommend to make a fresh install.
You could try the automatic install first see:
https://dashticz.readthedocs.io/en/mast ... stall.html
Dashticz then should be up and running.
copy your old CONFIG.js, custom.css and custom.js to the new custom folder.
Most changes in the configuration are additions. There will be (at least) one breaking change for button images. See:
https://dashticz.readthedocs.io/en/mast ... tml#button
There are a few more changes related to custom.js.
For an example:
https://dashticz.readthedocs.io/en/mast ... -idx-block
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Thursday 31 December 2020 11:44
by ThirstyThursten
Thanks Lokonli, I am on the most recent release on the master branch.
However my Domoticz installation and Raspbnian image I'm using now have become somewwhat instable. So I think I'll just reinstall everything to a new SD Card and than move the appropriate files over to the new system!
So that will than work out! Thanks bud!
Re: Dashticz v3.7.2 beta (read update instructions!!)
Posted: Thursday 31 December 2020 12:44
by Lokonli
ok, if you encounter additional issues with updating the config files you can post your questions on the forum.