Self hosted FLOSS fitness/workout, nutrition and weight tracker
Some visual polishing of the calendar view
Roland Geider361e222aee77
diff --git a/wger/manager/static/css/workout-manager-common.css b/wger/manager/static/css/workout-manager-common.cssindex b4cf8c38f..0c0a0a7c2 100644--- a/wger/manager/static/css/workout-manager-common.css+++ b/wger/manager/static/css/workout-manager-common.css@@ -356,4 +356,54 @@ td.today, table.month tbody tr:hover td.today{}.calendar-log-data{display:none;+}++.calendar-log-data ul.grouper-list > li{+ float:left;+ list-style:none;+ margin-left:0px;+ height: 120px;+ clear: right;+}++@media only screen and (max-width : 480px) {+ /* Smartphone view: 1 tile */+ .calendar-log-data ul.grouper-list > li {+ width: 100%;+ }+}+@media only screen and (max-width : 650px) and (min-width : 481px) {+ /* Tablet view: 3 tiles */+ .calendar-log-data ul.grouper-list > li {+ width: 33.3%;+ /*height: 33.3%;*/+ }+}+@media only screen and (max-width : 1050px) and (min-width : 651px) {+ /* Small desktop: 4 tiles */+ .calendar-log-data ul.grouper-list > li {+ width: 25%;+ /*height: auto;*/+ }+}+@media only screen and (max-width : 1290px) and (min-width : 1051px) {+ /* Medium desktop: 5 tiles */+ .calendar-log-data ul.grouper-list > li {+ width: 20%;+ /*height: 20%;*/+ }+}+@media only screen and (min-width : 1290px) {+ /* Big desktop: 5 tiles */+ .calendar-log-data ul.grouper-list > li {+ width: 20%;+ /*height: 20%;*/+ }+}+++/* Timeline with years and months with logs */++.timeline-log span{+ margin-left: 1em;}\ No newline at end of filediff --git a/wger/manager/static/images/icons/calendar.svg b/wger/manager/static/images/icons/calendar.svgnew file mode 100644index 000000000..3cdf3dfa7--- /dev/null+++ b/wger/manager/static/images/icons/calendar.svg@@ -0,0 +1,153 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!-- Created with Inkscape (http://www.inkscape.org/) --><svg height="48" id="svg249" inkscape:export-filename="/home/lapo/Desktop/calendar.png" inkscape:export-xdpi="240.00000" inkscape:export-ydpi="240.00000" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:version="0.45" sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/mimetypes" sodipodi:docname="x-office-calendar.svg" sodipodi:version="0.32" version="1.0" width="48" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">+ <metadata>+ <rdf:RDF xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">+ <cc:Work rdf:about="">+ <dc:title>Calendar</dc:title>+ <dc:description></dc:description>+ <dc:subject>+ <rdf:Bag>+ <rdf:li>office</rdf:li>+ <rdf:li>calendar</rdf:li>+ </rdf:Bag>+ </dc:subject>+ <dc:publisher>+ <cc:Agent rdf:about="http://www.openclipart.org/">+ <dc:title>Open Clip Art Library, Source: GNOME Icon Theme, Source: GNOME Icon Theme, Source: GNOME Icon Theme, Source: GNOME Icon Theme</dc:title>+ </cc:Agent>+ </dc:publisher>+ <dc:creator>+ <cc:Agent>+ <dc:title>Lapo Calamandrei</dc:title>+ </cc:Agent>+ </dc:creator>+ <dc:rights>+ <cc:Agent>+ <dc:title>Lapo Calamandrei</dc:title>+ </cc:Agent>+ </dc:rights>+ <dc:date></dc:date>+ <dc:format>image/svg+xml</dc:format>+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>+ <cc:license rdf:resource="http://creativecommons.org/licenses/GPL/2.0/"/>+ <dc:language>en</dc:language>+ </cc:Work>+ </rdf:RDF>+ </metadata>+ <defs id="defs3">+ <linearGradient id="linearGradient8258" inkscape:collect="always">+ <stop id="stop8260" offset="0" style="stop-color:#eeeeec;stop-opacity:1;"/>+ <stop id="stop8262" offset="1" style="stop-color:#eeeeec;stop-opacity:0;"/>+ </linearGradient>+ <linearGradient id="linearGradient8241" inkscape:collect="always">+ <stop id="stop8243" offset="0" style="stop-color:#eeeeec;stop-opacity:1;"/>+ <stop id="stop8245" offset="1" style="stop-color:#eeeeec;stop-opacity:0;"/>+ </linearGradient>+ <linearGradient id="linearGradient7807" inkscape:collect="always">+ <stop id="stop7809" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>+ <stop id="stop7811" offset="1" style="stop-color:#ffffff;stop-opacity:0;"/>+ </linearGradient>+ <linearGradient id="linearGradient7497">+ <stop id="stop7499" offset="0" style="stop-color:#c17d11;stop-opacity:1;"/>+ <stop id="stop7501" offset="1" style="stop-color:#e9b96e;stop-opacity:1"/>+ </linearGradient>+ <linearGradient id="linearGradient3428">+ <stop id="stop3430" offset="0" style="stop-color:black;stop-opacity:0;"/>+ <stop id="stop3436" offset="0.5" style="stop-color:black;stop-opacity:1;"/>+ <stop id="stop3432" offset="1" style="stop-color:black;stop-opacity:0;"/>+ </linearGradient>+ <linearGradient id="linearGradient3414" inkscape:collect="always">+ <stop id="stop3416" offset="0" style="stop-color:black;stop-opacity:1;"/>+ <stop id="stop3418" offset="1" style="stop-color:black;stop-opacity:0;"/>+ </linearGradient>+ <linearGradient id="linearGradient7218">+ <stop id="stop7220" offset="0" style="stop-color:#eeeeec;stop-opacity:1"/>+ <stop id="stop7222" offset="1" style="stop-color:#ffffff;stop-opacity:1;"/>+ </linearGradient>+ <linearGradient id="linearGradient7192" inkscape:collect="always">+ <stop id="stop7194" offset="0" style="stop-color:#d3d7cf;stop-opacity:1;"/>+ <stop id="stop7196" offset="1" style="stop-color:#d3d7cf;stop-opacity:0;"/>+ </linearGradient>+ <linearGradient id="linearGradient7179">+ <stop id="stop7181" offset="0" style="stop-color:#babdb6;stop-opacity:1"/>+ <stop id="stop7183" offset="1" style="stop-color:#ffffff;stop-opacity:1"/>+ </linearGradient>+ <linearGradient id="linearGradient7093">+ <stop id="stop7095" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>+ <stop id="stop7097" offset="1" style="stop-color:#babdb6;stop-opacity:1;"/>+ </linearGradient>+ <linearGradient id="linearGradient7006">+ <stop id="stop7008" offset="0" style="stop-color:#babdb6;stop-opacity:1"/>+ <stop id="stop7010" offset="1" style="stop-color:#eeeeec;stop-opacity:1"/>+ </linearGradient>+ <linearGradient id="linearGradient6973" inkscape:collect="always">+ <stop id="stop6975" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>+ <stop id="stop6977" offset="1" style="stop-color:#ffffff;stop-opacity:0;"/>+ </linearGradient>+ <radialGradient cx="3" cy="43" fx="3" fy="43" gradientTransform="matrix(2,0,0,2,-13,-129)" gradientUnits="userSpaceOnUse" id="radialGradient7662" inkscape:collect="always" r="2" xlink:href="#linearGradient3414"/>+ <radialGradient cx="3" cy="43" fx="3" fy="43" gradientTransform="matrix(2,0,0,2,35,-43)" gradientUnits="userSpaceOnUse" id="radialGradient7664" inkscape:collect="always" r="2" xlink:href="#linearGradient3414"/>+ <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient7666" inkscape:collect="always" x1="11.507806" x2="11.507806" xlink:href="#linearGradient3428" y1="39" y2="47.015659"/>+ <linearGradient gradientTransform="matrix(1.0491852,0,0,0.8387099,-32.656,5.6935475)" gradientUnits="userSpaceOnUse" id="linearGradient7668" inkscape:collect="always" x1="42.75" x2="80" xlink:href="#linearGradient7497" y1="13.875" y2="72"/>+ <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient7670" inkscape:collect="always" x1="21.860727" x2="24" xlink:href="#linearGradient6973" y1="40.659435" y2="-6.7934427"/>+ <radialGradient cx="3" cy="43" fx="3" fy="43" gradientTransform="matrix(2,0,0,2,-13,-129)" gradientUnits="userSpaceOnUse" id="radialGradient7672" inkscape:collect="always" r="2" xlink:href="#linearGradient3414"/>+ <radialGradient cx="3" cy="43" fx="3" fy="43" gradientTransform="matrix(2,0,0,2,35,-43)" gradientUnits="userSpaceOnUse" id="radialGradient7674" inkscape:collect="always" r="2" xlink:href="#linearGradient3414"/>+ <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient7676" inkscape:collect="always" x1="11.507806" x2="11.507806" xlink:href="#linearGradient3428" y1="39" y2="47.015659"/>+ <linearGradient gradientTransform="matrix(1,0,0,0.957606,0,-1.3852868)" gradientUnits="userSpaceOnUse" id="linearGradient7678" inkscape:collect="always" x1="6.53125" x2="41.40625" xlink:href="#linearGradient7006" y1="27.03125" y2="27.03125"/>+ <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient7680" inkscape:collect="always" x1="13.15533" x2="25.545048" xlink:href="#linearGradient7218" y1="19.60754" y2="32.263321"/>+ <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient7682" inkscape:collect="always" x1="17.765669" x2="17.765669" xlink:href="#linearGradient7093" y1="20.0625" y2="16.156132"/>+ <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient7686" inkscape:collect="always" x1="17.765669" x2="17.765669" xlink:href="#linearGradient7093" y1="20.0625" y2="16.156132"/>+ <linearGradient gradientTransform="matrix(1,0,0,0.8954902,0,-0.293617)" gradientUnits="userSpaceOnUse" id="linearGradient7694" inkscape:collect="always" x1="37.076309" x2="40.3125" xlink:href="#linearGradient7192" y1="33.310486" y2="36.46143"/>+ <linearGradient gradientTransform="matrix(0.8411669,0,0,0.8782343,5.631251,-7.04643)" gradientUnits="userSpaceOnUse" id="linearGradient7696" inkscape:collect="always" x1="35.996582" x2="33.664921" xlink:href="#linearGradient7179" y1="40.458221" y2="37.770721"/>+ <radialGradient cx="-42.4706" cy="6.6011076" fx="-42.4706" fy="6.6011076" gradientTransform="matrix(1,0,0,0.9923077,0,5.0777806e-2)" gradientUnits="userSpaceOnUse" id="radialGradient8069" inkscape:collect="always" r="1.4363106" xlink:href="#linearGradient7807"/>+ <radialGradient cx="-42.4706" cy="6.6011076" fx="-42.4706" fy="6.6011076" gradientTransform="matrix(1,0,0,0.9923077,0,5.0777806e-2)" gradientUnits="userSpaceOnUse" id="radialGradient8073" inkscape:collect="always" r="1.4363106" xlink:href="#linearGradient7807"/>+ <linearGradient gradientTransform="translate(-1,0)" gradientUnits="userSpaceOnUse" id="linearGradient8247" inkscape:collect="always" x1="18.533974" x2="22.318058" xlink:href="#linearGradient8241" y1="6.1039233" y2="7.4297485"/>+ <linearGradient gradientTransform="translate(1,0)" gradientUnits="userSpaceOnUse" id="linearGradient8264" inkscape:collect="always" x1="29.565903" x2="25.809397" xlink:href="#linearGradient8258" y1="7.0320005" y2="9.3742924"/>+ </defs>+ <sodipodi:namedview bordercolor="#666666" borderopacity="1" height="48px" id="base" inkscape:current-layer="layer5" inkscape:cx="56.316338" inkscape:cy="27.444496" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:guide-bbox="true" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:showpageshadow="false" inkscape:window-height="973" inkscape:window-width="1280" inkscape:window-x="5" inkscape:window-y="21" inkscape:zoom="1" pagecolor="#ffffff" showborder="false" showgrid="false" showguides="true" width="48px">+ <inkscape:grid id="grid5026" type="xygrid"/>+ </sodipodi:namedview>+ <g id="layer6" inkscape:groupmode="layer" inkscape:label="Shadow" style="display:inline"/>+ <g id="layer1" inkscape:groupmode="layer" inkscape:label="Base" style="display:inline"/>+ <g id="layer5" inkscape:groupmode="layer" inkscape:label="Text" style="display:inline">+ <g id="g7610" style="opacity:0.56716416;display:inline" transform="matrix(1.1428572,0,0,0.875,-3.4285707,1.875)">+ <rect height="8" id="rect7612" style="opacity:1;color:#000000;fill:url(#radialGradient7662);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" transform="scale(-1,-1)" width="4" x="-7" y="-47"/>+ <rect height="8" id="rect7614" style="opacity:1;color:#000000;fill:url(#radialGradient7664);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" width="4" x="41" y="39"/>+ <rect height="8" id="rect7616" style="opacity:1;color:#000000;fill:url(#linearGradient7666);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" width="34" x="7" y="39"/>+ </g>+ <rect height="3" id="rect6029" style="opacity:1;fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99236642" width="3" x="17" y="10"/>+ <rect height="3" id="rect7000" style="opacity:1;fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99236642;display:inline" width="3" x="29" y="10"/>+ <path d="M 9.7376397,14.5 C 8.4532492,14.5 7.2981613,15.238825 7.1146767,16.148217 L 2.5244914,38.851791 C 2.3410068,39.761182 3.2073232,40.500005 4.4917137,40.500005 L 43.508288,40.500005 C 44.792679,40.500005 45.658995,39.761182 45.475511,38.851791 L 40.885325,16.148217 C 40.701842,15.238825 39.546753,14.5 38.262362,14.5 L 9.7376397,14.5 z " id="path7618" sodipodi:nodetypes="ccccccccc" style="fill:url(#linearGradient7668);fill-opacity:1;fill-rule:evenodd;stroke:#8f5902;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"/>+ <path d="M 3.0842597,38.25 L 3.0185902,38.59375 C 2.962271,38.926079 3.0294808,39.340581 3.2812682,39.59375 C 3.5493764,39.863329 3.9690666,40 4.4633195,40 L 43.53668,40 C 44.030933,40 44.450624,39.863329 44.718732,39.59375 C 44.970521,39.34058 45.03773,38.926079 44.98141,38.59375 L 44.91574,38.25 C 44.870048,38.370922 44.812599,38.502623 44.718732,38.59375 C 44.448335,38.856255 44.032777,38.968749 43.53668,38.96875 L 4.4633195,38.96875 C 3.9672226,38.96875 3.5516659,38.856256 3.2812682,38.59375 C 3.1874018,38.502624 3.129952,38.370922 3.0842597,38.25 z " id="path7620" style="opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"/>+ <path d="M 10.40625,13.5 C 9.663742,13.5 8.9896917,14.107661 8.90625,14.625 L 4.53125,41.6875 C 4.49001,41.943188 4.5241344,42.110423 4.65625,42.25 C 4.7883656,42.389577 5.0349957,42.5 5.40625,42.5 L 42.59375,42.5 C 42.965004,42.5 43.211634,42.389577 43.34375,42.25 C 43.475866,42.110423 43.50999,41.943187 43.46875,41.6875 L 39.09375,14.625 C 39.010309,14.107662 38.336258,13.5 37.59375,13.5 L 10.40625,13.5 z " id="path7622" inkscape:original="M 10.40625 12.5 C 9.1820711 12.5 8.0811327 13.384477 7.90625 14.46875 L 3.53125 41.53125 C 3.3563673 42.615524 4.182071 43.5 5.40625 43.5 L 42.59375 43.5 C 43.817929 43.5 44.643633 42.615523 44.46875 41.53125 L 40.09375 14.46875 C 39.918868 13.384477 38.817929 12.5 37.59375 12.5 L 10.40625 12.5 z " inkscape:radius="-1" sodipodi:type="inkscape:offset" style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7670);stroke-width:1.09473991;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline" transform="matrix(1.0520785,0,0,0.7931034,-1.2498838,4.7931035)"/>+ <g id="g7624" style="opacity:0.4;display:inline" transform="matrix(0.9047619,0,0,0.375,2.285714,20.375)">+ <rect height="8" id="rect7626" style="opacity:1;color:#000000;fill:url(#radialGradient7672);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" transform="scale(-1,-1)" width="4" x="-7" y="-47"/>+ <rect height="8" id="rect7628" style="opacity:1;color:#000000;fill:url(#radialGradient7674);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" width="4" x="41" y="39"/>+ <rect height="8" id="rect7630" style="opacity:1;color:#000000;fill:url(#linearGradient7676);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" width="34" x="7" y="39"/>+ </g>+ <path d="M 10.53125,12.5 L 7.03125,32.627183 L 7.03125,36.500001 L 40.90625,36.500001 L 40.90625,32.627183 L 37.46875,12.5 L 10.53125,12.5 z " id="path7632" sodipodi:nodetypes="ccccccc" style="opacity:1;fill:url(#linearGradient7678);fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"/>+ <path d="M 10.96875,15 L 7.625,36.0625 L 40.3125,36.0625 L 37.03125,15 L 10.96875,15 z " id="path7634" inkscape:original="M 10.53125 14.5 L 7.03125 36.5625 L 40.90625 36.5625 L 37.46875 14.5 L 10.53125 14.5 z " inkscape:radius="-0.5" sodipodi:type="inkscape:offset" style="opacity:1;fill:url(#linearGradient7680);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline" transform="matrix(1,0,0,0.9020772,0,-0.531159)"/>+ <path d="M 11.375,15.46875 L 8,35.669105 L 8,38.59375 L 39.9375,38.59375 L 39.9375,35.669105 L 36.625,15.46875 L 11.375,15.46875 z " id="path7636" sodipodi:nodetypes="ccccccc" style="opacity:0.46641792;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.02452207;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline" transform="matrix(1,0,0,0.9527027,0,-1.2683699)"/>+ <path d="M 21.3125 18.109375 A 2.109375 1.953125 0 1 1 17.09375,18.109375 A 2.109375 1.953125 0 1 1 21.3125 18.109375 z" id="path7638" sodipodi:cx="19.203125" sodipodi:cy="18.109375" sodipodi:rx="2.109375" sodipodi:ry="1.953125" sodipodi:type="arc" style="opacity:1;fill:url(#linearGradient7682);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" transform="matrix(0.948148,0,0,-0.6445933,-1.207405,26.961049)"/>+ <path d="M 21.3125 18.109375 A 2.109375 1.953125 0 1 1 17.09375,18.109375 A 2.109375 1.953125 0 1 1 21.3125 18.109375 z" id="path7642" sodipodi:cx="19.203125" sodipodi:cy="18.109375" sodipodi:rx="2.109375" sodipodi:ry="1.953125" sodipodi:type="arc" style="opacity:1;fill:url(#linearGradient7686);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" transform="matrix(0.948148,0,0,-0.6593882,13.792596,27.228976)"/>+ <path d="M 30.473388,32 L 40.3125,32 L 38.799017,23.181126 L 30.473388,32 z " id="path7650" sodipodi:nodetypes="cccc" style="fill:url(#linearGradient7694);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"/>+ <path d="M 30.561705,31.494718 C 33.23116,31.678236 39.375378,27.135147 38.395861,22.522096 C 37.080888,24.650133 35.071707,24.541899 31.505062,24.482661 C 31.505062,24.482661 31.700621,30.843196 30.561705,31.494718 z " id="path7652" inkscape:r_cx="true" inkscape:r_cy="true" sodipodi:nodetypes="cccc" style="color:#000000;fill:url(#linearGradient7696);fill-opacity:1;fill-rule:evenodd;stroke:#babdb6;stroke-width:1.00000095;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"/>+ <path d="M 25.716871,24.515932 C 26.43716,24.622671 27.793989,24.888944 28.196369,25.226363 C 28.6037,25.563788 28.939952,26.112984 28.93996,26.608785 C 28.939952,27.369709 28.562418,27.958476 27.807358,28.375089 C 27.052283,28.791702 25.581545,29.000009 24.190635,29.000009 C 23.72368,29.000009 22.09278,28.923105 21.596027,28.857687 C 21.104238,28.795711 20.595064,28.701026 20.068505,28.573632 L 20.068505,27.56653 C 20.485777,27.735242 20.942792,27.862636 21.43955,27.948712 C 21.936302,28.03479 23.604459,28.122023 24.145927,28.122022 C 25.089757,28.122023 26.205315,27.992907 26.69711,27.734675 C 27.193859,27.476444 27.442236,27.101149 27.442243,26.608785 C 27.442236,26.154301 27.078662,25.667081 26.616685,25.412289 C 26.159664,25.154062 25.123587,24.980752 24.303946,24.980748 L 23.007414,24.980748 L 23.007414,24.12342 L 24.363556,24.12342 C 25.103717,24.123424 25.27227,24.021853 25.664712,23.818707 C 26.057143,23.612127 26.385944,23.448605 26.38595,23.062973 C 26.385944,22.667025 26.182275,22.364034 25.774942,22.153999 C 25.372564,21.940535 24.793844,21.833799 24.038781,21.833792 C 23.62647,21.833799 23.184358,21.864787 22.712444,21.926755 C 22.240523,21.988738 21.721414,22.085144 21.155115,22.215975 L 21.155115,21.286342 C 21.726382,21.176171 22.260393,21.093537 22.757152,21.03844 C 23.258871,20.983358 23.730788,20.955813 24.172905,20.955805 C 25.315437,20.955813 26.219531,21.136575 26.885189,21.498091 C 27.550835,21.856179 27.88366,22.341653 27.883669,22.954517 C 27.88366,23.381465 27.574729,23.610405 27.222041,23.906506 C 26.869337,24.199172 26.367615,24.402314 25.716871,24.515932" id="text7654" sodipodi:nodetypes="csssssccsssssccccsssssccsssssc" style="font-size:12.7047596px;font-style:normal;font-weight:normal;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans"/>+ <g id="g7712" transform="matrix(1,0,0,0.9324156,-1,1.0675844)"/>+ <path d="M 17.050038,14.5 C 16.3102,6.0656246 16.443645,4.7854818 16.718235,3.8499005 C 17.229846,2.1067459 18.567948,1.3713901 18.567948,10.551319" id="path8061" sodipodi:nodetypes="csc" style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"/>+ <path d="M 17.050038,14.5 C 16.3102,6.0656246 16.443645,4.7854818 16.718235,3.8499005 C 17.229846,2.1067459 18.567948,1.3713901 18.567948,10.551319" id="path8059" sodipodi:nodetypes="csc" style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8247);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"/>+ <path d="M 32.017909,14.5 C 32.757747,6.0656246 32.624302,4.7854818 32.349712,3.8499005 C 31.838101,2.1067459 30.499999,1.3713901 30.499999,10.551319" id="path8063" sodipodi:nodetypes="csc" style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"/>+ <path d="M 32.017909,14.5 C 32.757747,6.0656246 32.624302,4.7854818 32.349712,3.8499005 C 31.838101,2.1067459 30.499999,1.3713901 30.499999,10.551319" id="path8065" sodipodi:nodetypes="csc" style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8264);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"/>+ <path d="M -41.034289 6.6011076 A 1.4363106 1.4252621 0 1 1 -43.906911,6.6011076 A 1.4363106 1.4252621 0 1 1 -41.034289 6.6011076 z" id="path8067" sodipodi:cx="-42.4706" sodipodi:cy="6.6011076" sodipodi:rx="1.4363106" sodipodi:ry="1.4252621" sodipodi:type="arc" style="opacity:0.75373128;fill:url(#radialGradient8069);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99236642;display:inline" transform="matrix(1.0443428,0,0,1.7540633,60.853863,-5.078761)"/>+ <path d="M -41.034289 6.6011076 A 1.4363106 1.4252621 0 1 1 -43.906911,6.6011076 A 1.4363106 1.4252621 0 1 1 -41.034289 6.6011076 z" id="path8071" sodipodi:cx="-42.4706" sodipodi:cy="6.6011076" sodipodi:rx="1.4363106" sodipodi:ry="1.4252621" sodipodi:type="arc" style="opacity:0.75373128;fill:url(#radialGradient8073);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99236642;display:inline" transform="matrix(-1.0443428,0,0,1.7540633,-11.894295,-5.078761)"/>+ <path d="M -40.84375 6.078125 A 1.078125 1.015625 0 1 1 -43,6.078125 A 1.078125 1.015625 0 1 1 -40.84375 6.078125 z" id="path8075" sodipodi:cx="-41.921875" sodipodi:cy="6.078125" sodipodi:rx="1.078125" sodipodi:ry="1.015625" sodipodi:type="arc" style="opacity:0.83582093;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99236642;display:inline" transform="matrix(0.4971234,0,0,0.5277156,36.862441,0.32844)"/>+ <path d="M -40.84375 6.078125 A 1.078125 1.015625 0 1 1 -43,6.078125 A 1.078125 1.015625 0 1 1 -40.84375 6.078125 z" id="path8077" sodipodi:cx="-41.921875" sodipodi:cy="6.078125" sodipodi:rx="1.078125" sodipodi:ry="1.015625" sodipodi:type="arc" style="opacity:0.83582093;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99236642;display:inline" transform="matrix(-0.4971234,0,0,0.5277156,10.097127,0.32844)"/>+ <path d="M -40.84375 6.078125 A 1.078125 1.015625 0 1 1 -43,6.078125 A 1.078125 1.015625 0 1 1 -40.84375 6.078125 z" id="path8266" sodipodi:cx="-41.921875" sodipodi:cy="6.078125" sodipodi:rx="1.078125" sodipodi:ry="1.015625" sodipodi:type="arc" style="opacity:0.83582093;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99236642;display:inline" transform="matrix(0.4971234,0,0,0.5277156,37.376306,11.256517)"/>+ <path d="M -40.84375 6.078125 A 1.078125 1.015625 0 1 1 -43,6.078125 A 1.078125 1.015625 0 1 1 -40.84375 6.078125 z" id="path8268" sodipodi:cx="-41.921875" sodipodi:cy="6.078125" sodipodi:rx="1.078125" sodipodi:ry="1.015625" sodipodi:type="arc" style="opacity:0.83582093;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99236642;display:inline" transform="matrix(-0.4971234,0,0,0.5277156,10.695616,11.256517)"/>+ <g id="g8291">+ <path d="M 14.313417,17.957453 L 15.28495,17.957453 L 15.081595,19.071853 C 15.056144,19.211315 14.893389,19.312328 14.59333,19.374891 C 14.296789,19.437453 13.829954,19.468734 13.192826,19.468735 L 12.823221,19.468735 L 12.851049,19.316238 L 13.109772,19.316238 C 13.479377,19.316238 13.733974,19.300272 13.873564,19.268339 C 14.013033,19.237057 14.091865,19.171562 14.110061,19.071853 L 14.313417,17.957453 M 14.391191,17.531245 L 15.362725,17.531245 L 15.321162,17.759012 L 14.349628,17.759012 L 14.391191,17.531245" id="text7658" sodipodi:nodetypes="cccsccccsccccccc" style="font-size:4.65283775px;font-style:normal;font-weight:normal;fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans"/>+ <path d="M 35.994267,18.45991 L 36.008834,18.54789 L 31.541891,18.54789 C 31.604632,18.671712 31.82092,18.766208 32.190756,18.831377 C 32.564002,18.895895 33.072707,18.928154 33.716881,18.928154 C 34.090001,18.928154 34.449404,18.919682 34.795088,18.902738 C 35.144281,18.885794 35.488558,18.860378 35.827918,18.826489 L 35.85608,18.996582 C 35.512122,19.023953 35.158289,19.044807 34.794582,19.059144 C 34.430868,19.073482 34.060689,19.080651 33.684048,19.080651 C 32.740672,19.080651 31.984246,19.029818 31.414768,18.928154 C 30.848807,18.826489 30.551478,18.688982 30.522777,18.51563 C 30.493105,18.336415 30.730066,18.194346 31.233661,18.089422 C 31.740667,17.983848 32.437697,17.931061 33.324751,17.93106 C 34.120279,17.931061 34.756483,17.978635 35.233367,18.073781 C 35.713653,18.168278 35.967288,18.296987 35.994267,18.45991 M 35.013995,18.407123 C 34.990658,18.308718 34.828052,18.230189 34.526183,18.171535 C 34.227823,18.112884 33.839282,18.083558 33.36056,18.083556 C 32.81847,18.083558 32.388438,18.111906 32.070464,18.168603 C 31.756004,18.225301 31.582658,18.305134 31.550428,18.408101 L 35.013995,18.407123" id="text8279" sodipodi:nodetypes="cccsssccsssssssccssscc" style="font-size:4.65283775px;font-style:normal;font-weight:normal;fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans"/>+ <path d="M 28.987451,18.391483 L 29.023191,19.052302 L 28.051657,19.052302 L 28.016235,18.397348 C 28.010626,18.293729 27.89731,18.216178 27.676288,18.164693 C 27.455256,18.11321 27.126499,18.087468 26.690017,18.087467 C 26.165527,18.087468 25.753595,18.118423 25.454222,18.180333 C 25.154844,18.242245 25.008046,18.326639 25.013829,18.433517 L 25.047295,19.052302 L 24.070481,19.052302 L 24.011269,17.957453 L 24.988082,17.957453 L 24.997281,18.127546 C 25.226043,18.061726 25.496185,18.012523 25.807709,17.979937 C 26.122749,17.947353 26.486192,17.931061 26.898041,17.93106 C 27.577407,17.931061 28.093448,17.970162 28.446167,18.048365 C 28.798841,18.125917 28.979269,18.24029 28.987451,18.391483" id="path8286" sodipodi:nodetypes="ccccsssccccccsssc" style="font-size:4.65283775px;font-style:normal;font-weight:normal;fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans"/>+ <path d="M 17.102494,18.620228 L 17.149678,17.957453 L 18.121211,17.957453 L 18.074515,18.613385 C 18.067136,18.717005 18.170714,18.794882 18.385247,18.847018 C 18.599823,18.898502 18.925355,18.924244 19.361844,18.924244 C 19.886327,18.924244 20.302136,18.893288 20.609272,18.831377 C 20.919919,18.769466 21.079048,18.685072 21.086664,18.578193 L 21.130854,17.957453 L 22.102387,17.957453 L 22.024444,19.052302 L 21.052911,19.052302 L 21.064881,18.884164 C 20.824301,18.950637 20.54621,19.000166 20.23061,19.032751 C 19.918569,19.064684 19.556627,19.080651 19.144786,19.080651 C 18.465414,19.080651 17.95251,19.041549 17.606075,18.963345 C 17.259636,18.885142 17.091776,18.770769 17.102494,18.620228" id="path8289" sodipodi:nodetypes="ccccsssccccccsssc" style="font-size:4.65283775px;font-style:normal;font-weight:normal;fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans"/>+ </g>+ </g>+</svg>diff --git a/wger/manager/templates/workout/calendar.html b/wger/manager/templates/workout/calendar.htmlindex b75f993c7..36cb11247 100644--- a/wger/manager/templates/workout/calendar.html+++ b/wger/manager/templates/workout/calendar.html@@ -31,13 +31,12 @@ $(document).ready(function() {{% with tmp=grouped_logs|first %}{% with first_log=tmp.list|first %}<p>- Go to:- <a href="{{first_log.workout.get_absolute_url}}">workout</a> |- <a href="{% url 'workout-log' first_log.workout.id %}">log overview</a>+ <a href="{{first_log.workout.get_absolute_url}}" class="btn">{% trans "Workout" %}</a>+ <a href="{% url 'workout-log' first_log.workout.id %}" class="btn">{% trans "Log overview" %}</a></p>{% endwith %}{% endwith %}- <ul>+ <ul class="grouper-list">{% for i in grouped_logs %}<li>{{i.grouper}}<ul>@@ -56,22 +55,29 @@ $(document).ready(function() {{% block sidebar %}- <h3>{% trans 'Info' %}</h3>- <p>{% blocktrans %}The coloured days in the calendar have weight logs,+<h3>{% trans 'Info' %}</h3>+<p>{% blocktrans %}The coloured days in the calendar have weight logs,you can click on them to see the details. Click on an empty day toadd a log.{% endblocktrans %}</p><h3>{% trans 'Log' %}</h3>-<p><a href="{% url 'workout-calendar' %}">{% trans "Go to today" %}</a></p>-<div>+<p>+ <a href="{% url 'workout-calendar' %}">+ <img src="{% static 'images/icons/calendar.svg' %}"+ width="32"+ height="32"+ alt="{% trans 'Go to current month' %}">+ {% trans "Go to current month" %}</a>+</p>+<div class="timeline-log">{% for date in month_list %}{% ifchanged date.year %}<p><strong>{{ date|date:"Y" }}</strong></p>{% endifchanged %}{% if current_month = date.month and current_year = date.year %}- {{date|date:"F"}}<br>+ <span>{{date|date:"F"}}</span><br>{% else %}- <a href="{% url 'workout-calendar' date.year date.month %}">{{date|date:"F"}}</a><br>+ <span><a href="{% url 'workout-calendar' date.year date.month %}">{{date|date:"F"}}</a></span><br>{% endif %}{% endfor %}</div>