Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
This merged and deployed now. Thanks Trimard for this feature and being that patient with my slow answers :-) -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
> Reducing to 120px or 100 is big enough, imho. 100px is too small to be readable IMO so I didn't reduce it further than 120px but if we lack space we could also find some other rearrangement possible. I also decrease the average width of their container, that simplify already :) I applied approximately all your other suggestions. Indeed good points! -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
> I added also a button to hide/show the clocks, because in my tests I found
> that it becomes quite cumbersum to scroll when some user have a lot of
> available hours.
Good idea :-) Currently the clocks are hidden by default, but i think the other
way around would be better. So: Show the clocks by default and make hiding
optional.
I tried that my self but got lost in the js file :-D
The rest i could do by myself, so feel free to change that or not.
I think the clocks are also a bit big. Reducing to 120px or 100 is big enough,
imho.
Please make the parenthesis for messages_inbox_count optional and add a title.
Something like:
{% if messages_inbox_count %}
Messages
{% else %}
Messages
{% endif %}
And the last thing ( really ;) ): Replace 'Schedule your playtimes' with
'Playtime Scheduler'. I think that fits better.
--
https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570
Your team Widelands Developers is subscribed to branch lp:widelands-website.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
Ok bug fixed, and indeed a row organization is easier to understand! I added also a button to hide/show the clocks, because in my tests I found that it becomes quite cumbersum to scroll when some user have a lot of available hours. -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
Review: Needs Fixing The view of Players available needs fixing: http://preview.ibb.co/iewcqn/scheduling_show_dates.png The position of the PM clock is messed up. Currently the available dates/hours for one user is shown in a column and the next column shows the available times for the next user. I think it would be better to show all available times for one user in the first row(s). If another user has available times, it should be on its own row(s) then. For the users name it should be shown as 'is', not with uppercase first letter, imho. -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
Thanks for keeping on it :-) How about moving the link to schedule into the loginbox? Replacing "You have x new messages" with the link to scheduling_main and add the numbers of new messages (if there are any) in parenthesis behind the String "Messages". http://image.ibb.co/jONJGH/shedule_in_loginbox.png If there are any new messages, this could be also displayed in a tooltip. One thing in base.html: The block extra_head has to be closed before block title begins. Otherwise the blocks aren't parsed correctly and the string "Scheduling - widelands.org" appears as a white string above the logo. Can you please remove the proposal to merge from the other branch 'scheduling_module'? Thanks :-) -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
Thanks of the inputs! Changes were quick :)
Diff comments:
>
> === added file 'media/css/scheduling.css'
> --- media/css/scheduling.css 1970-01-01 00:00:00 +
> +++ media/css/scheduling.css 2018-01-17 19:07:26 +
> @@ -0,0 +1,230 @@
> +/* Main */
> +.main-choices {
> +display: flex;
> +justify-content: space-around;
> +margin-top: 40px;
> +}
> +
> +.main-choices button {
> +padding: 40px;
> +font-size: 1em;
> +}
> +
> +/* actual scheduling module */
> +#calandar {
calendar you mean? :). yes!
> +display: flex;
> +justify-content: center;
> +}
> +
> +/* Hours of each day display for the user */
> +.day {
> +margin-bottom: 15px;
> +background-image: url("../img/black50.png");
> +padding: 10px;
> +}
> +
> +.day-title h3{
> +color:white;
> +font-weight: bold;
> +margin-top: 0;
> +}
> +
> +.hours-wrapper {
> +display: flex;
> +}
> +
> +.hours-title-wrapper {
> +display: flex;
> +width: 100%;
> +}
> +
> +.hours-title-wrapper p{
> +width: 42px;
> +user-select: none;
> +}
> +
> +.hours {
> +border: 1px solid #909090;
> +height:40px;
> +width: 40px;
> +cursor: pointer;
> +}
> +
> +.hours.selected {
> +background-color: #118811;
> +}
> +
> +.hours:hover {
> +background-color: lightgreen;
> +}
> +
> +.hidden-hour {
> +height: 40px;
> +width: 40px;
> +}
> +
> +
> +/* Display for the other users */
> +#other-users-wrapper {
> +display: flex;
> +flex-wrap: wrap;
> +padding: 1%;
> +}
> +
> +.other-user-div{
> +width: 29%;
> +border: 1px solid black;
> +background-image: url("../img/black50.png");
> +padding: 11px;
> +margin-top: 5px;
> +margin-right: 5px;
> +}
> +
> +.other-user-div > div {
> +margin-top: 14px;
> +}
> +
> +.other-user-div .hours{
> +height: 10px;
> +width: 20px;
> +}
> +
> +.other-user-div .title {
> +height: 36px;
> +display: flex;
> +justify-content: space-between;
> +margin-top: 0;
> +}
> +
> +.other-user-div .title p {
> +font-size: 20px;
> +margin-top: 5px;
> +text-transform: capitalize;
> +white-space: nowrap;
> +overflow: hidden !important;
> +text-overflow: ellipsis;
> +color: #feea72;;
> +font-weight: bold;
> +}
> +
> +.other-user-div .title button {
> +min-width: 114px;
> +}
> +
> +.other-user-div .title button:hover {
> +background-color:#118811;;
> +}
> +
> +.other-user-div .title img {
> +margin-right: 4px;
> +}
> +
> +
> +/* btn */
> +#validate-btn {
> +margin-top: 10px;
> +}
> +
> +
> +/**/
> +/* CSS for the datepicker */
> +/**/
> +
> +.ui-datepicker {
> +background-image: url("../img/wood.png");
> +border: 1px solid black;
> +border-radius: 4px;
> +box-shadow: 4px 4px 4px 0px rgba(0, 0, 0, 0.7);
> +padding: 0.8em;
> +display: none;
> +}
> +
> +.ui-datepicker-header {
> +text-align: center;
> +border: 1px inset darkgray;
> +background-image: url("../img/black50.png");
> +margin-bottom: 5px;
> +}
> +
> +.ui-datepicker-calendar {
> +border: 1px inset darkgray;
> +background-image: url("../img/black20.png");
> +}
> +
> +.ui-datepicker-prev {
> +padding: 0 3em 0 0;
> +cursor: pointer;
> +}
> +
> +.ui-datepicker-next {
> +padding: 0 0 0 3em;
> +cursor: pointer;
> +}
> +
> +.ui-widget-content {
> +display: flex !important;
> +justify-content: space-around;
> +width: 540px !important;
> +}
> +
> +.ui-datepicker-header {
> +height: 42px;
> +position: relative;
> +}
> +
> +.ui-datepicker-title {
> +position: absolute;
> +transform: translateX(-50%);
> +left: 50%;
> +bottom: 0;
> +}
> +
> +
> +
> +
> +/** clock **/
> +
> +#clocks-wrapper {
> +display:flex;
Good point, that's why I love flex!
> +height: 210px;
> +margin-top: 20px;
> +background-image: url("../img/black50.png");
> +}
> +
> +#clocks-wrapper h1{
> +text-align: center;
> +}
> +
> +svg.clock-svg {
> +width: 150px;
> +height: 150px;
> +}
> +
> +.hour-area {
> +stroke-linejoin:round;
> +stroke-width:8;
> +fill: #312925;
> +stroke: black;
> +}
> +
> +.hour-area.active {
> +fill: #118811;
> +}
> +
> +
> +.number-wrapper {
> +line-height:100%;
> +fill: white;
> +
> +stroke:black;
> +stroke-width:2.7;
> +}
> +
> +.number {
> +-inkscape-font-specification: "sans-serif";
> +font-family:"sans-serif";
> +}
> +
> +.circle {
> +fill: #312925;
> +}
> \ No newline at end of file
--
https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570
Your team Widelands Developers is requested to review the proposed merge of
lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe :
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
Another round of proofreading. Sorry for being so nitpicking...
Comments in the code.
Diff comments:
>
> === added file 'media/css/scheduling.css'
> --- media/css/scheduling.css 1970-01-01 00:00:00 +
> +++ media/css/scheduling.css 2018-01-17 19:07:26 +
> @@ -0,0 +1,230 @@
> +/* Main */
> +.main-choices {
> +display: flex;
> +justify-content: space-around;
> +margin-top: 40px;
> +}
> +
> +.main-choices button {
> +padding: 40px;
> +font-size: 1em;
> +}
> +
> +/* actual scheduling module */
> +#calandar {
> +display: flex;
> +justify-content: center;
> +}
> +
> +/* Hours of each day display for the user */
> +.day {
> +margin-bottom: 15px;
> +background-image: url("../img/black50.png");
> +padding: 10px;
> +}
> +
> +.day-title h3{
> +color:white;
> +font-weight: bold;
> +margin-top: 0;
> +}
> +
> +.hours-wrapper {
> +display: flex;
> +}
> +
> +.hours-title-wrapper {
> +display: flex;
> +width: 100%;
> +}
> +
> +.hours-title-wrapper p{
> +width: 42px;
> +user-select: none;
> +}
> +
> +.hours {
> +border: 1px solid #909090;
> +height:40px;
> +width: 40px;
> +cursor: pointer;
> +}
> +
> +.hours.selected {
> +background-color: #118811;
> +}
> +
> +.hours:hover {
> +background-color: lightgreen;
> +}
> +
> +.hidden-hour {
> +height: 40px;
> +width: 40px;
> +}
> +
> +
> +/* Display for the other users */
> +#other-users-wrapper {
> +display: flex;
> +flex-wrap: wrap;
> +padding: 1%;
> +}
> +
> +.other-user-div{
> +width: 29%;
> +border: 1px solid black;
> +background-image: url("../img/black50.png");
> +padding: 11px;
> +margin-top: 5px;
> +margin-right: 5px;
> +}
> +
> +.other-user-div > div {
> +margin-top: 14px;
> +}
> +
> +.other-user-div .hours{
> +height: 10px;
> +width: 20px;
> +}
> +
> +.other-user-div .title {
> +height: 36px;
> +display: flex;
> +justify-content: space-between;
> +margin-top: 0;
> +}
> +
> +.other-user-div .title p {
> +font-size: 20px;
> +margin-top: 5px;
> +text-transform: capitalize;
> +white-space: nowrap;
> +overflow: hidden !important;
> +text-overflow: ellipsis;
> +color: #feea72;;
> +font-weight: bold;
> +}
> +
> +.other-user-div .title button {
> +min-width: 114px;
> +}
> +
> +.other-user-div .title button:hover {
> +background-color:#118811;;
> +}
> +
> +.other-user-div .title img {
> +margin-right: 4px;
> +}
> +
> +
> +/* btn */
> +#validate-btn {
> +margin-top: 10px;
> +}
> +
> +
> +/**/
> +/* CSS for the datepicker */
> +/**/
> +
> +.ui-datepicker {
> +background-image: url("../img/wood.png");
> +border: 1px solid black;
> +border-radius: 4px;
> +box-shadow: 4px 4px 4px 0px rgba(0, 0, 0, 0.7);
> +padding: 0.8em;
> +display: none;
> +}
> +
> +.ui-datepicker-header {
> +text-align: center;
> +border: 1px inset darkgray;
> +background-image: url("../img/black50.png");
> +margin-bottom: 5px;
> +}
> +
> +.ui-datepicker-calendar {
> +border: 1px inset darkgray;
> +background-image: url("../img/black20.png");
> +}
> +
> +.ui-datepicker-prev {
> +padding: 0 3em 0 0;
> +cursor: pointer;
> +}
> +
> +.ui-datepicker-next {
> +padding: 0 0 0 3em;
> +cursor: pointer;
> +}
> +
> +.ui-widget-content {
> +display: flex !important;
> +justify-content: space-around;
> +width: 540px !important;
> +}
> +
> +.ui-datepicker-header {
> +height: 42px;
> +position: relative;
> +}
> +
> +.ui-datepicker-title {
> +position: absolute;
> +transform: translateX(-50%);
> +left: 50%;
> +bottom: 0;
> +}
> +
> +
> +
> +
> +/** clock **/
> +
> +#clocks-wrapper {
> +display:flex;
To have the clocks in a row can't we add:
flex-flow: row wrap;
? So on small screens they get wrapped but on big screens they are in a row.
> +height: 210px;
> +margin-top: 20px;
> +background-image: url("../img/black50.png");
> +}
> +
> +#clocks-wrapper h1{
> +text-align: center;
> +}
> +
> +svg.clock-svg {
> +width: 150px;
> +height: 150px;
> +}
> +
> +.hour-area {
> +stroke-linejoin:round;
> +stroke-width:8;
> +fill: #312925;
> +stroke: black;
> +}
> +
> +.hour-area.active {
> +fill: #118811;
> +}
> +
> +
> +.number-wrapper {
> +line-height:100%;
> +fill: white;
> +
> +stroke:black;
> +stroke-width:2.7;
> +}
> +
> +.number {
> +-inkscape-font-specification: "sans-serif";
> +font-family:"sans-serif";
> +}
> +
> +.circle {
> +fill: #312925;
> +}
> \ No newline at end of file
>
> === added directory 'templates/wlscheduling'
> === added file 'templates/wlscheduling/base.html'
> --- templates/wlscheduling/base.html 1970-01-01 00:00:00 +
> +++ templates/wlscheduling/base.html 2018-01-17 19:07:26 +
> @@ -0,0 +1,9 @@
> +{% extends "base.html" %}
Something
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
Thanks :-) Looks better now.
I did a first round of proofreading and added some comments, mainly nits.
I am not sure if we should show the 'Scheduling' in the main menu, which has
already many entrys. Since both links in that view needs logging in, i think
showing 'Scheduling' should also be only shown if a user has logged in? Not
sure though.
I have no time left for now...
Diff comments:
>
> === added file 'media/css/scheduling.css'
> --- media/css/scheduling.css 1970-01-01 00:00:00 +
> +++ media/css/scheduling.css 2018-01-17 19:07:26 +
> @@ -0,0 +1,230 @@
> +/* Main */
> +.main-choices {
> +display: flex;
> +justify-content: space-around;
> +margin-top: 40px;
> +}
> +
> +.main-choices button {
> +padding: 40px;
> +font-size: 1em;
> +}
> +
> +/* actual scheduling module */
> +#calandar {
shouldn't this be calender?
> +display: flex;
> +justify-content: center;
> +}
> +
> +/* Hours of each day display for the user */
> +.day {
> +margin-bottom: 15px;
> +background-image: url("../img/black50.png");
> +padding: 10px;
> +}
> +
> +.day-title h3{
> +color:white;
Please add a space after the colon. Also on some places below.
> +font-weight: bold;
> +margin-top: 0;
> +}
> +
> +.hours-wrapper {
> +display: flex;
> +}
> +
> +.hours-title-wrapper {
> +display: flex;
> +width: 100%;
> +}
> +
> +.hours-title-wrapper p{
> +width: 42px;
> +user-select: none;
> +}
> +
> +.hours {
> +border: 1px solid #909090;
> +height:40px;
> +width: 40px;
> +cursor: pointer;
> +}
> +
> +.hours.selected {
> +background-color: #118811;
> +}
> +
> +.hours:hover {
> +background-color: lightgreen;
> +}
> +
> +.hidden-hour {
> +height: 40px;
> +width: 40px;
> +}
> +
> +
> +/* Display for the other users */
> +#other-users-wrapper {
> +display: flex;
> +flex-wrap: wrap;
> +padding: 1%;
> +}
> +
> +.other-user-div{
> +width: 29%;
> +border: 1px solid black;
> +background-image: url("../img/black50.png");
> +padding: 11px;
> +margin-top: 5px;
> +margin-right: 5px;
> +}
> +
> +.other-user-div > div {
> +margin-top: 14px;
> +}
> +
> +.other-user-div .hours{
> +height: 10px;
> +width: 20px;
> +}
> +
> +.other-user-div .title {
> +height: 36px;
> +display: flex;
> +justify-content: space-between;
> +margin-top: 0;
> +}
> +
> +.other-user-div .title p {
> +font-size: 20px;
> +margin-top: 5px;
> +text-transform: capitalize;
> +white-space: nowrap;
> +overflow: hidden !important;
> +text-overflow: ellipsis;
> +color: #feea72;;
> +font-weight: bold;
> +}
> +
> +.other-user-div .title button {
> +min-width: 114px;
> +}
> +
> +.other-user-div .title button:hover {
> +background-color:#118811;;
Double semi-colon
> +}
> +
> +.other-user-div .title img {
> +margin-right: 4px;
> +}
> +
> +
> +/* btn */
> +#validate-btn {
> +margin-top: 10px;
> +}
> +
> +
> +/**/
> +/* CSS for the datepicker */
> +/**/
> +
> +.ui-datepicker {
> +background-image: url("../img/wood.png");
> +border: 1px solid black;
> +border-radius: 4px;
> +box-shadow: 4px 4px 4px 0px rgba(0, 0, 0, 0.7);
> +padding: 0.8em;
> +display: none;
> +}
> +
> +.ui-datepicker-header {
> +text-align: center;
> +border: 1px inset darkgray;
> +background-image: url("../img/black50.png");
> +margin-bottom: 5px;
> +}
> +
> +.ui-datepicker-calendar {
> +border: 1px inset darkgray;
> +background-image: url("../img/black20.png");
> +}
> +
> +.ui-datepicker-prev {
> +padding: 0 3em 0 0;
> +cursor: pointer;
> +}
> +
> +.ui-datepicker-next {
> +padding: 0 0 0 3em;
> +cursor: pointer;
> +}
> +
> +.ui-widget-content {
> +display: flex !important;
> +justify-content: space-around;
> +width: 540px !important;
> +}
> +
> +.ui-datepicker-header {
> +height: 42px;
> +position: relative;
> +}
> +
> +.ui-datepicker-title {
> +position: absolute;
> +transform: translateX(-50%);
> +left: 50%;
> +bottom: 0;
> +}
> +
> +
> +
> +
> +/** clock **/
> +
> +#clocks-wrapper {
> +display:flex;
> +height: 210px;
> +margin-top: 20px;
> +background-image: url("../img/black50.png");
> +}
> +
> +#clocks-wrapper h1{
> +text-align: center;
> +}
> +
> +svg.clock-svg {
> +width: 150px;
> +height: 150px;
> +}
> +
> +.hour-area {
> +stroke-linejoin:round;
> +stroke-width:8;
> +fill: #312925;
> +stroke: black;
> +}
> +
> +.hour-area.active {
> +fill: #118811;
> +}
> +
> +
> +.number-wrapper {
> +line-height:100%;
> +fill: white;
> +
> +stroke:black;
> +stroke-width:2.7;
> +}
> +
> +.number {
> +-inkscape-font-specification: "sans-serif";
> +font-family:"sans-serif";
> +}
> +
> +.circle {
> +fill: #312925;
> +}
> \ No newline at end of file
>
> === added file 'm
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
Always so cool working with you guys! All your suggestions were indeed on point: https://imgur.com/4Oaw59y -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
Thanks for the screenshots! Can you use a sans serif font (e.g. Arial) for the Latin numbers rather than the serif font that you have like now? his will greatly increase legibility. As a rule of thumb, use serif for printed publications and sans serif for computer screens. -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
I like the one with less numbers better. Just switch the AM and PM to the top of the clocks? I'll try to review the code this week. Please merge trunk and push again, to get the latest change in. Sorry for replying so late... -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
Actual test with number border (sry wrong upload): https://imgur.com/CTQ6AwE Oh and the cardinal test too, forgot it: https://imgur.com/XOUMyBY -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
Ok I definitely should add latin numbers to set the hours too. That's far more easier to read. And more widelandish I would say? -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
He're the numbers: https://imgur.com/qldkcnz Ok and that one was fun to do: https://imgur.com/RgJly1q -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
I think the numbers on the clock are a bit hard to read now - might just be the quality on Imgur though. How about giving the numbers a border too, or only showing the 4 cardinal numbers? -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
Yeah border was a good idea, it's clearer now. Clear enough though? https://imgur.com/PeIVvyH There is some finition to the design to do (bad alignments, some pixel are black when they shouldn't etc). But I'll do that when we agree at least on the basis :P -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
I agree, your examples looks a bit chaotic :-D I believe many people do not have that many times available. Maybe give the cake slices a border? Or/and using another background for not available hours? Let's wait for GunChleoc, she has good ideas for such things :-) Can you update your branch so i can download the latest changes? -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
Like that then? :) https://imgur.com/Jh8tPqE It looks a bit confusing for me, but maybe people will have less chaotic availabilities than my examples? -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
Oh a misunderstanding. I meant the clock not for setting the availabilities, but for showing other users availabilities set. Over there it could be much smaller, imho. Some numbers could be omitted also. The clock looks good otherwise :-) -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
>We could have two clocks: AM and PM. The idea needs some images though. A good >playground for using image sprites. I prefered to go directly and implement it. Wasn't sure svg would work fine. [Here is the link](https://i.imgur.com/Zt3fnQn.png) Only problem I have with this is that the clock will have to stay big because otherwise it will be hard to select each day. I can try and make them smaller a bit though. Or maybe a button to make them smaller/bigger? >But if you think you need it, it's ok :-) I'll keep it for now then :P. Simply to avoid extra work at anyway^^ -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
> For selecting multiple dates at the same time. You cannot do it directly with > jquery ui. If you have an idea on how to do without im all ears :) This looks very simple to me: http://jsfiddle.net/gydL0epa/ Derived from: https://stackoverflow.com/questions/1452066/jquery-ui-datepicker-multiple-date-selections But if you think you need it, it's ok :-) We could have two clocks: AM and PM. The idea needs some images though. A good playground for using image sprites. -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
> I just do not know why the additional multidatespicker library has to be used. For selecting multiple dates at the same time. You cannot do it directly with jquery ui. If you have an idea on how to do without im all ears :) Very giod idea for the timer!! Though a 24hour clock might be weird? I need to test that! -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
I just do not know why the additional multidatespicker library has to be used. An idea for the page where other users available times are displayed: Currently there is a bar shown which is not very intuitive to understand, although the tooltips say the time. Maybe we can exchange the bar with some sort of an analog clock, showing the hours as colored circular sector (cake slice). What do you think? -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
Diff comments:
>
> === added file 'templates/wlscheduling/scheduling.html'
> --- templates/wlscheduling/scheduling.html1970-01-01 00:00:00 +
> +++ templates/wlscheduling/scheduling.html2018-01-07 10:56:24 +
> @@ -0,0 +1,76 @@
> +
> +{% extends "wlscheduling/base.html" %}
> +{% comment %}
> + vim:ft=htmldjango
> +{% endcomment %}
> +
> +
> +
> +{% block content %}
> +
> +document.addEventListener('DOMContentLoaded', function(){
> +var calendar = createCalandar();
> +addTimeZoneWarningIfNeeded();
> +addPreviousDateFromUser(calendar);
> +addOtherUsersAvailabilities();
> +
> +//Validate btn
> +document.getElementById('validate-btn').onclick = function () {
> +sendDataAsForm(calendar);
> +}
> +}, false);
> +
> +
> +Multiplayer
> +
> +
> +Select the dates you'll be available on
> +{% include "wlscheduling/timezone-msg.html" %}
> +
> +
> +
> +Select the hours you'll be available on these dates
> +
> +Players that are currently available at the same hours as
> you
> +
> +Sorry, there are
> currently no players available at these hours. But your availabilities are
> noted, and another user might want to play with you!
> +Update
> +
> +
> +
> +
> +
> +
> +
> +
> +{% for i in "x" %}
> +{{ forloop.counter0 }}
> +{% endfor %}
> +
> +
> +{% for i in "" %}
> +
> +{% endfor %}
> +
> +
> +
> +
> +
> +
> +
> +
> +{% for i in "" %}
> +
> +{% endfor %}
> +
> +
This template is used both in find.html and scheduling.html. Should I rather
create a new file with just this template and add it with include?
> +
> +
> +
> +
Same remark
> +
> +
> + day-to-fill = "{{ current_user_availabilities }}"
> users-to-fill="{{other_users_availabilities}}" csrf-token = "{% csrf_token
> %}">
> +
> +
> +{% endblock %}
--
https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570
Your team Widelands Developers is requested to review the proposed merge of
lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
Ok, fixed the bugs you were talking about except this one: "- Selecting multiple dates do not work, e.g. Click on 8. January hold mouse button down and move the mouse to 10. January -> no date blocks are shown. Do i misunderstand the multidatepicker?" That's normal actually. You should select each dates one by one. You think it's too confusing? I'm not sure many people will be available on that many days that they can't click the dates one by one. I might be wrong though. -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
I did a small test without a deeper look into the code and found some things which needs fixing: On http://localhost:8000/scheduling/scheduling/ : - There is a small area showing the wooden background below the footer. I remember having the same when implementing the datepicker for the search, but i didn't remember how i solved it :-D - Selecting multiple dates do not work, e.g. Click on 8. January hold mouse button down and move the mouse to 10. January -> no date blocks are shown. Do i misunderstand the multidatepicker? - If one chooses a date the form where one should choose the available time has more width than the div "blogEntry". Resolution here 1366x768, Browser is Opera I will be rarely online the next few days. -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
You have to write a management command for this. See: https://docs.djangoproject.com/en/1.8/howto/custom-management-commands/ We use such of those commands in a cron job on the server which automatically run every day. Eg. for updating the search index or the encyclopedia. -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website
As Sirver said about my database cleanup: "deletion can make this execute arbitrarily slow. Deletion of old objects should be done in ./manage.py cleanup. Add a TODO for this?" Any idea where I should add my code for it to execute on cleanup? -- https://code.launchpad.net/~trimardio/widelands-website/module_scheduling/+merge/335570 Your team Widelands Developers is requested to review the proposed merge of lp:~trimardio/widelands-website/module_scheduling into lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
