From 350836aeb2926b05019c2bd780eeba31441cfbde Mon Sep 17 00:00:00 2001 From: Evarin Date: Wed, 21 Nov 2018 19:46:41 +0100 Subject: [PATCH] Revert to old_css --- .../{old_css => css}/_dashed-shadows.scss | 0 shared/static/{old_css => css}/_filters.scss | 0 shared/static/{old_css => css}/_forms.scss | 0 shared/static/{old_css => css}/_header.scss | 0 shared/static/{old_css => css}/_messages.scss | 0 shared/static/{old_css => css}/_tree.scss | 0 .../static/{old_css => css}/_variables.scss | 0 .../static/{old_css => css}/bootstrap.min.css | 0 .../{old_css => css}/bootstrap.min.css.map | 0 shared/static/css/global.css | 764 +----- shared/static/{old_css => css}/global.css.map | 0 shared/static/{old_css => css}/global.min.css | 0 shared/static/css/global.scss | 2 +- shared/static/{old_css => css}/header.css | 0 shared/static/js/api-models.js | 36 + shared/static/js/backbone-relational.js | 2076 +++++++++++++++++ shared/static/new_css/global.css | 763 ++++++ .../static/{old_css => new_css}/global.scss | 2 +- shared/static/{css => new_css}/ie.css | 0 shared/static/{css => new_css}/print.css | 0 shared/static/{css => new_css}/screen.css | 0 .../forms.scssc | Bin 15338 -> 0 bytes .../global.scssc | Bin 58159 -> 0 bytes .../header.scssc | Bin 19477 -> 0 bytes .../messages.scssc | Bin 5807 -> 0 bytes .../tree.scssc | Bin 8655 -> 0 bytes .../variables.scssc | Bin 13037 -> 0 bytes shared/static/old_css/global.css | 1 - 28 files changed, 2878 insertions(+), 766 deletions(-) rename shared/static/{old_css => css}/_dashed-shadows.scss (100%) rename shared/static/{old_css => css}/_filters.scss (100%) rename shared/static/{old_css => css}/_forms.scss (100%) rename shared/static/{old_css => css}/_header.scss (100%) rename shared/static/{old_css => css}/_messages.scss (100%) rename shared/static/{old_css => css}/_tree.scss (100%) rename shared/static/{old_css => css}/_variables.scss (100%) rename shared/static/{old_css => css}/bootstrap.min.css (100%) rename shared/static/{old_css => css}/bootstrap.min.css.map (100%) mode change 100644 => 120000 shared/static/css/global.css rename shared/static/{old_css => css}/global.css.map (100%) rename shared/static/{old_css => css}/global.min.css (100%) rename shared/static/{old_css => css}/header.css (100%) create mode 100644 shared/static/js/api-models.js create mode 100644 shared/static/js/backbone-relational.js create mode 100644 shared/static/new_css/global.css rename shared/static/{old_css => new_css}/global.scss (99%) rename shared/static/{css => new_css}/ie.css (100%) rename shared/static/{css => new_css}/print.css (100%) rename shared/static/{css => new_css}/screen.css (100%) delete mode 100644 shared/static/old_css/.sass-cache/702601a8b7490c5ef78bf7afc3c3f2736c608d56/forms.scssc delete mode 100644 shared/static/old_css/.sass-cache/702601a8b7490c5ef78bf7afc3c3f2736c608d56/global.scssc delete mode 100644 shared/static/old_css/.sass-cache/702601a8b7490c5ef78bf7afc3c3f2736c608d56/header.scssc delete mode 100644 shared/static/old_css/.sass-cache/702601a8b7490c5ef78bf7afc3c3f2736c608d56/messages.scssc delete mode 100644 shared/static/old_css/.sass-cache/702601a8b7490c5ef78bf7afc3c3f2736c608d56/tree.scssc delete mode 100644 shared/static/old_css/.sass-cache/702601a8b7490c5ef78bf7afc3c3f2736c608d56/variables.scssc delete mode 120000 shared/static/old_css/global.css diff --git a/shared/static/old_css/_dashed-shadows.scss b/shared/static/css/_dashed-shadows.scss similarity index 100% rename from shared/static/old_css/_dashed-shadows.scss rename to shared/static/css/_dashed-shadows.scss diff --git a/shared/static/old_css/_filters.scss b/shared/static/css/_filters.scss similarity index 100% rename from shared/static/old_css/_filters.scss rename to shared/static/css/_filters.scss diff --git a/shared/static/old_css/_forms.scss b/shared/static/css/_forms.scss similarity index 100% rename from shared/static/old_css/_forms.scss rename to shared/static/css/_forms.scss diff --git a/shared/static/old_css/_header.scss b/shared/static/css/_header.scss similarity index 100% rename from shared/static/old_css/_header.scss rename to shared/static/css/_header.scss diff --git a/shared/static/old_css/_messages.scss b/shared/static/css/_messages.scss similarity index 100% rename from shared/static/old_css/_messages.scss rename to shared/static/css/_messages.scss diff --git a/shared/static/old_css/_tree.scss b/shared/static/css/_tree.scss similarity index 100% rename from shared/static/old_css/_tree.scss rename to shared/static/css/_tree.scss diff --git a/shared/static/old_css/_variables.scss b/shared/static/css/_variables.scss similarity index 100% rename from shared/static/old_css/_variables.scss rename to shared/static/css/_variables.scss diff --git a/shared/static/old_css/bootstrap.min.css b/shared/static/css/bootstrap.min.css similarity index 100% rename from shared/static/old_css/bootstrap.min.css rename to shared/static/css/bootstrap.min.css diff --git a/shared/static/old_css/bootstrap.min.css.map b/shared/static/css/bootstrap.min.css.map similarity index 100% rename from shared/static/old_css/bootstrap.min.css.map rename to shared/static/css/bootstrap.min.css.map diff --git a/shared/static/css/global.css b/shared/static/css/global.css deleted file mode 100644 index 231b526..0000000 --- a/shared/static/css/global.css +++ /dev/null @@ -1,763 +0,0 @@ -@charset "UTF-8"; -/*NE PAS MODIFIER LE FICHIER .CSS, MAIS PLUTÔT LE - FICHIER .SCSS */ -/* LEGACY COLORS*/ -/* COLORS */ -/* Header */ -/* Général */ -/* Le reste */ -/* Titres */ -/* FONTS */ -/* line 2, ../sass/_messages.scss */ -.message-info { - color: #31708f; - background-color: #d9edf7; - border-color: #bce8f1; -} - -/* line 7, ../sass/_messages.scss */ -.message-success { - color: #3c763d; - background-color: #dff0d8; - border-color: #d6e9c6; -} - -/* line 12, ../sass/_messages.scss */ -.message-warning { - color: #8a6d3b; - background-color: #fcf8e3; - border-color: #faebcc; -} - -/* line 17, ../sass/_messages.scss */ -.message-error { - color: #a94442; - background-color: #f2dede; - border-color: #ebccd1; -} - -/* line 22, ../sass/_messages.scss */ -.alert { - margin-bottom: 0; -} - -/* line 2, ../sass/_header.scss */ -.strong-banner { - padding-top: 20px; - padding-bottom: 10px; - background-color: #375362; - color: white; -} - -/* line 10, ../sass/_header.scss */ -.navbar-inverse { - background-color: #375362; - background-color: transparent; - border-style: none; -} -/* line 15, ../sass/_header.scss */ -.navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:focus, .navbar-inverse .navbar-nav > .open > a:hover { - color: #fff; - background-color: #5D8CA6; -} - -/* line 24, ../sass/_header.scss */ -.navbar-collapse { - border-top: 0px solid transparent; - padding: 0px; - /* only < 768px*/ - background-color: #5D8CA6; - padding-left: 25px; - margin-left: -15px; - margin-right: -15px; -} -@media (min-width: 768px) { - /* line 24, ../sass/_header.scss */ - .navbar-collapse { - background-color: transparent; - padding-left: 0px; - margin-left: 0px; - margin-right: 0px; - } -} - -/* line 43, ../sass/_header.scss */ -.navbar-nav { - width: 100%; -} -@media (min-width: 768px) { - /* line 43, ../sass/_header.scss */ - .navbar-nav { - float: right; - width: auto; - } -} - -/* line 51, ../sass/_header.scss */ -.navbar-inverse { - /* BRAND */ - /* ICONE */ - /* LINKS */ -} -/* line 54, ../sass/_header.scss */ -.navbar-inverse .navbar-brand, .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus { - color: white; - font-family: "Lily Script One", cursive; - font-size: xx-large; - border-bottom: 5px solid #FF5C79; -} -/* line 65, ../sass/_header.scss */ -.navbar-inverse .navbar-toggle, .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { - background-color: #FFB363; - border-color: #FFB363; -} -/* line 71, ../sass/_header.scss */ -.navbar-inverse .navbar-toggle .icon-bar { - background-color: #FFF5EB; -} -/* line 78, ../sass/_header.scss */ -.navbar-inverse .navbar-nav > li > a, .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { - font-family: "Work Sans", cursive; - font-size: large; - color: #FFB363; - background: transparent; -} -@media (min-width: 768px) { - /* line 78, ../sass/_header.scss */ - .navbar-inverse .navbar-nav > li > a, .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { - color: #FFF5EB; - } -} - -/* line 108, ../sass/_forms.scss */ -.btn-primary { - /** - * This mixins allows defining color-related properties of buttons. - * - * It sets the following properties: - * color: $color, except for disabled-like buttons. - * border-color: $border. - * background-color: Depending on button state: - * - Default, disabled: - * $background-base - * - Hovered, focused, actived, responsible of an opened dropdown: - * (one is sufficent) - * $background-special - * - * ## Bootstrap compatibility - * - * This mixin can be used to replace colors behaviors of Bootstrap buttons. - * Indeed, this mixin aims to replace each definition done by the - * 'button-variant' Bootstrap mixin. - * - */ - color: white; - background-color: #FF6969; - border-color: #FF6969; - /** - * This mixin applies content if the button is in at least one of the - * following states: - * - * - hovered, - * - focused, - * - actived, - * - is responsible of an opened dropdown. - * - * Where possible, state is checked from class attribute and - * :pseudo-classes. - * - * ## Bootstrap compatibility - * - * If content defines 'color', 'background-color' and 'border', it is safe - * to use this mixin with Bootstrap buttons as it will overrides all - * Bootstrap color defaults of the previous cases. - * To be precise, this covers all special important-like cases of the - * Bootstrap mixin 'button-variant' (except the 'disabled' case). - * - */ -} -/* line 10, ../sass/_forms.scss */ -.btn-primary:focus, .btn-primary.focus, .btn-primary:hover { - color: white; - background-color: #FF9191; - border-color: #FF6969; -} -/* line 3, ../sass/_forms.scss */ -.btn-primary:active, .btn-primary.active { - color: white; - background-color: #FF9191; - border-color: #FF6969; -} -/* line 10, ../sass/_forms.scss */ -.btn-primary:active:focus, .btn-primary:active.focus, .btn-primary:active:hover, .btn-primary.active:focus, .btn-primary.active.focus, .btn-primary.active:hover { - color: white; - background-color: #FF9191; - border-color: #FF6969; -} -/* line 26, ../sass/_forms.scss */ -.open > .btn-primary.dropdown-toggle { - color: white; - background-color: #FF9191; - border-color: #FF6969; -} -/* line 10, ../sass/_forms.scss */ -.open > .btn-primary.dropdown-toggle:focus, .open > .btn-primary.dropdown-toggle.focus, .open > .btn-primary.dropdown-toggle:hover { - color: white; - background-color: #FF9191; - border-color: #FF6969; -} -/* line 10, ../sass/_forms.scss */ -.btn-primary.disabled:focus, .btn-primary.disabled.focus, .btn-primary.disabled:hover, .btn-primary[disabled]:focus, .btn-primary[disabled].focus, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:focus, fieldset[disabled] .btn-primary.focus, fieldset[disabled] .btn-primary:hover { - background-color: #FF6969; - border-color: #FF6969; -} -/* line 102, ../sass/_forms.scss */ -.btn-primary .badge { - color: #FF6969; - background-color: white; -} - -/* line 113, ../sass/_forms.scss */ -form#filter_form .form-group { - padding-right: 20px; -} -/* line 117, ../sass/_forms.scss */ -form#filter_form ul.form-control { - background-color: transparent; - border: none; - box-shadow: none; -} - -/* line 2, ../sass/_tree.scss */ -.tree { - font-size: large; -} -/* line 4, ../sass/_tree.scss */ -.tree ul, .tree li { - position: relative; -} -/* line 8, ../sass/_tree.scss */ -.tree ul { - list-style: none; - padding-left: 32px; -} -/* line 13, ../sass/_tree.scss */ -.tree li::before, -.tree li::after { - content: ""; - position: absolute; - left: -12px; -} -/* line 19, ../sass/_tree.scss */ -.tree li::before { - border-top: 3px solid #FFC282; - top: 9px; - width: 8px; - height: 0; -} -/* line 25, ../sass/_tree.scss */ -.tree li::after { - border-left: 3px solid #FFC282; - height: 100%; - width: 0px; - top: 2px; -} -/* line 31, ../sass/_tree.scss */ -.tree ul > li:last-child::after { - height: 8px; -} - -/* line 4, ../sass/_filters.scss */ -#filter_form .form-group .col-md-3, #filter_form .form-group .col-md-9 { - float: none; -} -/* line 7, ../sass/_filters.scss */ -#filter_form .form-group ul.form-control { - padding-left: 15px; - list-style: none; - height: auto; -} -/* line 12, ../sass/_filters.scss */ -#filter_form .form-group ul.form-control a.selected { - text-decoration: underline; - color: #c40000; -} - -/* line 18, ../sass/_dashed-shadows.scss */ -.dashed-shadow { - position: relative; - top: 8px; - left: 8px; - display: inline-block; - color: #ba9186; -} - -/* line 25, ../sass/_dashed-shadows.scss */ -.dashed-shadow:before { - content: " "; - display: block; - position: absolute; - top: -8px; - left: -8px; - bottom: -2px; - right: -2px; - z-index: 1; - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjEuMCIgeDI9IjEuMCIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIxMi41JSIgc3RvcC1jb2xvcj0iI2U4ZTNjNyIvPjxzdG9wIG9mZnNldD0iMTIuNSUiIHN0b3AtY29sb3I9IiNlOGUzYzciIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSIzNy41JSIgc3RvcC1jb2xvcj0iI2U4ZTNjNyIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjM3LjUlIiBzdG9wLWNvbG9yPSIjZThlM2M3Ii8+PHN0b3Agb2Zmc2V0PSI2Mi41JSIgc3RvcC1jb2xvcj0iI2U4ZTNjNyIvPjxzdG9wIG9mZnNldD0iNjIuNSUiIHN0b3AtY29sb3I9IiNlOGUzYzciIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSI4Ny41JSIgc3RvcC1jb2xvcj0iI2U4ZTNjNyIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9Ijg3LjUlIiBzdG9wLWNvbG9yPSIjZThlM2M3Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); - background-size: 100%; - background-image: -moz-linear-gradient(45deg, #e8e3c7 12.5%, rgba(232, 227, 199, 0) 12.5%, rgba(232, 227, 199, 0) 37.5%, #e8e3c7 37.5%, #e8e3c7 62.5%, rgba(232, 227, 199, 0) 62.5%, rgba(232, 227, 199, 0) 87.5%, #e8e3c7 87.5%); - background-image: -webkit-linear-gradient(45deg, #e8e3c7 12.5%, rgba(232, 227, 199, 0) 12.5%, rgba(232, 227, 199, 0) 37.5%, #e8e3c7 37.5%, #e8e3c7 62.5%, rgba(232, 227, 199, 0) 62.5%, rgba(232, 227, 199, 0) 87.5%, #e8e3c7 87.5%); - background-image: linear-gradient(45deg, #e8e3c7 12.5%, rgba(232, 227, 199, 0) 12.5%, rgba(232, 227, 199, 0) 37.5%, #e8e3c7 37.5%, #e8e3c7 62.5%, rgba(232, 227, 199, 0) 62.5%, rgba(232, 227, 199, 0) 87.5%, #e8e3c7 87.5%); - background-size: 6px 6px; -} - -/* line 54, ../sass/_dashed-shadows.scss */ -.dashed-shadow:hover:before { - animation: dash-animation 30s infinite linear; -} - -/* line 58, ../sass/_dashed-shadows.scss */ -.dashed-shadow:after { - z-index: 2; - content: attr(data-text); - position: absolute; - left: -8px; - top: -8px; - color: #b85b3f; - text-shadow: 3px 3px #e8e3c7; -} - -/* MISE EN FORME GÉNÉRALE */ -/* line 12, ../sass/global.scss */ -html { - height: 100%; - background-color: #FFFBEF; -} - -/* line 17, ../sass/global.scss */ -body { - font-family: "Saira Semi Condensed", sans-serif; - font-size: medium; -} - -/* line 22, ../sass/global.scss */ -#principal { - background-color: #FFFBEF; -} - -/*MAIN*/ -/* line 27, ../sass/global.scss */ -main { - background-color: #FFFBEF; - border-width: 2px; - border-color: #375362; - border-style: none; - border-collapse: collapse; - display: table-cell; - margin-top: 0px; - padding: 0px; -} -/* line 37, ../sass/global.scss */ -main .fuid, main h1, main h2, main h3 { - margin-left: -15px; - margin-right: -15px; - margin-top: 0px; - margin-bottom: 0px; -} -/* line 43, ../sass/global.scss */ -main h1, main h2, main h3 { - margin-top: -2px; - margin-bottom: -2px; - margin-left: -17px; - margin-right: -17px; - color: white; - padding-left: 15px; - padding-right: 15px; -} -/* line 52, ../sass/global.scss */ -main h1 { - font-family: "Capriola", sans-serif; - font-weight: 600; - padding-bottom: 10px; - padding-top: 15px; - background-color: #4F778C; -} -/* line 59, ../sass/global.scss */ -main h1.activity { - background-color: #4FADB8; -} -/* line 62, ../sass/global.scss */ -main h1.event { - background-color: #3488A6; -} -/* line 65, ../sass/global.scss */ -main h1.todo { - background-color: #F19F5D; -} -/* line 68, ../sass/global.scss */ -main h1.equipment { - background-color: #E75571; -} -/* line 71, ../sass/global.scss */ -main h1.staff { - background-color: #3BAD89; -} -/* line 75, ../sass/global.scss */ -main h2, main h3 { - border-bottom: 2px solid #5D8CA6; - padding-bottom: 5px; - padding-top: 10px; - font-family: "Capriola", sans-serif; - font-weight: 600; - font-size: x-large; - background-color: #BDD2DE; -} -/* line 84, ../sass/global.scss */ -main h2.activity, main h3.activity { - background-color: #5ED1DC; - border-color: #4FADB8; -} -/* line 88, ../sass/global.scss */ -main h2.event, main h3.event { - background-color: #3999BA; - border-color: #3488A6; -} -/* line 92, ../sass/global.scss */ -main h2.todo, main h3.todo { - background-color: #FF9C4D; - border-color: #F19F5D; -} -/* line 96, ../sass/global.scss */ -main h2.equipment, main h3.equipment { - background-color: #FF5C79; - border-color: #E75571; -} -/* line 100, ../sass/global.scss */ -main h2.staff, main h3.staff { - background-color: #42C2A2; - border-color: #3BAD89; -} -/* line 105, ../sass/global.scss */ -main h3 { - background-color: #F0FAFF; - color: #4F778C; -} -/* line 108, ../sass/global.scss */ -main h3.activity { - background-color: #F0FAFF; - color: #5ED1DC; -} -/* line 112, ../sass/global.scss */ -main h3.event { - background-color: #F0FAFF; - color: #3999BA; -} -/* line 116, ../sass/global.scss */ -main h3.todo { - background-color: #F0FAFF; - color: #FF9C4D; -} -/* line 120, ../sass/global.scss */ -main h3.equipment { - background-color: #F0FAFF; - color: #FF5C79; -} -/* line 124, ../sass/global.scss */ -main h3.staff { - background-color: #F0FAFF; - color: #42C2A2; -} -/* line 129, ../sass/global.scss */ -main a { - color: #FF6969; -} -/* line 132, ../sass/global.scss */ -main a:hover, main a:active, main a:focus { - color: #FF6969; -} -/* line 139, ../sass/global.scss */ -main .text { - padding: 15px; -} - -/*ASIDE*/ -/* line 145, ../sass/global.scss */ -aside { - background-color: #375362; - color: white; - margin-top: 0px; - padding: 0px !important; -} -/* line 151, ../sass/global.scss */ -aside a { - color: #FF9191; -} -/* line 154, ../sass/global.scss */ -aside a:hover, aside a:active, aside a:focus { - color: #FF9191; -} -/* line 161, ../sass/global.scss */ -aside code { - color: #375362; - background-color: #BDD2DE; -} -/* line 166, ../sass/global.scss */ -aside .heading { - padding: 8px 15px; - font-size: 32px; - line-height: 1.3; - text-align: center; -} -/* line 172, ../sass/global.scss */ -aside .heading.inverted { - background-color: #FFF5EB; - color: black; -} -/* line 177, ../sass/global.scss */ -aside .heading.small { - font-size: 25px; -} -/* line 180, ../sass/global.scss */ -aside .heading.small .sub { - font-size: 0.7em; - font-weight: normal; -} -/* line 186, ../sass/global.scss */ -aside .heading .sub { - font-size: 0.7em; - font-weight: normal; -} -/* line 191, ../sass/global.scss */ -aside .heading.separator { - border-bottom-color: #FF9191; - border-bottom-style: solid; -} -/* line 197, ../sass/global.scss */ -aside .text { - padding: 15px; -} -/* line 200, ../sass/global.scss */ -aside .text.inverted { - background-color: #FFF5EB; - color: black; -} - -@media (min-width: 768px) { - /* line 209, ../sass/global.scss */ - main { - margin-top: 20px; - border-style: dashed; - } - - /* line 213, ../sass/global.scss */ - aside { - margin-top: 20px; - } -} -/* line 218, ../sass/global.scss */ -hr { - border-top: 1px solid #FFB363; -} - -/* line 223, ../sass/global.scss */ -span.vsep { - padding-left: 5px; - padding-right: 5px; -} - -/* line 228, ../sass/global.scss */ -div.tag-list { - margin-top: 20px; -} - -/* line 232, ../sass/global.scss */ -code { - font-size: small; -} - -/* line 236, ../sass/global.scss */ -.module-list { - margin-top: 10px; - margin-bottom: 10px; - display: flex; - align-items: stretch; - flex-wrap: wrap; -} - -/* line 244, ../sass/global.scss */ -a.module { - padding: 20px 40px; - margin: 5px; - border-bottom-style: solid; - font-size: large; - display: block; - border-bottom-color: #375362; - background-color: #BDD2DE; - color: #375362; -} -/* line 256, ../sass/global.scss */ -a.module.activity { - border-bottom-color: #4FADB8; - background-color: #CAE4E7; - color: #4FADB8; -} -/* line 262, ../sass/global.scss */ -a.module.event { - border-bottom-color: #3488A6; - background-color: #AAD5E2; - color: #3488A6; -} -/* line 268, ../sass/global.scss */ -a.module.todo { - border-bottom-color: #F19F5D; - background-color: #FFDEBC; - color: #F19F5D; -} -/* line 274, ../sass/global.scss */ -a.module.equipment { - border-bottom-color: #E75571; - background-color: #FECAD6; - color: #E75571; -} -/* line 280, ../sass/global.scss */ -a.module.staff { - border-bottom-color: #3BAD89; - background-color: #A9E1D7; - color: #3BAD89; -} -/* line 286, ../sass/global.scss */ -a.module:hover, a.module:active, a.module:focus { - text-decoration: none; - color: #F0FAFF; - background-color: #375362; -} -/* line 293, ../sass/global.scss */ -a.module:hover.activity, a.module:active.activity, a.module:focus.activity { - background-color: #5ED1DC; -} -/* line 296, ../sass/global.scss */ -a.module:hover.event, a.module:active.event, a.module:focus.event { - background-color: #3999BA; -} -/* line 299, ../sass/global.scss */ -a.module:hover.equipment, a.module:active.equipment, a.module:focus.equipment { - background-color: #FF5C79; -} -/* line 302, ../sass/global.scss */ -a.module:hover.todo, a.module:active.todo, a.module:focus.todo { - background-color: #FF9C4D; -} -/* line 305, ../sass/global.scss */ -a.module:hover.staff, a.module:active.staff, a.module:focus.staff { - background-color: #42C2A2; -} - -/* line 311, ../sass/global.scss */ -.collapsible { - background-color: #777; - color: white; - cursor: pointer; - padding: 18px; - width: 100%; - border: none; - text-align: left; - outline: none; - font-size: 15px; -} -/* line 322, ../sass/global.scss */ -.collapsible:after { - content: '\002B'; - color: white; - font-weight: bold; - float: right; - margin-left: 5px; -} -/* line 330, ../sass/global.scss */ -.collapsible:hover { - background-color: #555; -} -/* line 334, ../sass/global.scss */ -.collapsible h3 { - margin-top: 0px; - margin-bottom: 0px; - display: inline-block; -} - -/* line 341, ../sass/global.scss */ -.active { - background-color: #555; -} -/* line 344, ../sass/global.scss */ -.active:after { - content: "\2212"; -} - -/* line 348, ../sass/global.scss */ -.content { - padding: 8px 18px; - display: none; - background-color: #f1f1f1; -} -/* line 353, ../sass/global.scss */ -.content.fluid { - padding: 0px 0px; - background-color: transparent; -} -/* line 358, ../sass/global.scss */ -.content h4 { - font-size: x-large; - font-weight: bold; - display: inline-block; - margin: 0px 0px; -} - -/* line 367, ../sass/global.scss */ -.planning .activity { - padding: 8px 18px; - padding-top: 8px; - padding-bottom: 12px; - border-left: none; - border-right: 6px solid #FF9191; -} -/* line 375, ../sass/global.scss */ -.planning .activity.inverted { - border-left: 6px solid #FF9191; - border-right: none; -} -/* line 380, ../sass/global.scss */ -.planning .activity .activity-title { - font-size: large; -} - -/* line 387, ../sass/global.scss */ -.glyphicon.yes { - color: #55C487 !important; -} -/* line 390, ../sass/global.scss */ -.glyphicon.no { - color: #E36268 !important; -} -/* line 393, ../sass/global.scss */ -.glyphicon.dunno { - color: #5599C4 !important; -} - -/* line 398, ../sass/global.scss */ -.sending-request { - position: relative; -} -/* line 401, ../sass/global.scss */ -.sending-request:after { - content: "Chargement..."; - position: absolute; - width: 100%; - height: 100%; - background: #fff; - opacity: 0.8; - color: #777; - text-align: center; - box-sizing: border-box; - z-index: 5; - top: 0; - left: 0; - padding: 8%; -} diff --git a/shared/static/css/global.css b/shared/static/css/global.css new file mode 120000 index 0000000..1dd9584 --- /dev/null +++ b/shared/static/css/global.css @@ -0,0 +1 @@ +global.min.css \ No newline at end of file diff --git a/shared/static/old_css/global.css.map b/shared/static/css/global.css.map similarity index 100% rename from shared/static/old_css/global.css.map rename to shared/static/css/global.css.map diff --git a/shared/static/old_css/global.min.css b/shared/static/css/global.min.css similarity index 100% rename from shared/static/old_css/global.min.css rename to shared/static/css/global.min.css diff --git a/shared/static/css/global.scss b/shared/static/css/global.scss index 817ad55..d264905 100644 --- a/shared/static/css/global.scss +++ b/shared/static/css/global.scss @@ -6,7 +6,7 @@ @import '_forms'; @import '_tree'; @import '_filters'; -//i@import '_dashed-shadows'; +//@import '_dashed-shadows'; /* MISE EN FORME GÉNÉRALE */ html { diff --git a/shared/static/old_css/header.css b/shared/static/css/header.css similarity index 100% rename from shared/static/old_css/header.css rename to shared/static/css/header.css diff --git a/shared/static/js/api-models.js b/shared/static/js/api-models.js new file mode 100644 index 0000000..ad20c02 --- /dev/null +++ b/shared/static/js/api-models.js @@ -0,0 +1,36 @@ +/* Backbone models for the API */ +"use strict"; +var GE_API = new Object(); + +GE_API.rootUrl = "/api/"; + +GE_API.Event = Backbone.Model.extend({ + rootUrl: GE_API.rootUrl + "event/", +}); + +GE_API.Events = Backbone.Collection.extend({ + model: GE_API.Event, + url: GE_API.rootUrl + "event/" +}); + +GE_API.Place = Backbone.Model.extend({ + rootUrl: function() { + if (this.get("event")) { + return GE_API.rootUrl + "event/" + this.get("event").id + "/place/"; + } else { + return GE_API.rootUrl + "place/"; + } + } +}); + +GE_API.Places = Backbone.Collection.extend({ + url: function() { + if (this.event) { + return GE_API.rootUrl + "event/" + this.event + "/place/"; + } else { + return GE_API.rootUrl + "place/"; + } + } +}); + +GE_API.Places = Backbone.Collection. diff --git a/shared/static/js/backbone-relational.js b/shared/static/js/backbone-relational.js new file mode 100644 index 0000000..ad4c1a1 --- /dev/null +++ b/shared/static/js/backbone-relational.js @@ -0,0 +1,2076 @@ +/* vim: set tabstop=4 softtabstop=4 shiftwidth=4 noexpandtab: */ +/** + * Backbone-relational.js 0.10.0 + * (c) 2011-2014 Paul Uithol and contributors (https://github.com/PaulUithol/Backbone-relational/graphs/contributors) + * + * Backbone-relational may be freely distributed under the MIT license; see the accompanying LICENSE.txt. + * For details and documentation: https://github.com/PaulUithol/Backbone-relational. + * Depends on Backbone (and thus on Underscore as well): https://github.com/documentcloud/backbone. + * + * Example: + * + Zoo = Backbone.RelationalModel.extend({ + relations: [ { + type: Backbone.HasMany, + key: 'animals', + relatedModel: 'Animal', + reverseRelation: { + key: 'livesIn', + includeInJSON: 'id' + // 'relatedModel' is automatically set to 'Zoo'; the 'relationType' to 'HasOne'. + } + } ], + + toString: function() { + return this.get( 'name' ); + } + }); + + Animal = Backbone.RelationalModel.extend({ + toString: function() { + return this.get( 'species' ); + } + }); + + // Creating the zoo will give it a collection with one animal in it: the monkey. + // The animal created after that has a relation `livesIn` that points to the zoo it's currently associated with. + // If you instantiate (or fetch) the zebra later, it will automatically be added. + + var zoo = new Zoo({ + name: 'Artis', + animals: [ { id: 'monkey-1', species: 'Chimp' }, 'lion-1', 'zebra-1' ] + }); + + var lion = new Animal( { id: 'lion-1', species: 'Lion' } ), + monkey = zoo.get( 'animals' ).first(), + sameZoo = lion.get( 'livesIn' ); + */ +( function( root, factory ) { + // Set up Backbone-relational for the environment. Start with AMD. + if ( typeof define === 'function' && define.amd ) { + define( [ 'exports', 'backbone', 'underscore' ], factory ); + } + // Next for Node.js or CommonJS. + else if ( typeof exports !== 'undefined' ) { + factory( exports, require( 'backbone' ), require( 'underscore' ) ); + } + // Finally, as a browser global. Use `root` here as it references `window`. + else { + factory( root, root.Backbone, root._ ); + } +}( this, function( exports, Backbone, _ ) { + "use strict"; + + Backbone.Relational = { + showWarnings: true + }; + + /** + * Semaphore mixin; can be used as both binary and counting. + **/ + Backbone.Semaphore = { + _permitsAvailable: null, + _permitsUsed: 0, + + acquire: function() { + if ( this._permitsAvailable && this._permitsUsed >= this._permitsAvailable ) { + throw new Error( 'Max permits acquired' ); + } + else { + this._permitsUsed++; + } + }, + + release: function() { + if ( this._permitsUsed === 0 ) { + throw new Error( 'All permits released' ); + } + else { + this._permitsUsed--; + } + }, + + isLocked: function() { + return this._permitsUsed > 0; + }, + + setAvailablePermits: function( amount ) { + if ( this._permitsUsed > amount ) { + throw new Error( 'Available permits cannot be less than used permits' ); + } + this._permitsAvailable = amount; + } + }; + + /** + * A BlockingQueue that accumulates items while blocked (via 'block'), + * and processes them when unblocked (via 'unblock'). + * Process can also be called manually (via 'process'). + */ + Backbone.BlockingQueue = function() { + this._queue = []; + }; + _.extend( Backbone.BlockingQueue.prototype, Backbone.Semaphore, { + _queue: null, + + add: function( func ) { + if ( this.isBlocked() ) { + this._queue.push( func ); + } + else { + func(); + } + }, + + // Some of the queued events may trigger other blocking events. By + // copying the queue here it allows queued events to process closer to + // the natural order. + // + // queue events [ 'A', 'B', 'C' ] + // A handler of 'B' triggers 'D' and 'E' + // By copying `this._queue` this executes: + // [ 'A', 'B', 'D', 'E', 'C' ] + // The same order the would have executed if they didn't have to be + // delayed and queued. + process: function() { + var queue = this._queue; + this._queue = []; + while ( queue && queue.length ) { + queue.shift()(); + } + }, + + block: function() { + this.acquire(); + }, + + unblock: function() { + this.release(); + if ( !this.isBlocked() ) { + this.process(); + } + }, + + isBlocked: function() { + return this.isLocked(); + } + }); + /** + * Global event queue. Accumulates external events ('add:', 'remove:' and 'change:') + * until the top-level object is fully initialized (see 'Backbone.RelationalModel'). + */ + Backbone.Relational.eventQueue = new Backbone.BlockingQueue(); + + /** + * Backbone.Store keeps track of all created (and destruction of) Backbone.RelationalModel. + * Handles lookup for relations. + */ + Backbone.Store = function() { + this._collections = []; + this._reverseRelations = []; + this._orphanRelations = []; + this._subModels = []; + this._modelScopes = [ exports ]; + }; + _.extend( Backbone.Store.prototype, Backbone.Events, { + /** + * Create a new `Relation`. + * @param {Backbone.RelationalModel} [model] + * @param {Object} relation + * @param {Object} [options] + */ + initializeRelation: function( model, relation, options ) { + var type = !_.isString( relation.type ) ? relation.type : Backbone[ relation.type ] || this.getObjectByName( relation.type ); + if ( type && type.prototype instanceof Backbone.Relation ) { + var rel = new type( model, relation, options ); // Also pushes the new Relation into `model._relations` + } + else { + Backbone.Relational.showWarnings && typeof console !== 'undefined' && console.warn( 'Relation=%o; missing or invalid relation type!', relation ); + } + }, + + /** + * Add a scope for `getObjectByName` to look for model types by name. + * @param {Object} scope + */ + addModelScope: function( scope ) { + this._modelScopes.push( scope ); + }, + + /** + * Remove a scope. + * @param {Object} scope + */ + removeModelScope: function( scope ) { + this._modelScopes = _.without( this._modelScopes, scope ); + }, + + /** + * Add a set of subModelTypes to the store, that can be used to resolve the '_superModel' + * for a model later in 'setupSuperModel'. + * + * @param {Backbone.RelationalModel} subModelTypes + * @param {Backbone.RelationalModel} superModelType + */ + addSubModels: function( subModelTypes, superModelType ) { + this._subModels.push({ + 'superModelType': superModelType, + 'subModels': subModelTypes + }); + }, + + /** + * Check if the given modelType is registered as another model's subModel. If so, add it to the super model's + * '_subModels', and set the modelType's '_superModel', '_subModelTypeName', and '_subModelTypeAttribute'. + * + * @param {Backbone.RelationalModel} modelType + */ + setupSuperModel: function( modelType ) { + _.find( this._subModels, function( subModelDef ) { + return _.filter( subModelDef.subModels || [], function( subModelTypeName, typeValue ) { + var subModelType = this.getObjectByName( subModelTypeName ); + + if ( modelType === subModelType ) { + // Set 'modelType' as a child of the found superModel + subModelDef.superModelType._subModels[ typeValue ] = modelType; + + // Set '_superModel', '_subModelTypeValue', and '_subModelTypeAttribute' on 'modelType'. + modelType._superModel = subModelDef.superModelType; + modelType._subModelTypeValue = typeValue; + modelType._subModelTypeAttribute = subModelDef.superModelType.prototype.subModelTypeAttribute; + return true; + } + }, this ).length; + }, this ); + }, + + /** + * Add a reverse relation. Is added to the 'relations' property on model's prototype, and to + * existing instances of 'model' in the store as well. + * @param {Object} relation + * @param {Backbone.RelationalModel} relation.model + * @param {String} relation.type + * @param {String} relation.key + * @param {String|Object} relation.relatedModel + */ + addReverseRelation: function( relation ) { + var exists = _.any( this._reverseRelations, function( rel ) { + return _.all( relation || [], function( val, key ) { + return val === rel[ key ]; + }); + }); + + if ( !exists && relation.model && relation.type ) { + this._reverseRelations.push( relation ); + this._addRelation( relation.model, relation ); + this.retroFitRelation( relation ); + } + }, + + /** + * Deposit a `relation` for which the `relatedModel` can't be resolved at the moment. + * + * @param {Object} relation + */ + addOrphanRelation: function( relation ) { + var exists = _.any( this._orphanRelations, function( rel ) { + return _.all( relation || [], function( val, key ) { + return val === rel[ key ]; + }); + }); + + if ( !exists && relation.model && relation.type ) { + this._orphanRelations.push( relation ); + } + }, + + /** + * Try to initialize any `_orphanRelation`s + */ + processOrphanRelations: function() { + // Make sure to operate on a copy since we're removing while iterating + _.each( this._orphanRelations.slice( 0 ), function( rel ) { + var relatedModel = Backbone.Relational.store.getObjectByName( rel.relatedModel ); + if ( relatedModel ) { + this.initializeRelation( null, rel ); + this._orphanRelations = _.without( this._orphanRelations, rel ); + } + }, this ); + }, + + /** + * + * @param {Backbone.RelationalModel.constructor} type + * @param {Object} relation + * @private + */ + _addRelation: function( type, relation ) { + if ( !type.prototype.relations ) { + type.prototype.relations = []; + } + type.prototype.relations.push( relation ); + + _.each( type._subModels || [], function( subModel ) { + this._addRelation( subModel, relation ); + }, this ); + }, + + /** + * Add a 'relation' to all existing instances of 'relation.model' in the store + * @param {Object} relation + */ + retroFitRelation: function( relation ) { + var coll = this.getCollection( relation.model, false ); + coll && coll.each( function( model ) { + if ( !( model instanceof relation.model ) ) { + return; + } + + var rel = new relation.type( model, relation ); + }, this ); + }, + + /** + * Find the Store's collection for a certain type of model. + * @param {Backbone.RelationalModel} type + * @param {Boolean} [create=true] Should a collection be created if none is found? + * @return {Backbone.Collection} A collection if found (or applicable for 'model'), or null + */ + getCollection: function( type, create ) { + if ( type instanceof Backbone.RelationalModel ) { + type = type.constructor; + } + + var rootModel = type; + while ( rootModel._superModel ) { + rootModel = rootModel._superModel; + } + + var coll = _.find( this._collections, function( item ) { + return item.model === rootModel; + }); + + if ( !coll && create !== false ) { + coll = this._createCollection( rootModel ); + } + + return coll; + }, + + /** + * Find a model type on one of the modelScopes by name. Names are split on dots. + * @param {String} name + * @return {Object} + */ + getObjectByName: function( name ) { + var parts = name.split( '.' ), + type = null; + + _.find( this._modelScopes, function( scope ) { + type = _.reduce( parts || [], function( memo, val ) { + return memo ? memo[ val ] : undefined; + }, scope ); + + if ( type && type !== scope ) { + return true; + } + }, this ); + + return type; + }, + + _createCollection: function( type ) { + var coll; + + // If 'type' is an instance, take its constructor + if ( type instanceof Backbone.RelationalModel ) { + type = type.constructor; + } + + // Type should inherit from Backbone.RelationalModel. + if ( type.prototype instanceof Backbone.RelationalModel ) { + coll = new Backbone.Collection(); + coll.model = type; + + this._collections.push( coll ); + } + + return coll; + }, + + /** + * Find the attribute that is to be used as the `id` on a given object + * @param type + * @param {String|Number|Object|Backbone.RelationalModel} item + * @return {String|Number} + */ + resolveIdForItem: function( type, item ) { + var id = _.isString( item ) || _.isNumber( item ) ? item : null; + + if ( id === null ) { + if ( item instanceof Backbone.RelationalModel ) { + id = item.id; + } + else if ( _.isObject( item ) ) { + id = item[ type.prototype.idAttribute ]; + } + } + + // Make all falsy values `null` (except for 0, which could be an id.. see '/issues/179') + if ( !id && id !== 0 ) { + id = null; + } + + return id; + }, + + /** + * Find a specific model of a certain `type` in the store + * @param type + * @param {String|Number|Object|Backbone.RelationalModel} item + */ + find: function( type, item ) { + var id = this.resolveIdForItem( type, item ), + coll = this.getCollection( type ); + + // Because the found object could be of any of the type's superModel + // types, only return it if it's actually of the type asked for. + if ( coll ) { + var obj = coll.get( id ); + + if ( obj instanceof type ) { + return obj; + } + } + + return null; + }, + + /** + * Add a 'model' to its appropriate collection. Retain the original contents of 'model.collection'. + * @param {Backbone.RelationalModel} model + */ + register: function( model ) { + var coll = this.getCollection( model ); + + if ( coll ) { + var modelColl = model.collection; + coll.add( model ); + model.collection = modelColl; + } + }, + + /** + * Check if the given model may use the given `id` + * @param model + * @param [id] + */ + checkId: function( model, id ) { + var coll = this.getCollection( model ), + duplicate = coll && coll.get( id ); + + if ( duplicate && model !== duplicate ) { + if ( Backbone.Relational.showWarnings && typeof console !== 'undefined' ) { + console.warn( 'Duplicate id! Old RelationalModel=%o, new RelationalModel=%o', duplicate, model ); + } + + throw new Error( "Cannot instantiate more than one Backbone.RelationalModel with the same id per type!" ); + } + }, + + /** + * Explicitly update a model's id in its store collection + * @param {Backbone.RelationalModel} model + */ + update: function( model ) { + var coll = this.getCollection( model ); + + // Register a model if it isn't yet (which happens if it was created without an id). + if ( !coll.contains( model ) ) { + this.register( model ); + } + + // This triggers updating the lookup indices kept in a collection + coll._onModelEvent( 'change:' + model.idAttribute, model, coll ); + + // Trigger an event on model so related models (having the model's new id in their keyContents) can add it. + model.trigger( 'relational:change:id', model, coll ); + }, + + /** + * Unregister from the store: a specific model, a collection, or a model type. + * @param {Backbone.RelationalModel|Backbone.RelationalModel.constructor|Backbone.Collection} type + */ + unregister: function( type ) { + var coll, + models; + + if ( type instanceof Backbone.Model ) { + coll = this.getCollection( type ); + models = [ type ]; + } + else if ( type instanceof Backbone.Collection ) { + coll = this.getCollection( type.model ); + models = _.clone( type.models ); + } + else { + coll = this.getCollection( type ); + models = _.clone( coll.models ); + } + + _.each( models, function( model ) { + this.stopListening( model ); + _.invoke( model.getRelations(), 'stopListening' ); + }, this ); + + + // If we've unregistered an entire store collection, reset the collection (which is much faster). + // Otherwise, remove each model one by one. + if ( _.contains( this._collections, type ) ) { + coll.reset( [] ); + } + else { + _.each( models, function( model ) { + if ( coll.get( model ) ) { + coll.remove( model ); + } + else { + coll.trigger( 'relational:remove', model, coll ); + } + }, this ); + } + }, + + /** + * Reset the `store` to it's original state. The `reverseRelations` are kept though, since attempting to + * re-initialize these on models would lead to a large amount of warnings. + */ + reset: function() { + this.stopListening(); + + // Unregister each collection to remove event listeners + _.each( this._collections, function( coll ) { + this.unregister( coll ); + }, this ); + + this._collections = []; + this._subModels = []; + this._modelScopes = [ exports ]; + } + }); + Backbone.Relational.store = new Backbone.Store(); + + /** + * The main Relation class, from which 'HasOne' and 'HasMany' inherit. Internally, 'relational:' events + * are used to regulate addition and removal of models from relations. + * + * @param {Backbone.RelationalModel} [instance] Model that this relation is created for. If no model is supplied, + * Relation just tries to instantiate it's `reverseRelation` if specified, and bails out after that. + * @param {Object} options + * @param {string} options.key + * @param {Backbone.RelationalModel.constructor} options.relatedModel + * @param {Boolean|String} [options.includeInJSON=true] Serialize the given attribute for related model(s)' in toJSON, or just their ids. + * @param {Boolean} [options.createModels=true] Create objects from the contents of keys if the object is not found in Backbone.store. + * @param {Object} [options.reverseRelation] Specify a bi-directional relation. If provided, Relation will reciprocate + * the relation to the 'relatedModel'. Required and optional properties match 'options', except that it also needs + * {Backbone.Relation|String} type ('HasOne' or 'HasMany'). + * @param {Object} opts + */ + Backbone.Relation = function( instance, options, opts ) { + this.instance = instance; + // Make sure 'options' is sane, and fill with defaults from subclasses and this object's prototype + options = _.isObject( options ) ? options : {}; + this.reverseRelation = _.defaults( options.reverseRelation || {}, this.options.reverseRelation ); + this.options = _.defaults( options, this.options, Backbone.Relation.prototype.options ); + + this.reverseRelation.type = !_.isString( this.reverseRelation.type ) ? this.reverseRelation.type : + Backbone[ this.reverseRelation.type ] || Backbone.Relational.store.getObjectByName( this.reverseRelation.type ); + + this.key = this.options.key; + this.keySource = this.options.keySource || this.key; + this.keyDestination = this.options.keyDestination || this.keySource || this.key; + + this.model = this.options.model || this.instance.constructor; + + this.relatedModel = this.options.relatedModel; + + // No 'relatedModel' is interpreted as self-referential + if ( _.isUndefined( this.relatedModel ) ) { + this.relatedModel = this.model; + } + + // Otherwise, try to resolve the given value to an object + if ( _.isFunction( this.relatedModel ) && !( this.relatedModel.prototype instanceof Backbone.RelationalModel ) ) { + this.relatedModel = _.result( this, 'relatedModel' ); + } + if ( _.isString( this.relatedModel ) ) { + this.relatedModel = Backbone.Relational.store.getObjectByName( this.relatedModel ); + } + + + if ( !this.checkPreconditions() ) { + return; + } + + // Add the reverse relation on 'relatedModel' to the store's reverseRelations + if ( !this.options.isAutoRelation && this.reverseRelation.type && this.reverseRelation.key ) { + Backbone.Relational.store.addReverseRelation( _.defaults( { + isAutoRelation: true, + model: this.relatedModel, + relatedModel: this.model, + reverseRelation: this.options // current relation is the 'reverseRelation' for its own reverseRelation + }, + this.reverseRelation // Take further properties from this.reverseRelation (type, key, etc.) + ) ); + } + + if ( instance ) { + var contentKey = this.keySource; + if ( contentKey !== this.key && _.isObject( this.instance.get( this.key ) ) ) { + contentKey = this.key; + } + + this.setKeyContents( this.instance.get( contentKey ) ); + this.relatedCollection = Backbone.Relational.store.getCollection( this.relatedModel ); + + // Explicitly clear 'keySource', to prevent a leaky abstraction if 'keySource' differs from 'key'. + if ( this.keySource !== this.key ) { + delete this.instance.attributes[ this.keySource ]; + } + + // Add this Relation to instance._relations + this.instance._relations[ this.key ] = this; + + this.initialize( opts ); + + if ( this.options.autoFetch ) { + this.instance.getAsync( this.key, _.isObject( this.options.autoFetch ) ? this.options.autoFetch : {} ); + } + + // When 'relatedModel' are created or destroyed, check if it affects this relation. + this.listenTo( this.instance, 'destroy', this.destroy ) + .listenTo( this.relatedCollection, 'relational:add relational:change:id', this.tryAddRelated ) + .listenTo( this.relatedCollection, 'relational:remove', this.removeRelated ); + } + }; + // Fix inheritance :\ + Backbone.Relation.extend = Backbone.Model.extend; + // Set up all inheritable **Backbone.Relation** properties and methods. + _.extend( Backbone.Relation.prototype, Backbone.Events, Backbone.Semaphore, { + options: { + createModels: true, + includeInJSON: true, + isAutoRelation: false, + autoFetch: false, + parse: false + }, + + instance: null, + key: null, + keyContents: null, + relatedModel: null, + relatedCollection: null, + reverseRelation: null, + related: null, + + /** + * Check several pre-conditions. + * @return {Boolean} True if pre-conditions are satisfied, false if they're not. + */ + checkPreconditions: function() { + var i = this.instance, + k = this.key, + m = this.model, + rm = this.relatedModel, + warn = Backbone.Relational.showWarnings && typeof console !== 'undefined'; + + if ( !m || !k || !rm ) { + warn && console.warn( 'Relation=%o: missing model, key or relatedModel (%o, %o, %o).', this, m, k, rm ); + return false; + } + // Check if the type in 'model' inherits from Backbone.RelationalModel + if ( !( m.prototype instanceof Backbone.RelationalModel ) ) { + warn && console.warn( 'Relation=%o: model does not inherit from Backbone.RelationalModel (%o).', this, i ); + return false; + } + // Check if the type in 'relatedModel' inherits from Backbone.RelationalModel + if ( !( rm.prototype instanceof Backbone.RelationalModel ) ) { + warn && console.warn( 'Relation=%o: relatedModel does not inherit from Backbone.RelationalModel (%o).', this, rm ); + return false; + } + // Check if this is not a HasMany, and the reverse relation is HasMany as well + if ( this instanceof Backbone.HasMany && this.reverseRelation.type === Backbone.HasMany ) { + warn && console.warn( 'Relation=%o: relation is a HasMany, and the reverseRelation is HasMany as well.', this ); + return false; + } + // Check if we're not attempting to create a relationship on a `key` that's already used. + if ( i && _.keys( i._relations ).length ) { + var existing = _.find( i._relations, function( rel ) { + return rel.key === k; + }, this ); + + if ( existing ) { + warn && console.warn( 'Cannot create relation=%o on %o for model=%o: already taken by relation=%o.', + this, k, i, existing ); + return false; + } + } + + return true; + }, + + /** + * Set the related model(s) for this relation + * @param {Backbone.Model|Backbone.Collection} related + */ + setRelated: function( related ) { + this.related = related; + this.instance.attributes[ this.key ] = related; + }, + + /** + * Determine if a relation (on a different RelationalModel) is the reverse + * relation of the current one. + * @param {Backbone.Relation} relation + * @return {Boolean} + */ + _isReverseRelation: function( relation ) { + return relation.instance instanceof this.relatedModel && this.reverseRelation.key === relation.key && + this.key === relation.reverseRelation.key; + }, + + /** + * Get the reverse relations (pointing back to 'this.key' on 'this.instance') for the currently related model(s). + * @param {Backbone.RelationalModel} [model] Get the reverse relations for a specific model. + * If not specified, 'this.related' is used. + * @return {Backbone.Relation[]} + */ + getReverseRelations: function( model ) { + var reverseRelations = []; + // Iterate over 'model', 'this.related.models' (if this.related is a Backbone.Collection), or wrap 'this.related' in an array. + var models = !_.isUndefined( model ) ? [ model ] : this.related && ( this.related.models || [ this.related ] ), + relations = null, + relation = null; + + for( var i = 0; i < ( models || [] ).length; i++ ) { + relations = models[ i ].getRelations() || []; + + for( var j = 0; j < relations.length; j++ ) { + relation = relations[ j ]; + + if ( this._isReverseRelation( relation ) ) { + reverseRelations.push( relation ); + } + } + } + + return reverseRelations; + }, + + /** + * When `this.instance` is destroyed, cleanup our relations. + * Get reverse relation, call removeRelated on each. + */ + destroy: function() { + this.stopListening(); + + if ( this instanceof Backbone.HasOne ) { + this.setRelated( null ); + } + else if ( this instanceof Backbone.HasMany ) { + this.setRelated( this._prepareCollection() ); + } + + _.each( this.getReverseRelations(), function( relation ) { + relation.removeRelated( this.instance ); + }, this ); + } + }); + + Backbone.HasOne = Backbone.Relation.extend({ + options: { + reverseRelation: { type: 'HasMany' } + }, + + initialize: function( opts ) { + this.listenTo( this.instance, 'relational:change:' + this.key, this.onChange ); + + var related = this.findRelated( opts ); + this.setRelated( related ); + + // Notify new 'related' object of the new relation. + _.each( this.getReverseRelations(), function( relation ) { + relation.addRelated( this.instance, opts ); + }, this ); + }, + + /** + * Find related Models. + * @param {Object} [options] + * @return {Backbone.Model} + */ + findRelated: function( options ) { + var related = null; + + options = _.defaults( { parse: this.options.parse }, options ); + + if ( this.keyContents instanceof this.relatedModel ) { + related = this.keyContents; + } + else if ( this.keyContents || this.keyContents === 0 ) { // since 0 can be a valid `id` as well + var opts = _.defaults( { create: this.options.createModels }, options ); + related = this.relatedModel.findOrCreate( this.keyContents, opts ); + } + + // Nullify `keyId` if we have a related model; in case it was already part of the relation + if ( related ) { + this.keyId = null; + } + + return related; + }, + + /** + * Normalize and reduce `keyContents` to an `id`, for easier comparison + * @param {String|Number|Backbone.Model} keyContents + */ + setKeyContents: function( keyContents ) { + this.keyContents = keyContents; + this.keyId = Backbone.Relational.store.resolveIdForItem( this.relatedModel, this.keyContents ); + }, + + /** + * Event handler for `change:`. + * If the key is changed, notify old & new reverse relations and initialize the new relation. + */ + onChange: function( model, attr, options ) { + // Don't accept recursive calls to onChange (like onChange->findRelated->findOrCreate->initializeRelations->addRelated->onChange) + if ( this.isLocked() ) { + return; + } + this.acquire(); + options = options ? _.clone( options ) : {}; + + // 'options.__related' is set by 'addRelated'/'removeRelated'. If it is set, the change + // is the result of a call from a relation. If it's not, the change is the result of + // a 'set' call on this.instance. + var changed = _.isUndefined( options.__related ), + oldRelated = changed ? this.related : options.__related; + + if ( changed ) { + this.setKeyContents( attr ); + var related = this.findRelated( options ); + this.setRelated( related ); + } + + // Notify old 'related' object of the terminated relation + if ( oldRelated && this.related !== oldRelated ) { + _.each( this.getReverseRelations( oldRelated ), function( relation ) { + relation.removeRelated( this.instance, null, options ); + }, this ); + } + + // Notify new 'related' object of the new relation. Note we do re-apply even if this.related is oldRelated; + // that can be necessary for bi-directional relations if 'this.instance' was created after 'this.related'. + // In that case, 'this.instance' will already know 'this.related', but the reverse might not exist yet. + _.each( this.getReverseRelations(), function( relation ) { + relation.addRelated( this.instance, options ); + }, this ); + + // Fire the 'change:' event if 'related' was updated + if ( !options.silent && this.related !== oldRelated ) { + var dit = this; + this.changed = true; + Backbone.Relational.eventQueue.add( function() { + dit.instance.trigger( 'change:' + dit.key, dit.instance, dit.related, options, true ); + dit.changed = false; + }); + } + this.release(); + }, + + /** + * If a new 'this.relatedModel' appears in the 'store', try to match it to the last set 'keyContents' + */ + tryAddRelated: function( model, coll, options ) { + if ( ( this.keyId || this.keyId === 0 ) && model.id === this.keyId ) { // since 0 can be a valid `id` as well + this.addRelated( model, options ); + this.keyId = null; + } + }, + + addRelated: function( model, options ) { + // Allow 'model' to set up its relations before proceeding. + // (which can result in a call to 'addRelated' from a relation of 'model') + var dit = this; + model.queue( function() { + if ( model !== dit.related ) { + var oldRelated = dit.related || null; + dit.setRelated( model ); + dit.onChange( dit.instance, model, _.defaults( { __related: oldRelated }, options ) ); + } + }); + }, + + removeRelated: function( model, coll, options ) { + if ( !this.related ) { + return; + } + + if ( model === this.related ) { + var oldRelated = this.related || null; + this.setRelated( null ); + this.onChange( this.instance, model, _.defaults( { __related: oldRelated }, options ) ); + } + } + }); + + Backbone.HasMany = Backbone.Relation.extend({ + collectionType: null, + + options: { + reverseRelation: { type: 'HasOne' }, + collectionType: Backbone.Collection, + collectionKey: true, + collectionOptions: {} + }, + + initialize: function( opts ) { + this.listenTo( this.instance, 'relational:change:' + this.key, this.onChange ); + + // Handle a custom 'collectionType' + this.collectionType = this.options.collectionType; + if ( _.isFunction( this.collectionType ) && this.collectionType !== Backbone.Collection && !( this.collectionType.prototype instanceof Backbone.Collection ) ) { + this.collectionType = _.result( this, 'collectionType' ); + } + if ( _.isString( this.collectionType ) ) { + this.collectionType = Backbone.Relational.store.getObjectByName( this.collectionType ); + } + if ( this.collectionType !== Backbone.Collection && !( this.collectionType.prototype instanceof Backbone.Collection ) ) { + throw new Error( '`collectionType` must inherit from Backbone.Collection' ); + } + + var related = this.findRelated( opts ); + this.setRelated( related ); + }, + + /** + * Bind events and setup collectionKeys for a collection that is to be used as the backing store for a HasMany. + * If no 'collection' is supplied, a new collection will be created of the specified 'collectionType' option. + * @param {Backbone.Collection} [collection] + * @return {Backbone.Collection} + */ + _prepareCollection: function( collection ) { + if ( this.related ) { + this.stopListening( this.related ); + } + + if ( !collection || !( collection instanceof Backbone.Collection ) ) { + var options = _.isFunction( this.options.collectionOptions ) ? + this.options.collectionOptions( this.instance ) : this.options.collectionOptions; + + collection = new this.collectionType( null, options ); + } + + collection.model = this.relatedModel; + + if ( this.options.collectionKey ) { + var key = this.options.collectionKey === true ? this.options.reverseRelation.key : this.options.collectionKey; + + if ( collection[ key ] && collection[ key ] !== this.instance ) { + if ( Backbone.Relational.showWarnings && typeof console !== 'undefined' ) { + console.warn( 'Relation=%o; collectionKey=%s already exists on collection=%o', this, key, this.options.collectionKey ); + } + } + else if ( key ) { + collection[ key ] = this.instance; + } + } + + this.listenTo( collection, 'relational:add', this.handleAddition ) + .listenTo( collection, 'relational:remove', this.handleRemoval ) + .listenTo( collection, 'relational:reset', this.handleReset ); + + return collection; + }, + + /** + * Find related Models. + * @param {Object} [options] + * @return {Backbone.Collection} + */ + findRelated: function( options ) { + var related = null; + + options = _.defaults( { parse: this.options.parse }, options ); + + // Replace 'this.related' by 'this.keyContents' if it is a Backbone.Collection + if ( this.keyContents instanceof Backbone.Collection ) { + this._prepareCollection( this.keyContents ); + related = this.keyContents; + } + // Otherwise, 'this.keyContents' should be an array of related object ids. + // Re-use the current 'this.related' if it is a Backbone.Collection; otherwise, create a new collection. + else { + var toAdd = []; + + _.each( this.keyContents, function( attributes ) { + var model = null; + + if ( attributes instanceof this.relatedModel ) { + model = attributes; + } + else { + // If `merge` is true, update models here, instead of during update. + model = ( _.isObject( attributes ) && options.parse && this.relatedModel.prototype.parse ) ? + this.relatedModel.prototype.parse( _.clone( attributes ), options ) : attributes; + } + + model && toAdd.push( model ); + }, this ); + + if ( this.related instanceof Backbone.Collection ) { + related = this.related; + } + else { + related = this._prepareCollection(); + } + + // By now, `parse` will already have been executed just above for models if specified. + // Disable to prevent additional calls. + related.set( toAdd, _.defaults( { parse: false }, options ) ); + } + + // Remove entries from `keyIds` that were already part of the relation (and are thus 'unchanged') + this.keyIds = _.difference( this.keyIds, _.pluck( related.models, 'id' ) ); + + return related; + }, + + /** + * Normalize and reduce `keyContents` to a list of `ids`, for easier comparison + * @param {String|Number|String[]|Number[]|Backbone.Collection} keyContents + */ + setKeyContents: function( keyContents ) { + this.keyContents = keyContents instanceof Backbone.Collection ? keyContents : null; + this.keyIds = []; + + if ( !this.keyContents && ( keyContents || keyContents === 0 ) ) { // since 0 can be a valid `id` as well + // Handle cases the an API/user supplies just an Object/id instead of an Array + this.keyContents = _.isArray( keyContents ) ? keyContents : [ keyContents ]; + + _.each( this.keyContents, function( item ) { + var itemId = Backbone.Relational.store.resolveIdForItem( this.relatedModel, item ); + if ( itemId || itemId === 0 ) { + this.keyIds.push( itemId ); + } + }, this ); + } + }, + + /** + * Event handler for `change:`. + * If the contents of the key are changed, notify old & new reverse relations and initialize the new relation. + */ + onChange: function( model, attr, options ) { + options = options ? _.clone( options ) : {}; + this.setKeyContents( attr ); + this.changed = false; + + var related = this.findRelated( options ); + this.setRelated( related ); + + if ( !options.silent ) { + var dit = this; + Backbone.Relational.eventQueue.add( function() { + // The `changed` flag can be set in `handleAddition` or `handleRemoval` + if ( dit.changed ) { + dit.instance.trigger( 'change:' + dit.key, dit.instance, dit.related, options, true ); + dit.changed = false; + } + }); + } + }, + + /** + * When a model is added to a 'HasMany', trigger 'add' on 'this.instance' and notify reverse relations. + * (should be 'HasOne', must set 'this.instance' as their related). + */ + handleAddition: function( model, coll, options ) { + //console.debug('handleAddition called; args=%o', arguments); + options = options ? _.clone( options ) : {}; + this.changed = true; + + _.each( this.getReverseRelations( model ), function( relation ) { + relation.addRelated( this.instance, options ); + }, this ); + + // Only trigger 'add' once the newly added model is initialized (so, has its relations set up) + var dit = this; + !options.silent && Backbone.Relational.eventQueue.add( function() { + dit.instance.trigger( 'add:' + dit.key, model, dit.related, options ); + }); + }, + + /** + * When a model is removed from a 'HasMany', trigger 'remove' on 'this.instance' and notify reverse relations. + * (should be 'HasOne', which should be nullified) + */ + handleRemoval: function( model, coll, options ) { + //console.debug('handleRemoval called; args=%o', arguments); + options = options ? _.clone( options ) : {}; + this.changed = true; + + _.each( this.getReverseRelations( model ), function( relation ) { + relation.removeRelated( this.instance, null, options ); + }, this ); + + var dit = this; + !options.silent && Backbone.Relational.eventQueue.add( function() { + dit.instance.trigger( 'remove:' + dit.key, model, dit.related, options ); + }); + }, + + handleReset: function( coll, options ) { + var dit = this; + options = options ? _.clone( options ) : {}; + !options.silent && Backbone.Relational.eventQueue.add( function() { + dit.instance.trigger( 'reset:' + dit.key, dit.related, options ); + }); + }, + + tryAddRelated: function( model, coll, options ) { + var item = _.contains( this.keyIds, model.id ); + + if ( item ) { + this.addRelated( model, options ); + this.keyIds = _.without( this.keyIds, model.id ); + } + }, + + addRelated: function( model, options ) { + // Allow 'model' to set up its relations before proceeding. + // (which can result in a call to 'addRelated' from a relation of 'model') + var dit = this; + model.queue( function() { + if ( dit.related && !dit.related.get( model ) ) { + dit.related.add( model, _.defaults( { parse: false }, options ) ); + } + }); + }, + + removeRelated: function( model, coll, options ) { + if ( this.related.get( model ) ) { + this.related.remove( model, options ); + } + } + }); + + /** + * A type of Backbone.Model that also maintains relations to other models and collections. + * New events when compared to the original: + * - 'add:' (model, related collection, options) + * - 'remove:' (model, related collection, options) + * - 'change:' (model, related model or collection, options) + */ + Backbone.RelationalModel = Backbone.Model.extend({ + relations: null, // Relation descriptions on the prototype + _relations: null, // Relation instances + _isInitialized: false, + _deferProcessing: false, + _queue: null, + _attributeChangeFired: false, // Keeps track of `change` event firing under some conditions (like nested `set`s) + + subModelTypeAttribute: 'type', + subModelTypes: null, + + constructor: function( attributes, options ) { + // Nasty hack, for cases like 'model.get( ).add( item )'. + // Defer 'processQueue', so that when 'Relation.createModels' is used we trigger 'HasMany' + // collection events only after the model is really fully set up. + // Example: event for "p.on( 'add:jobs' )" -> "p.get('jobs').add( { company: c.id, person: p.id } )". + if ( options && options.collection ) { + var dit = this, + collection = this.collection = options.collection; + + // Prevent `collection` from cascading down to nested models; they shouldn't go into this `if` clause. + delete options.collection; + + this._deferProcessing = true; + + var processQueue = function( model ) { + if ( model === dit ) { + dit._deferProcessing = false; + dit.processQueue(); + collection.off( 'relational:add', processQueue ); + } + }; + collection.on( 'relational:add', processQueue ); + + // So we do process the queue eventually, regardless of whether this model actually gets added to 'options.collection'. + _.defer( function() { + processQueue( dit ); + }); + } + + Backbone.Relational.store.processOrphanRelations(); + Backbone.Relational.store.listenTo( this, 'relational:unregister', Backbone.Relational.store.unregister ); + + this._queue = new Backbone.BlockingQueue(); + this._queue.block(); + Backbone.Relational.eventQueue.block(); + + try { + Backbone.Model.apply( this, arguments ); + } + finally { + // Try to run the global queue holding external events + Backbone.Relational.eventQueue.unblock(); + } + }, + + /** + * Override 'trigger' to queue 'change' and 'change:*' events + */ + trigger: function( eventName ) { + if ( eventName.length > 5 && eventName.indexOf( 'change' ) === 0 ) { + var dit = this, + args = arguments; + + if ( !Backbone.Relational.eventQueue.isBlocked() ) { + // If we're not in a more complicated nested scenario, fire the change event right away + Backbone.Model.prototype.trigger.apply( dit, args ); + } + else { + Backbone.Relational.eventQueue.add( function() { + // Determine if the `change` event is still valid, now that all relations are populated + var changed = true; + if ( eventName === 'change' ) { + // `hasChanged` may have gotten reset by nested calls to `set`. + changed = dit.hasChanged() || dit._attributeChangeFired; + dit._attributeChangeFired = false; + } + else { + var attr = eventName.slice( 7 ), + rel = dit.getRelation( attr ); + + if ( rel ) { + // If `attr` is a relation, `change:attr` get triggered from `Relation.onChange`. + // These take precedence over `change:attr` events triggered by `Model.set`. + // The relation sets a fourth attribute to `true`. If this attribute is present, + // continue triggering this event; otherwise, it's from `Model.set` and should be stopped. + changed = ( args[ 4 ] === true ); + + // If this event was triggered by a relation, set the right value in `this.changed` + // (a Collection or Model instead of raw data). + if ( changed ) { + dit.changed[ attr ] = args[ 2 ]; + } + // Otherwise, this event is from `Model.set`. If the relation doesn't report a change, + // remove attr from `dit.changed` so `hasChanged` doesn't take it into account. + else if ( !rel.changed ) { + delete dit.changed[ attr ]; + } + } + else if ( changed ) { + dit._attributeChangeFired = true; + } + } + + changed && Backbone.Model.prototype.trigger.apply( dit, args ); + }); + } + } + else if ( eventName === 'destroy' ) { + Backbone.Model.prototype.trigger.apply( this, arguments ); + Backbone.Relational.store.unregister( this ); + } + else { + Backbone.Model.prototype.trigger.apply( this, arguments ); + } + + return this; + }, + + /** + * Initialize Relations present in this.relations; determine the type (HasOne/HasMany), then creates a new instance. + * Invoked in the first call so 'set' (which is made from the Backbone.Model constructor). + */ + initializeRelations: function( options ) { + this.acquire(); // Setting up relations often also involve calls to 'set', and we only want to enter this function once + this._relations = {}; + + _.each( this.relations || [], function( rel ) { + Backbone.Relational.store.initializeRelation( this, rel, options ); + }, this ); + + this._isInitialized = true; + this.release(); + this.processQueue(); + }, + + /** + * When new values are set, notify this model's relations (also if options.silent is set). + * (called from `set`; Relation.setRelated locks this model before calling 'set' on it to prevent loops) + * @param {Object} [changedAttrs] + * @param {Object} [options] + */ + updateRelations: function( changedAttrs, options ) { + if ( this._isInitialized && !this.isLocked() ) { + _.each( this._relations, function( rel ) { + if ( !changedAttrs || ( rel.keySource in changedAttrs || rel.key in changedAttrs ) ) { + // Fetch data in `rel.keySource` if data got set in there, or `rel.key` otherwise + var value = this.attributes[ rel.keySource ] || this.attributes[ rel.key ], + attr = changedAttrs && ( changedAttrs[ rel.keySource ] || changedAttrs[ rel.key ] ); + + // Update a relation if its value differs from this model's attributes, or it's been explicitly nullified. + // Which can also happen before the originally intended related model has been found (`val` is null). + if ( rel.related !== value || ( value === null && attr === null ) ) { + this.trigger( 'relational:change:' + rel.key, this, value, options || {} ); + } + } + + // Explicitly clear 'keySource', to prevent a leaky abstraction if 'keySource' differs from 'key'. + if ( rel.keySource !== rel.key ) { + delete this.attributes[ rel.keySource ]; + } + }, this ); + } + }, + + /** + * Either add to the queue (if we're not initialized yet), or execute right away. + */ + queue: function( func ) { + this._queue.add( func ); + }, + + /** + * Process _queue + */ + processQueue: function() { + if ( this._isInitialized && !this._deferProcessing && this._queue.isBlocked() ) { + this._queue.unblock(); + } + }, + + /** + * Get a specific relation. + * @param {string} attr The relation key to look for. + * @return {Backbone.Relation} An instance of 'Backbone.Relation', if a relation was found for 'attr', or null. + */ + getRelation: function( attr ) { + return this._relations[ attr ]; + }, + + /** + * Get all of the created relations. + * @return {Backbone.Relation[]} + */ + getRelations: function() { + return _.values( this._relations ); + }, + + + /** + * Get a list of ids that will be fetched on a call to `getAsync`. + * @param {string|Backbone.Relation} attr The relation key to fetch models for. + * @param [refresh=false] Add ids for models that are already in the relation, refreshing them? + * @return {Array} An array of ids that need to be fetched. + */ + getIdsToFetch: function( attr, refresh ) { + var rel = attr instanceof Backbone.Relation ? attr : this.getRelation( attr ), + ids = rel ? ( rel.keyIds && rel.keyIds.slice( 0 ) ) || ( ( rel.keyId || rel.keyId === 0 ) ? [ rel.keyId ] : [] ) : []; + + // On `refresh`, add the ids for current models in the relation to `idsToFetch` + if ( refresh ) { + var models = rel.related && ( rel.related.models || [ rel.related ] ); + _.each( models, function( model ) { + if ( model.id || model.id === 0 ) { + ids.push( model.id ); + } + }); + } + + return ids; + }, + + /** + * Get related objects. Returns a single promise, which can either resolve immediately (if the related model[s]) + * are already present locally, or after fetching the contents of the requested attribute. + * @param {string} attr The relation key to fetch models for. + * @param {Object} [options] Options for 'Backbone.Model.fetch' and 'Backbone.sync'. + * @param {Boolean} [options.refresh=false] Fetch existing models from the server as well (in order to update them). + * @return {jQuery.Deferred} A jQuery promise object. When resolved, its `done` callback will be called with + * contents of `attr`. + */ + getAsync: function( attr, options ) { + // Set default `options` for fetch + options = _.extend( { add: true, remove: false, refresh: false }, options ); + + var dit = this, + requests = [], + rel = this.getRelation( attr ), + idsToFetch = rel && this.getIdsToFetch( rel, options.refresh ), + coll = rel.related instanceof Backbone.Collection ? rel.related : rel.relatedCollection; + + if ( idsToFetch && idsToFetch.length ) { + var models = [], + createdModels = [], + setUrl, + createModels = function() { + // Find (or create) a model for each one that is to be fetched + models = _.map( idsToFetch, function( id ) { + var model = rel.relatedModel.findModel( id ); + + if ( !model ) { + var attrs = {}; + attrs[ rel.relatedModel.prototype.idAttribute ] = id; + model = rel.relatedModel.findOrCreate( attrs, options ); + createdModels.push( model ); + } + + return model; + }, this ); + }; + + // Try if the 'collection' can provide a url to fetch a set of models in one request. + // This assumes that when 'Backbone.Collection.url' is a function, it can handle building of set urls. + // To make sure it can, test if the url we got by supplying a list of models to fetch is different from + // the one supplied for the default fetch action (without args to 'url'). + if ( coll instanceof Backbone.Collection && _.isFunction( coll.url ) ) { + var defaultUrl = coll.url(); + setUrl = coll.url( idsToFetch ); + + if ( setUrl === defaultUrl ) { + createModels(); + setUrl = coll.url( models ); + + if ( setUrl === defaultUrl ) { + setUrl = null; + } + } + } + + if ( setUrl ) { + // Do a single request to fetch all models + var opts = _.defaults( + { + error: function() { + _.each( createdModels, function( model ) { + model.trigger( 'destroy', model, model.collection, options ); + }); + + options.error && options.error.apply( models, arguments ); + }, + url: setUrl + }, + options + ); + + requests = [ coll.fetch( opts ) ]; + } + else { + // Make a request per model to fetch + if ( !models.length ) { + createModels(); + } + + requests = _.map( models, function( model ) { + var opts = _.defaults( + { + error: function() { + if ( _.contains( createdModels, model ) ) { + model.trigger( 'destroy', model, model.collection, options ); + } + options.error && options.error.apply( models, arguments ); + } + }, + options + ); + return model.fetch( opts ); + }, this ); + } + } + + return this.deferArray(requests).then( + function() { + return Backbone.Model.prototype.get.call( dit, attr ); + } + ); + }, + + deferArray: function(deferArray) { + return Backbone.$.when.apply(null, deferArray); + }, + + set: function( key, value, options ) { + Backbone.Relational.eventQueue.block(); + + // Duplicate backbone's behavior to allow separate key/value parameters, instead of a single 'attributes' object + var attributes, + result; + + if ( _.isObject( key ) || key == null ) { + attributes = key; + options = value; + } + else { + attributes = {}; + attributes[ key ] = value; + } + + try { + var id = this.id, + newId = attributes && this.idAttribute in attributes && attributes[ this.idAttribute ]; + + // Check if we're not setting a duplicate id before actually calling `set`. + Backbone.Relational.store.checkId( this, newId ); + + result = Backbone.Model.prototype.set.apply( this, arguments ); + + // Ideal place to set up relations, if this is the first time we're here for this model + if ( !this._isInitialized && !this.isLocked() ) { + this.constructor.initializeModelHierarchy(); + + // Only register models that have an id. A model will be registered when/if it gets an id later on. + if ( newId || newId === 0 ) { + Backbone.Relational.store.register( this ); + } + + this.initializeRelations( options ); + } + // The store should know about an `id` update asap + else if ( newId && newId !== id ) { + Backbone.Relational.store.update( this ); + } + + if ( attributes ) { + this.updateRelations( attributes, options ); + } + } + finally { + // Try to run the global queue holding external events + Backbone.Relational.eventQueue.unblock(); + } + + return result; + }, + + clone: function() { + var attributes = _.clone( this.attributes ); + if ( !_.isUndefined( attributes[ this.idAttribute ] ) ) { + attributes[ this.idAttribute ] = null; + } + + _.each( this.getRelations(), function( rel ) { + delete attributes[ rel.key ]; + }); + + return new this.constructor( attributes ); + }, + + /** + * Convert relations to JSON, omits them when required + */ + toJSON: function( options ) { + // If this Model has already been fully serialized in this branch once, return to avoid loops + if ( this.isLocked() ) { + return this.id; + } + + this.acquire(); + var json = Backbone.Model.prototype.toJSON.call( this, options ); + + if ( this.constructor._superModel && !( this.constructor._subModelTypeAttribute in json ) ) { + json[ this.constructor._subModelTypeAttribute ] = this.constructor._subModelTypeValue; + } + + _.each( this._relations, function( rel ) { + var related = json[ rel.key ], + includeInJSON = rel.options.includeInJSON, + value = null; + + if ( includeInJSON === true ) { + if ( related && _.isFunction( related.toJSON ) ) { + value = related.toJSON( options ); + } + } + else if ( _.isString( includeInJSON ) ) { + if ( related instanceof Backbone.Collection ) { + value = related.pluck( includeInJSON ); + } + else if ( related instanceof Backbone.Model ) { + value = related.get( includeInJSON ); + } + + // Add ids for 'unfound' models if includeInJSON is equal to (only) the relatedModel's `idAttribute` + if ( includeInJSON === rel.relatedModel.prototype.idAttribute ) { + if ( rel instanceof Backbone.HasMany ) { + value = value.concat( rel.keyIds ); + } + else if ( rel instanceof Backbone.HasOne ) { + value = value || rel.keyId; + + if ( !value && !_.isObject( rel.keyContents ) ) { + value = rel.keyContents || null; + } + } + } + } + else if ( _.isArray( includeInJSON ) ) { + if ( related instanceof Backbone.Collection ) { + value = []; + related.each( function( model ) { + var curJson = {}; + _.each( includeInJSON, function( key ) { + curJson[ key ] = model.get( key ); + }); + value.push( curJson ); + }); + } + else if ( related instanceof Backbone.Model ) { + value = {}; + _.each( includeInJSON, function( key ) { + value[ key ] = related.get( key ); + }); + } + } + else { + delete json[ rel.key ]; + } + + // In case of `wait: true`, Backbone will simply push whatever's passed into `save` into attributes. + // We'll want to get this information into the JSON, even if it doesn't conform to our normal + // expectations of what's contained in it (no model/collection for a relation, etc). + if ( value === null && options && options.wait ) { + value = related; + } + + if ( includeInJSON ) { + json[ rel.keyDestination ] = value; + } + + if ( rel.keyDestination !== rel.key ) { + delete json[ rel.key ]; + } + }); + + this.release(); + return json; + } + }, + { + /** + * + * @param superModel + * @returns {Backbone.RelationalModel.constructor} + */ + setup: function( superModel ) { + // We don't want to share a relations array with a parent, as this will cause problems with reverse + // relations. Since `relations` may also be a property or function, only use slice if we have an array. + this.prototype.relations = ( this.prototype.relations || [] ).slice( 0 ); + + this._subModels = {}; + this._superModel = null; + + // If this model has 'subModelTypes' itself, remember them in the store + if ( this.prototype.hasOwnProperty( 'subModelTypes' ) ) { + Backbone.Relational.store.addSubModels( this.prototype.subModelTypes, this ); + } + // The 'subModelTypes' property should not be inherited, so reset it. + else { + this.prototype.subModelTypes = null; + } + + // Initialize all reverseRelations that belong to this new model. + _.each( this.prototype.relations || [], function( rel ) { + if ( !rel.model ) { + rel.model = this; + } + + if ( rel.reverseRelation && rel.model === this ) { + var preInitialize = true; + if ( _.isString( rel.relatedModel ) ) { + /** + * The related model might not be defined for two reasons + * 1. it is related to itself + * 2. it never gets defined, e.g. a typo + * 3. the model hasn't been defined yet, but will be later + * In neither of these cases do we need to pre-initialize reverse relations. + * However, for 3. (which is, to us, indistinguishable from 2.), we do need to attempt + * setting up this relation again later, in case the related model is defined later. + */ + var relatedModel = Backbone.Relational.store.getObjectByName( rel.relatedModel ); + preInitialize = relatedModel && ( relatedModel.prototype instanceof Backbone.RelationalModel ); + } + + if ( preInitialize ) { + Backbone.Relational.store.initializeRelation( null, rel ); + } + else if ( _.isString( rel.relatedModel ) ) { + Backbone.Relational.store.addOrphanRelation( rel ); + } + } + }, this ); + + return this; + }, + + /** + * Create a 'Backbone.Model' instance based on 'attributes'. + * @param {Object} attributes + * @param {Object} [options] + * @return {Backbone.Model} + */ + build: function( attributes, options ) { + // 'build' is a possible entrypoint; it's possible no model hierarchy has been determined yet. + this.initializeModelHierarchy(); + + // Determine what type of (sub)model should be built if applicable. + var model = this._findSubModelType( this, attributes ) || this; + + return new model( attributes, options ); + }, + + /** + * Determines what type of (sub)model should be built if applicable. + * Looks up the proper subModelType in 'this._subModels', recursing into + * types until a match is found. Returns the applicable 'Backbone.Model' + * or null if no match is found. + * @param {Backbone.Model} type + * @param {Object} attributes + * @return {Backbone.Model} + */ + _findSubModelType: function( type, attributes ) { + if ( type._subModels && type.prototype.subModelTypeAttribute in attributes ) { + var subModelTypeAttribute = attributes[ type.prototype.subModelTypeAttribute ]; + var subModelType = type._subModels[ subModelTypeAttribute ]; + if ( subModelType ) { + return subModelType; + } + else { + // Recurse into subModelTypes to find a match + for ( subModelTypeAttribute in type._subModels ) { + subModelType = this._findSubModelType( type._subModels[ subModelTypeAttribute ], attributes ); + if ( subModelType ) { + return subModelType; + } + } + } + } + + return null; + }, + + /** + * + */ + initializeModelHierarchy: function() { + // Inherit any relations that have been defined in the parent model. + this.inheritRelations(); + + // If we came here through 'build' for a model that has 'subModelTypes' then try to initialize the ones that + // haven't been resolved yet. + if ( this.prototype.subModelTypes ) { + var resolvedSubModels = _.keys( this._subModels ); + var unresolvedSubModels = _.omit( this.prototype.subModelTypes, resolvedSubModels ); + _.each( unresolvedSubModels, function( subModelTypeName ) { + var subModelType = Backbone.Relational.store.getObjectByName( subModelTypeName ); + subModelType && subModelType.initializeModelHierarchy(); + }); + } + }, + + inheritRelations: function() { + // Bail out if we've been here before. + if ( !_.isUndefined( this._superModel ) && !_.isNull( this._superModel ) ) { + return; + } + // Try to initialize the _superModel. + Backbone.Relational.store.setupSuperModel( this ); + + // If a superModel has been found, copy relations from the _superModel if they haven't been inherited automatically + // (due to a redefinition of 'relations'). + if ( this._superModel ) { + // The _superModel needs a chance to initialize its own inherited relations before we attempt to inherit relations + // from the _superModel. You don't want to call 'initializeModelHierarchy' because that could cause sub-models of + // this class to inherit their relations before this class has had chance to inherit it's relations. + this._superModel.inheritRelations(); + if ( this._superModel.prototype.relations ) { + // Find relations that exist on the '_superModel', but not yet on this model. + var inheritedRelations = _.filter( this._superModel.prototype.relations || [], function( superRel ) { + return !_.any( this.prototype.relations || [], function( rel ) { + return superRel.relatedModel === rel.relatedModel && superRel.key === rel.key; + }, this ); + }, this ); + + this.prototype.relations = inheritedRelations.concat( this.prototype.relations ); + } + } + // Otherwise, make sure we don't get here again for this type by making '_superModel' false so we fail the + // isUndefined/isNull check next time. + else { + this._superModel = false; + } + }, + + /** + * Find an instance of `this` type in 'Backbone.Relational.store'. + * A new model is created if no matching model is found, `attributes` is an object, and `options.create` is true. + * - If `attributes` is a string or a number, `findOrCreate` will query the `store` and return a model if found. + * - If `attributes` is an object and is found in the store, the model will be updated with `attributes` unless `options.merge` is `false`. + * @param {Object|String|Number} attributes Either a model's id, or the attributes used to create or update a model. + * @param {Object} [options] + * @param {Boolean} [options.create=true] + * @param {Boolean} [options.merge=true] + * @param {Boolean} [options.parse=false] + * @return {Backbone.RelationalModel} + */ + findOrCreate: function( attributes, options ) { + options || ( options = {} ); + var parsedAttributes = ( _.isObject( attributes ) && options.parse && this.prototype.parse ) ? + this.prototype.parse( _.clone( attributes ), options ) : attributes; + + // If specified, use a custom `find` function to match up existing models to the given attributes. + // Otherwise, try to find an instance of 'this' model type in the store + var model = this.findModel( parsedAttributes ); + + // If we found an instance, update it with the data in 'item' (unless 'options.merge' is false). + // If not, create an instance (unless 'options.create' is false). + if ( _.isObject( attributes ) ) { + if ( model && options.merge !== false ) { + // Make sure `options.collection` and `options.url` doesn't cascade to nested models + delete options.collection; + delete options.url; + + model.set( parsedAttributes, options ); + } + else if ( !model && options.create !== false ) { + model = this.build( parsedAttributes, _.defaults( { parse: false }, options ) ); + } + } + + return model; + }, + + /** + * Find an instance of `this` type in 'Backbone.Relational.store'. + * - If `attributes` is a string or a number, `find` will query the `store` and return a model if found. + * - If `attributes` is an object and is found in the store, the model will be updated with `attributes` unless `options.merge` is `false`. + * @param {Object|String|Number} attributes Either a model's id, or the attributes used to create or update a model. + * @param {Object} [options] + * @param {Boolean} [options.merge=true] + * @param {Boolean} [options.parse=false] + * @return {Backbone.RelationalModel} + */ + find: function( attributes, options ) { + options || ( options = {} ); + options.create = false; + return this.findOrCreate( attributes, options ); + }, + + /** + * A hook to override the matching when updating (or creating) a model. + * The default implementation is to look up the model by id in the store. + * @param {Object} attributes + * @returns {Backbone.RelationalModel} + */ + findModel: function( attributes ) { + return Backbone.Relational.store.find( this, attributes ); + } + }); + _.extend( Backbone.RelationalModel.prototype, Backbone.Semaphore ); + + /** + * Override Backbone.Collection._prepareModel, so objects will be built using the correct type + * if the collection.model has subModels. + * Attempts to find a model for `attrs` in Backbone.store through `findOrCreate` + * (which sets the new properties on it if found), or instantiates a new model. + */ + Backbone.Collection.prototype.__prepareModel = Backbone.Collection.prototype._prepareModel; + Backbone.Collection.prototype._prepareModel = function( attrs, options ) { + var model; + + if ( attrs instanceof Backbone.Model ) { + if ( !attrs.collection ) { + attrs.collection = this; + } + model = attrs; + } + else { + options = options ? _.clone( options ) : {}; + options.collection = this; + + if ( typeof this.model.findOrCreate !== 'undefined' ) { + model = this.model.findOrCreate( attrs, options ); + } + else { + model = new this.model( attrs, options ); + } + + if ( model && model.validationError ) { + this.trigger( 'invalid', this, attrs, options ); + model = false; + } + } + + return model; + }; + + + /** + * Override Backbone.Collection.set, so we'll create objects from attributes where required, + * and update the existing models. Also, trigger 'relational:add'. + */ + var set = Backbone.Collection.prototype.__set = Backbone.Collection.prototype.set; + Backbone.Collection.prototype.set = function( models, options ) { + // Short-circuit if this Collection doesn't hold RelationalModels + if ( !( this.model.prototype instanceof Backbone.RelationalModel ) ) { + return set.call( this, models, options ); + } + + if ( options && options.parse ) { + models = this.parse( models, options ); + } + + var singular = !_.isArray( models ), + newModels = [], + toAdd = [], + model = null; + + models = singular ? ( models ? [ models ] : [] ) : _.clone( models ); + + //console.debug( 'calling add on coll=%o; model=%o, options=%o', this, models, options ); + for ( var i = 0; i < models.length; i++ ) { + model = models[i]; + if ( !( model instanceof Backbone.Model ) ) { + model = Backbone.Collection.prototype._prepareModel.call( this, model, options ); + } + if ( model ) { + toAdd.push( model ); + if ( !( this.get( model ) || this.get( model.cid ) ) ) { + newModels.push( model ); + } + // If we arrive in `add` while performing a `set` (after a create, so the model gains an `id`), + // we may get here before `_onModelEvent` has had the chance to update `_byId`. + else if ( model.id !== null && model.id !== undefined ) { + this._byId[ model.id ] = model; + } + } + } + + // Add 'models' in a single batch, so the original add will only be called once (and thus 'sort', etc). + // If `parse` was specified, the collection and contained models have been parsed now. + toAdd = singular ? ( toAdd.length ? toAdd[ 0 ] : null ) : toAdd; + var result = set.call( this, toAdd, _.defaults( { merge: false, parse: false }, options ) ); + + for ( i = 0; i < newModels.length; i++ ) { + model = newModels[i]; + // Fire a `relational:add` event for any model in `newModels` that has actually been added to the collection. + if ( this.get( model ) || this.get( model.cid ) ) { + this.trigger( 'relational:add', model, this, options ); + } + } + + return result; + }; + + /** + * Override 'Backbone.Collection._removeModels' to trigger 'relational:remove'. + */ + var _removeModels = Backbone.Collection.prototype.___removeModels = Backbone.Collection.prototype._removeModels; + Backbone.Collection.prototype._removeModels = function( models, options ) { + // Short-circuit if this Collection doesn't hold RelationalModels + if ( !( this.model.prototype instanceof Backbone.RelationalModel ) ) { + return _removeModels.call( this, models, options ); + } + + var toRemove = []; + + //console.debug('calling remove on coll=%o; models=%o, options=%o', this, models, options ); + _.each( models, function( model ) { + model = this.get( model ) || ( model && this.get( model.cid ) ); + model && toRemove.push( model ); + }, this ); + + var result = _removeModels.call( this, toRemove, options ); + + _.each( toRemove, function( model ) { + this.trigger( 'relational:remove', model, this, options ); + }, this ); + + return result; + }; + + /** + * Override 'Backbone.Collection.reset' to trigger 'relational:reset'. + */ + var reset = Backbone.Collection.prototype.__reset = Backbone.Collection.prototype.reset; + Backbone.Collection.prototype.reset = function( models, options ) { + options = _.extend( { merge: true }, options ); + var result = reset.call( this, models, options ); + + if ( this.model.prototype instanceof Backbone.RelationalModel ) { + this.trigger( 'relational:reset', this, options ); + } + + return result; + }; + + /** + * Override 'Backbone.Collection.sort' to trigger 'relational:reset'. + */ + var sort = Backbone.Collection.prototype.__sort = Backbone.Collection.prototype.sort; + Backbone.Collection.prototype.sort = function( options ) { + var result = sort.call( this, options ); + + if ( this.model.prototype instanceof Backbone.RelationalModel ) { + this.trigger( 'relational:reset', this, options ); + } + + return result; + }; + + /** + * Override 'Backbone.Collection.trigger' so 'add', 'remove' and 'reset' events are queued until relations + * are ready. + */ + var trigger = Backbone.Collection.prototype.__trigger = Backbone.Collection.prototype.trigger; + Backbone.Collection.prototype.trigger = function( eventName ) { + // Short-circuit if this Collection doesn't hold RelationalModels + if ( !( this.model.prototype instanceof Backbone.RelationalModel ) ) { + return trigger.apply( this, arguments ); + } + + if ( eventName === 'add' || eventName === 'remove' || eventName === 'reset' || eventName === 'sort' ) { + var dit = this, + args = arguments; + + if ( _.isObject( args[ 3 ] ) ) { + args = _.toArray( args ); + // the fourth argument is the option object. + // we need to clone it, as it could be modified while we wait on the eventQueue to be unblocked + args[ 3 ] = _.clone( args[ 3 ] ); + } + + Backbone.Relational.eventQueue.add( function() { + trigger.apply( dit, args ); + }); + } + else { + trigger.apply( this, arguments ); + } + + return this; + }; + + // Override .extend() to automatically call .setup() + Backbone.RelationalModel.extend = function( protoProps, classProps ) { + var child = Backbone.Model.extend.call( this, protoProps, classProps ); + + child.setup( this ); + + return child; + }; +})); diff --git a/shared/static/new_css/global.css b/shared/static/new_css/global.css new file mode 100644 index 0000000..231b526 --- /dev/null +++ b/shared/static/new_css/global.css @@ -0,0 +1,763 @@ +@charset "UTF-8"; +/*NE PAS MODIFIER LE FICHIER .CSS, MAIS PLUTÔT LE + FICHIER .SCSS */ +/* LEGACY COLORS*/ +/* COLORS */ +/* Header */ +/* Général */ +/* Le reste */ +/* Titres */ +/* FONTS */ +/* line 2, ../sass/_messages.scss */ +.message-info { + color: #31708f; + background-color: #d9edf7; + border-color: #bce8f1; +} + +/* line 7, ../sass/_messages.scss */ +.message-success { + color: #3c763d; + background-color: #dff0d8; + border-color: #d6e9c6; +} + +/* line 12, ../sass/_messages.scss */ +.message-warning { + color: #8a6d3b; + background-color: #fcf8e3; + border-color: #faebcc; +} + +/* line 17, ../sass/_messages.scss */ +.message-error { + color: #a94442; + background-color: #f2dede; + border-color: #ebccd1; +} + +/* line 22, ../sass/_messages.scss */ +.alert { + margin-bottom: 0; +} + +/* line 2, ../sass/_header.scss */ +.strong-banner { + padding-top: 20px; + padding-bottom: 10px; + background-color: #375362; + color: white; +} + +/* line 10, ../sass/_header.scss */ +.navbar-inverse { + background-color: #375362; + background-color: transparent; + border-style: none; +} +/* line 15, ../sass/_header.scss */ +.navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:focus, .navbar-inverse .navbar-nav > .open > a:hover { + color: #fff; + background-color: #5D8CA6; +} + +/* line 24, ../sass/_header.scss */ +.navbar-collapse { + border-top: 0px solid transparent; + padding: 0px; + /* only < 768px*/ + background-color: #5D8CA6; + padding-left: 25px; + margin-left: -15px; + margin-right: -15px; +} +@media (min-width: 768px) { + /* line 24, ../sass/_header.scss */ + .navbar-collapse { + background-color: transparent; + padding-left: 0px; + margin-left: 0px; + margin-right: 0px; + } +} + +/* line 43, ../sass/_header.scss */ +.navbar-nav { + width: 100%; +} +@media (min-width: 768px) { + /* line 43, ../sass/_header.scss */ + .navbar-nav { + float: right; + width: auto; + } +} + +/* line 51, ../sass/_header.scss */ +.navbar-inverse { + /* BRAND */ + /* ICONE */ + /* LINKS */ +} +/* line 54, ../sass/_header.scss */ +.navbar-inverse .navbar-brand, .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus { + color: white; + font-family: "Lily Script One", cursive; + font-size: xx-large; + border-bottom: 5px solid #FF5C79; +} +/* line 65, ../sass/_header.scss */ +.navbar-inverse .navbar-toggle, .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { + background-color: #FFB363; + border-color: #FFB363; +} +/* line 71, ../sass/_header.scss */ +.navbar-inverse .navbar-toggle .icon-bar { + background-color: #FFF5EB; +} +/* line 78, ../sass/_header.scss */ +.navbar-inverse .navbar-nav > li > a, .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { + font-family: "Work Sans", cursive; + font-size: large; + color: #FFB363; + background: transparent; +} +@media (min-width: 768px) { + /* line 78, ../sass/_header.scss */ + .navbar-inverse .navbar-nav > li > a, .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { + color: #FFF5EB; + } +} + +/* line 108, ../sass/_forms.scss */ +.btn-primary { + /** + * This mixins allows defining color-related properties of buttons. + * + * It sets the following properties: + * color: $color, except for disabled-like buttons. + * border-color: $border. + * background-color: Depending on button state: + * - Default, disabled: + * $background-base + * - Hovered, focused, actived, responsible of an opened dropdown: + * (one is sufficent) + * $background-special + * + * ## Bootstrap compatibility + * + * This mixin can be used to replace colors behaviors of Bootstrap buttons. + * Indeed, this mixin aims to replace each definition done by the + * 'button-variant' Bootstrap mixin. + * + */ + color: white; + background-color: #FF6969; + border-color: #FF6969; + /** + * This mixin applies content if the button is in at least one of the + * following states: + * + * - hovered, + * - focused, + * - actived, + * - is responsible of an opened dropdown. + * + * Where possible, state is checked from class attribute and + * :pseudo-classes. + * + * ## Bootstrap compatibility + * + * If content defines 'color', 'background-color' and 'border', it is safe + * to use this mixin with Bootstrap buttons as it will overrides all + * Bootstrap color defaults of the previous cases. + * To be precise, this covers all special important-like cases of the + * Bootstrap mixin 'button-variant' (except the 'disabled' case). + * + */ +} +/* line 10, ../sass/_forms.scss */ +.btn-primary:focus, .btn-primary.focus, .btn-primary:hover { + color: white; + background-color: #FF9191; + border-color: #FF6969; +} +/* line 3, ../sass/_forms.scss */ +.btn-primary:active, .btn-primary.active { + color: white; + background-color: #FF9191; + border-color: #FF6969; +} +/* line 10, ../sass/_forms.scss */ +.btn-primary:active:focus, .btn-primary:active.focus, .btn-primary:active:hover, .btn-primary.active:focus, .btn-primary.active.focus, .btn-primary.active:hover { + color: white; + background-color: #FF9191; + border-color: #FF6969; +} +/* line 26, ../sass/_forms.scss */ +.open > .btn-primary.dropdown-toggle { + color: white; + background-color: #FF9191; + border-color: #FF6969; +} +/* line 10, ../sass/_forms.scss */ +.open > .btn-primary.dropdown-toggle:focus, .open > .btn-primary.dropdown-toggle.focus, .open > .btn-primary.dropdown-toggle:hover { + color: white; + background-color: #FF9191; + border-color: #FF6969; +} +/* line 10, ../sass/_forms.scss */ +.btn-primary.disabled:focus, .btn-primary.disabled.focus, .btn-primary.disabled:hover, .btn-primary[disabled]:focus, .btn-primary[disabled].focus, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:focus, fieldset[disabled] .btn-primary.focus, fieldset[disabled] .btn-primary:hover { + background-color: #FF6969; + border-color: #FF6969; +} +/* line 102, ../sass/_forms.scss */ +.btn-primary .badge { + color: #FF6969; + background-color: white; +} + +/* line 113, ../sass/_forms.scss */ +form#filter_form .form-group { + padding-right: 20px; +} +/* line 117, ../sass/_forms.scss */ +form#filter_form ul.form-control { + background-color: transparent; + border: none; + box-shadow: none; +} + +/* line 2, ../sass/_tree.scss */ +.tree { + font-size: large; +} +/* line 4, ../sass/_tree.scss */ +.tree ul, .tree li { + position: relative; +} +/* line 8, ../sass/_tree.scss */ +.tree ul { + list-style: none; + padding-left: 32px; +} +/* line 13, ../sass/_tree.scss */ +.tree li::before, +.tree li::after { + content: ""; + position: absolute; + left: -12px; +} +/* line 19, ../sass/_tree.scss */ +.tree li::before { + border-top: 3px solid #FFC282; + top: 9px; + width: 8px; + height: 0; +} +/* line 25, ../sass/_tree.scss */ +.tree li::after { + border-left: 3px solid #FFC282; + height: 100%; + width: 0px; + top: 2px; +} +/* line 31, ../sass/_tree.scss */ +.tree ul > li:last-child::after { + height: 8px; +} + +/* line 4, ../sass/_filters.scss */ +#filter_form .form-group .col-md-3, #filter_form .form-group .col-md-9 { + float: none; +} +/* line 7, ../sass/_filters.scss */ +#filter_form .form-group ul.form-control { + padding-left: 15px; + list-style: none; + height: auto; +} +/* line 12, ../sass/_filters.scss */ +#filter_form .form-group ul.form-control a.selected { + text-decoration: underline; + color: #c40000; +} + +/* line 18, ../sass/_dashed-shadows.scss */ +.dashed-shadow { + position: relative; + top: 8px; + left: 8px; + display: inline-block; + color: #ba9186; +} + +/* line 25, ../sass/_dashed-shadows.scss */ +.dashed-shadow:before { + content: " "; + display: block; + position: absolute; + top: -8px; + left: -8px; + bottom: -2px; + right: -2px; + z-index: 1; + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuMCIgeTE9IjEuMCIgeDI9IjEuMCIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIxMi41JSIgc3RvcC1jb2xvcj0iI2U4ZTNjNyIvPjxzdG9wIG9mZnNldD0iMTIuNSUiIHN0b3AtY29sb3I9IiNlOGUzYzciIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSIzNy41JSIgc3RvcC1jb2xvcj0iI2U4ZTNjNyIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjM3LjUlIiBzdG9wLWNvbG9yPSIjZThlM2M3Ii8+PHN0b3Agb2Zmc2V0PSI2Mi41JSIgc3RvcC1jb2xvcj0iI2U4ZTNjNyIvPjxzdG9wIG9mZnNldD0iNjIuNSUiIHN0b3AtY29sb3I9IiNlOGUzYzciIHN0b3Atb3BhY2l0eT0iMC4wIi8+PHN0b3Agb2Zmc2V0PSI4Ny41JSIgc3RvcC1jb2xvcj0iI2U4ZTNjNyIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9Ijg3LjUlIiBzdG9wLWNvbG9yPSIjZThlM2M3Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); + background-size: 100%; + background-image: -moz-linear-gradient(45deg, #e8e3c7 12.5%, rgba(232, 227, 199, 0) 12.5%, rgba(232, 227, 199, 0) 37.5%, #e8e3c7 37.5%, #e8e3c7 62.5%, rgba(232, 227, 199, 0) 62.5%, rgba(232, 227, 199, 0) 87.5%, #e8e3c7 87.5%); + background-image: -webkit-linear-gradient(45deg, #e8e3c7 12.5%, rgba(232, 227, 199, 0) 12.5%, rgba(232, 227, 199, 0) 37.5%, #e8e3c7 37.5%, #e8e3c7 62.5%, rgba(232, 227, 199, 0) 62.5%, rgba(232, 227, 199, 0) 87.5%, #e8e3c7 87.5%); + background-image: linear-gradient(45deg, #e8e3c7 12.5%, rgba(232, 227, 199, 0) 12.5%, rgba(232, 227, 199, 0) 37.5%, #e8e3c7 37.5%, #e8e3c7 62.5%, rgba(232, 227, 199, 0) 62.5%, rgba(232, 227, 199, 0) 87.5%, #e8e3c7 87.5%); + background-size: 6px 6px; +} + +/* line 54, ../sass/_dashed-shadows.scss */ +.dashed-shadow:hover:before { + animation: dash-animation 30s infinite linear; +} + +/* line 58, ../sass/_dashed-shadows.scss */ +.dashed-shadow:after { + z-index: 2; + content: attr(data-text); + position: absolute; + left: -8px; + top: -8px; + color: #b85b3f; + text-shadow: 3px 3px #e8e3c7; +} + +/* MISE EN FORME GÉNÉRALE */ +/* line 12, ../sass/global.scss */ +html { + height: 100%; + background-color: #FFFBEF; +} + +/* line 17, ../sass/global.scss */ +body { + font-family: "Saira Semi Condensed", sans-serif; + font-size: medium; +} + +/* line 22, ../sass/global.scss */ +#principal { + background-color: #FFFBEF; +} + +/*MAIN*/ +/* line 27, ../sass/global.scss */ +main { + background-color: #FFFBEF; + border-width: 2px; + border-color: #375362; + border-style: none; + border-collapse: collapse; + display: table-cell; + margin-top: 0px; + padding: 0px; +} +/* line 37, ../sass/global.scss */ +main .fuid, main h1, main h2, main h3 { + margin-left: -15px; + margin-right: -15px; + margin-top: 0px; + margin-bottom: 0px; +} +/* line 43, ../sass/global.scss */ +main h1, main h2, main h3 { + margin-top: -2px; + margin-bottom: -2px; + margin-left: -17px; + margin-right: -17px; + color: white; + padding-left: 15px; + padding-right: 15px; +} +/* line 52, ../sass/global.scss */ +main h1 { + font-family: "Capriola", sans-serif; + font-weight: 600; + padding-bottom: 10px; + padding-top: 15px; + background-color: #4F778C; +} +/* line 59, ../sass/global.scss */ +main h1.activity { + background-color: #4FADB8; +} +/* line 62, ../sass/global.scss */ +main h1.event { + background-color: #3488A6; +} +/* line 65, ../sass/global.scss */ +main h1.todo { + background-color: #F19F5D; +} +/* line 68, ../sass/global.scss */ +main h1.equipment { + background-color: #E75571; +} +/* line 71, ../sass/global.scss */ +main h1.staff { + background-color: #3BAD89; +} +/* line 75, ../sass/global.scss */ +main h2, main h3 { + border-bottom: 2px solid #5D8CA6; + padding-bottom: 5px; + padding-top: 10px; + font-family: "Capriola", sans-serif; + font-weight: 600; + font-size: x-large; + background-color: #BDD2DE; +} +/* line 84, ../sass/global.scss */ +main h2.activity, main h3.activity { + background-color: #5ED1DC; + border-color: #4FADB8; +} +/* line 88, ../sass/global.scss */ +main h2.event, main h3.event { + background-color: #3999BA; + border-color: #3488A6; +} +/* line 92, ../sass/global.scss */ +main h2.todo, main h3.todo { + background-color: #FF9C4D; + border-color: #F19F5D; +} +/* line 96, ../sass/global.scss */ +main h2.equipment, main h3.equipment { + background-color: #FF5C79; + border-color: #E75571; +} +/* line 100, ../sass/global.scss */ +main h2.staff, main h3.staff { + background-color: #42C2A2; + border-color: #3BAD89; +} +/* line 105, ../sass/global.scss */ +main h3 { + background-color: #F0FAFF; + color: #4F778C; +} +/* line 108, ../sass/global.scss */ +main h3.activity { + background-color: #F0FAFF; + color: #5ED1DC; +} +/* line 112, ../sass/global.scss */ +main h3.event { + background-color: #F0FAFF; + color: #3999BA; +} +/* line 116, ../sass/global.scss */ +main h3.todo { + background-color: #F0FAFF; + color: #FF9C4D; +} +/* line 120, ../sass/global.scss */ +main h3.equipment { + background-color: #F0FAFF; + color: #FF5C79; +} +/* line 124, ../sass/global.scss */ +main h3.staff { + background-color: #F0FAFF; + color: #42C2A2; +} +/* line 129, ../sass/global.scss */ +main a { + color: #FF6969; +} +/* line 132, ../sass/global.scss */ +main a:hover, main a:active, main a:focus { + color: #FF6969; +} +/* line 139, ../sass/global.scss */ +main .text { + padding: 15px; +} + +/*ASIDE*/ +/* line 145, ../sass/global.scss */ +aside { + background-color: #375362; + color: white; + margin-top: 0px; + padding: 0px !important; +} +/* line 151, ../sass/global.scss */ +aside a { + color: #FF9191; +} +/* line 154, ../sass/global.scss */ +aside a:hover, aside a:active, aside a:focus { + color: #FF9191; +} +/* line 161, ../sass/global.scss */ +aside code { + color: #375362; + background-color: #BDD2DE; +} +/* line 166, ../sass/global.scss */ +aside .heading { + padding: 8px 15px; + font-size: 32px; + line-height: 1.3; + text-align: center; +} +/* line 172, ../sass/global.scss */ +aside .heading.inverted { + background-color: #FFF5EB; + color: black; +} +/* line 177, ../sass/global.scss */ +aside .heading.small { + font-size: 25px; +} +/* line 180, ../sass/global.scss */ +aside .heading.small .sub { + font-size: 0.7em; + font-weight: normal; +} +/* line 186, ../sass/global.scss */ +aside .heading .sub { + font-size: 0.7em; + font-weight: normal; +} +/* line 191, ../sass/global.scss */ +aside .heading.separator { + border-bottom-color: #FF9191; + border-bottom-style: solid; +} +/* line 197, ../sass/global.scss */ +aside .text { + padding: 15px; +} +/* line 200, ../sass/global.scss */ +aside .text.inverted { + background-color: #FFF5EB; + color: black; +} + +@media (min-width: 768px) { + /* line 209, ../sass/global.scss */ + main { + margin-top: 20px; + border-style: dashed; + } + + /* line 213, ../sass/global.scss */ + aside { + margin-top: 20px; + } +} +/* line 218, ../sass/global.scss */ +hr { + border-top: 1px solid #FFB363; +} + +/* line 223, ../sass/global.scss */ +span.vsep { + padding-left: 5px; + padding-right: 5px; +} + +/* line 228, ../sass/global.scss */ +div.tag-list { + margin-top: 20px; +} + +/* line 232, ../sass/global.scss */ +code { + font-size: small; +} + +/* line 236, ../sass/global.scss */ +.module-list { + margin-top: 10px; + margin-bottom: 10px; + display: flex; + align-items: stretch; + flex-wrap: wrap; +} + +/* line 244, ../sass/global.scss */ +a.module { + padding: 20px 40px; + margin: 5px; + border-bottom-style: solid; + font-size: large; + display: block; + border-bottom-color: #375362; + background-color: #BDD2DE; + color: #375362; +} +/* line 256, ../sass/global.scss */ +a.module.activity { + border-bottom-color: #4FADB8; + background-color: #CAE4E7; + color: #4FADB8; +} +/* line 262, ../sass/global.scss */ +a.module.event { + border-bottom-color: #3488A6; + background-color: #AAD5E2; + color: #3488A6; +} +/* line 268, ../sass/global.scss */ +a.module.todo { + border-bottom-color: #F19F5D; + background-color: #FFDEBC; + color: #F19F5D; +} +/* line 274, ../sass/global.scss */ +a.module.equipment { + border-bottom-color: #E75571; + background-color: #FECAD6; + color: #E75571; +} +/* line 280, ../sass/global.scss */ +a.module.staff { + border-bottom-color: #3BAD89; + background-color: #A9E1D7; + color: #3BAD89; +} +/* line 286, ../sass/global.scss */ +a.module:hover, a.module:active, a.module:focus { + text-decoration: none; + color: #F0FAFF; + background-color: #375362; +} +/* line 293, ../sass/global.scss */ +a.module:hover.activity, a.module:active.activity, a.module:focus.activity { + background-color: #5ED1DC; +} +/* line 296, ../sass/global.scss */ +a.module:hover.event, a.module:active.event, a.module:focus.event { + background-color: #3999BA; +} +/* line 299, ../sass/global.scss */ +a.module:hover.equipment, a.module:active.equipment, a.module:focus.equipment { + background-color: #FF5C79; +} +/* line 302, ../sass/global.scss */ +a.module:hover.todo, a.module:active.todo, a.module:focus.todo { + background-color: #FF9C4D; +} +/* line 305, ../sass/global.scss */ +a.module:hover.staff, a.module:active.staff, a.module:focus.staff { + background-color: #42C2A2; +} + +/* line 311, ../sass/global.scss */ +.collapsible { + background-color: #777; + color: white; + cursor: pointer; + padding: 18px; + width: 100%; + border: none; + text-align: left; + outline: none; + font-size: 15px; +} +/* line 322, ../sass/global.scss */ +.collapsible:after { + content: '\002B'; + color: white; + font-weight: bold; + float: right; + margin-left: 5px; +} +/* line 330, ../sass/global.scss */ +.collapsible:hover { + background-color: #555; +} +/* line 334, ../sass/global.scss */ +.collapsible h3 { + margin-top: 0px; + margin-bottom: 0px; + display: inline-block; +} + +/* line 341, ../sass/global.scss */ +.active { + background-color: #555; +} +/* line 344, ../sass/global.scss */ +.active:after { + content: "\2212"; +} + +/* line 348, ../sass/global.scss */ +.content { + padding: 8px 18px; + display: none; + background-color: #f1f1f1; +} +/* line 353, ../sass/global.scss */ +.content.fluid { + padding: 0px 0px; + background-color: transparent; +} +/* line 358, ../sass/global.scss */ +.content h4 { + font-size: x-large; + font-weight: bold; + display: inline-block; + margin: 0px 0px; +} + +/* line 367, ../sass/global.scss */ +.planning .activity { + padding: 8px 18px; + padding-top: 8px; + padding-bottom: 12px; + border-left: none; + border-right: 6px solid #FF9191; +} +/* line 375, ../sass/global.scss */ +.planning .activity.inverted { + border-left: 6px solid #FF9191; + border-right: none; +} +/* line 380, ../sass/global.scss */ +.planning .activity .activity-title { + font-size: large; +} + +/* line 387, ../sass/global.scss */ +.glyphicon.yes { + color: #55C487 !important; +} +/* line 390, ../sass/global.scss */ +.glyphicon.no { + color: #E36268 !important; +} +/* line 393, ../sass/global.scss */ +.glyphicon.dunno { + color: #5599C4 !important; +} + +/* line 398, ../sass/global.scss */ +.sending-request { + position: relative; +} +/* line 401, ../sass/global.scss */ +.sending-request:after { + content: "Chargement..."; + position: absolute; + width: 100%; + height: 100%; + background: #fff; + opacity: 0.8; + color: #777; + text-align: center; + box-sizing: border-box; + z-index: 5; + top: 0; + left: 0; + padding: 8%; +} diff --git a/shared/static/old_css/global.scss b/shared/static/new_css/global.scss similarity index 99% rename from shared/static/old_css/global.scss rename to shared/static/new_css/global.scss index d264905..817ad55 100644 --- a/shared/static/old_css/global.scss +++ b/shared/static/new_css/global.scss @@ -6,7 +6,7 @@ @import '_forms'; @import '_tree'; @import '_filters'; -//@import '_dashed-shadows'; +//i@import '_dashed-shadows'; /* MISE EN FORME GÉNÉRALE */ html { diff --git a/shared/static/css/ie.css b/shared/static/new_css/ie.css similarity index 100% rename from shared/static/css/ie.css rename to shared/static/new_css/ie.css diff --git a/shared/static/css/print.css b/shared/static/new_css/print.css similarity index 100% rename from shared/static/css/print.css rename to shared/static/new_css/print.css diff --git a/shared/static/css/screen.css b/shared/static/new_css/screen.css similarity index 100% rename from shared/static/css/screen.css rename to shared/static/new_css/screen.css diff --git a/shared/static/old_css/.sass-cache/702601a8b7490c5ef78bf7afc3c3f2736c608d56/forms.scssc b/shared/static/old_css/.sass-cache/702601a8b7490c5ef78bf7afc3c3f2736c608d56/forms.scssc deleted file mode 100644 index d702d1a88d9d870c1987accb9aa058f968033e62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15338 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 diff --git a/shared/static/old_css/.sass-cache/702601a8b7490c5ef78bf7afc3c3f2736c608d56/global.scssc b/shared/static/old_css/.sass-cache/702601a8b7490c5ef78bf7afc3c3f2736c608d56/global.scssc deleted file mode 100644 index 81142ad17c20c824859e51aa34c8f5002315f32b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 58159 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 Yu34Kj$8QE;U6$VB)hT;xSNYuk2k^krvj6}9 diff --git a/shared/static/old_css/.sass-cache/702601a8b7490c5ef78bf7afc3c3f2736c608d56/header.scssc b/shared/static/old_css/.sass-cache/702601a8b7490c5ef78bf7afc3c3f2736c608d56/header.scssc deleted file mode 100644 index b9967b4d1c490f6a38cd85424bab9341b05431b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19477 zcmcIM$#xq_a#VFc5Cp{q)Y_7$h9HSrx=Bz=i&AB`y1FIxG%SroEv;E};42bEvTP8A zL4hsFda@5b**eGsp4C_MB!8^Ze|i?fC;QSK9~s=;w&6%#4geVxgqrdwfKo zA|qqV$cV@+URnBN>00SVbh*(8H>4Qopv+QSd$snu{_qTCWu=E&RgM5RIko) zw#CE~c+`wrQCt8OY{tz9@s@$Lba(x?fo=IQ+3jqgK*h&Vw*UjS!*u)g*jFHMDj%(N z!q!%l_(#?3@=MSzemmjM1Zg+ybl2JmkT}j!R+BXD#z|{jl!1f&L9)4-MqT(g6-2Fu z93qa%hvImA5T-^Jmw{CfKIwF$&N2=ZbJ?HlqklX|mCDx`f8ywb_#h#A1#!ZH4vG1C zb#^-n8&PK|-AK~{Xh)n({7S}hUCjv2^A#|WzD&E(4r;aoPE@a6t8FJcQSC?1!69n( z)@IV#3A-_vy4Fs1o9(EUZik(yQ3G9cb}*!QqV( z9&dEwc2_T-dofrbY!<~r55iL%==+bm9UwR%7V6cB%ggN-lI&EFw9)A4t1;y6Wjpd` z;zrc!#+z}}@vA{2YImZIunS8mZow4oHCQt-@B%n!>2Yx+v5h$n&T+yR6QPQj4~~hG z!EtdW9`nmV8zfyzU$(m83%}Tko`W*R&}%LP=ljqry6O2x8!t zhA8h-><2YHBoSwoNe*a}tS8-WvLjt`0qh~pflm7={r)aSm6BM9XHY=@P|(`l0YgCy zTH9^KU5GdJ>bNq-5zuxk*@;`$<1tuZNhjWdFPmVvOUiJdsbWs^MW%U#Nb_@G0nol! z6iZy)E+V9EByvh?Lew%t2e*uJ@%dr%e3?0dVkfw*pOYpJt%n=Gv(-s4hF%t5?;R zYxHF~F6D$T0T(ldCxlMuIR^{xB1FP-LR$DOHqn%shzqY+3bxI26CVni`{1Y{RREr0 z%gCY(?1ZomvKh}01 zNhevT{*VV5wLjj%NCcr=?nJQPhTU!_eKp}1A)vsZbU_BK}#Z6oip6Hh>${&$T>sA zDD=oh_hmC%HMH-E^I1mGN?O??jFlI~N8)4j^m0z> zGO&2e@Pp7vJzamPT|`J~B=VslVx;~Vo8_QE;DJW*6YTqIjX>dIR)-4+0HcM985Jt@ zfO0&y_b^cw^D0cp!AL{V;bCG9bS2%#!unv%klS*vml6rr3*cQ-fV7w8lR_O6t1qZAxmuNH11 zCuUw1swYrDwcbXWg!G47$jsnL{1Yl{7~$?Tqa9e`69Tr0LWmPX4S}gYEd7mWWKrjg z6_E=_R+asw2%s*d=1G{O#Kr!+D1wou!L)YTOoPx6Vc$ffNS0(l=m?V~XSVS~d||0h ze5oa&%G79jHH~%~$s~kYSvYJ!*|sK&mC^L%i6HE3VP&doPfdB?j*Sdc zY(fZ9-*;~c%!|ns2>k|3fn>=P2)&^x#H~qjTilTfrU>xWviQzOI>nhurwH}xR7V6J z-VOjRsp$|vRUM*bDqeU7{-aB?d`5f@%V51To!;EsltF>*Oowwj(_xt51G7R9nrHL% zR8B4eq;gI`?@HdyeQXLaiYkrywxpN|ywCS(3=(!|%6CFl0%^37K!v5NpN3QdB!24o zTK3%Jf7$agcnYuRkAN=D7`74mR5LZWK5!8t4RJz7L#w1A#2}+{4JoDq@1fBU?kZ?v z++dUhfmb7P+=o`45dNIO-}m=MP`;zu=+lJ$%AoT+eZ?v}4(U7sim+zb9<}Z`sFDdb zstmQ+o(m7i3se}BgOP@!!AUJem{fXo6aJ@HC2W2 z|B=l(rM93`GKcUry z82z$rdZzPJT!22cH#^e=c-STZln^_^BIjEgpT>d2M-pZwA3g2o@_A0PI4J(AG$>uEe zT?9yGPQb|gPb4#9P(jFLR?Gz6KRaZe-GSseZY}l~xwLr6Df8)^%%_2cBgWnc4UySJ zfMn(bjLiQ^G9!lR0}3v)VkYqZ%^`DH$qaq=?LKzyC-j+|&}V=LGBiR%@<*e zX9!W&C}%5NkR##XYfOH~l9|!EsCFsQ)7E23IG1DVoMc3ALkKOJ801{?E&@~naRSB@ z<~<`hVo*DcyT4*4@J@P~3EBuo2y-S0V>@xSa{@->8i|Y; z{USR)17-qm*&*`qDCd^=LQdifFbTDB5h4pXC3X=Yi8%oy@fRd9Vo;LHjjWgnye}OR zj}YVBB45mjd@<9jO2H8tVq_Nq5}6Y)B0naP5u=}x6*GbN#E49FohwjKXvIKrMlS|o z7kDSM#DTX%ftD9Uc7^vYI>oiU*LBn>mV?W24GIGJk=J!K5R~dVgyxLcStztyDHP&+ zbDc}e%V%W-Wl>;Rt4q1WGR#mmQ3)a1l$~qBMS$$Y2^a_YJ#rAlfF@dy-7?^7LNOC~ zzi%8Q5f7%t>YMCymvWL`lDgC(9-()+&$(u!eGX@<8lea5bGC6en@MOVICyhG^~p+< z{4ncY&dGck=A{Y~Attl?oZLl(LI4t>)X-S?CuCv7Ft<2znVn(?sw>OFrZYImox|O3 z((BGwaspq0xepn4Mu_6C)16%eNLWt52>W*=EMoK%RxuNJKR3csymL7Wts`_8cf6}< zi32YoHh7@0g_KdeR2PGMOWJ5KCiK_Yb~iTcO3|lb`dgRjt<`Dbn_3oHm$7rR2p{UpsYH7G^8Bg z*t?qOAW05J8j22A(+wsELe%NV)MOnbo?o!e2Yq=WV1HrGV1$-Z9})r$eXl~FTKRjI ziOvD#;BxG%!?E$);TQxxdzxhMImS><#z8Bzgb^Yqd<#xUUHU|2C?`e62|~S`fSn~B zZfBp3{1l-4aId^0EdP2l81 z!xusq^{j(iT`oeT0#3-N;4@MIVo<|@t3WXocsCs?n3gI?<%&oZLSw-R;n>!7?3iTBADne)>3 zmQ%Y~|A@^Zj1hr#sg2(fcf~zCg>bRRf~$71>OlF$AhF@BHkeU|D=?OZ=RSk+37|7)`R!P`$prO$}g-j<@omAH)A;NQF)jgj5HJ-zVX~M{egkU|C9% zz5`G`!LUlvp@&b0_4S0L*|6>}C=*j5HJ-zCP}P4rqNKF>G!A{-_zPuo6J36f>sDZE2H^? zixBw(CuIC#>V1Q2>Gz2leYfYXmLTx{kNklv)843W6aJqOKHr4$8}+^V z{kxC*ZqyGnMWw?BAPQ~N2st+DchMqV-Med2i&zdW$E)C)@*{W6RVD*M`Ot0k0A}#k za5Ki6#Ijh*CmaChOZ|s?XPtIp9Gts53fyFON5`Ac;(>Pq<>k?lW+77*K+OFnhZ!_W zcDZ*ClhFG#ILR!V1T64S{=!8rZiR<{O929*e4=DoVcF`$;BD@Od^aZhk}?2orU4z9 zM{i>$Ik+4@8lEsA=8%MGC?}XOQNTe6bfwbKx8Q`-r8_c1IVmzu5bEUw>@DeVdp}|$ zp8!P1Tv_K0Y^FDaK|P8o*`v^}9Y8|BzbMDwML*jf3E^9}}N9ML%vLN#NNfyQ?cB2{ogMiqZUsz8i> zeHz77;Qg&b6*Kw{vudIDoJbJazjO+&AaVNMl41a_z=h0s-76|$k_3;-@dbU&CAGRFTeGCpGT3jm6#!254weB6TZ z0Ja>v)JtB6>RmPx*eUNLEqUPm0kOfi7aRW};XfsOo_^T)tAt-8e4aGg_$!3}YwDG) z0RNO^8hp4R4*$!c-Gu)*P_KG_IL`mMN97f~x~4B>!qs#28k=9ie`p}AXIV!VANv)2 zXTE|DDT-vTo#VqZJ+G4^rmVl|p#(+gb*WU+4L9`;v1Dj;x;>bF#d=jVW72xpazgTt zuU5)Om5QDnwt6{pCO>nM}7s|MY-*n+~Eri z(+dH)0Lk^40Fyjx%v-|jUG%(bfs{R6Q(_94QL-qV4Z_Yuz%i!RX7MU%ng7j^1zMWj z>Q>S8Ii2YC3)2ZXDo#Khh}_JUrX=2gqBu7a(H(99^Ae+ogFg~4a|~H_^kR&l#*CD` zE3wU>m*yx7QWM3$IUby<*Z5>p{DvTHn%DBpV@OKO|KCvEFYIs7C7TS=H}O`U{6BtP B9O?i7 diff --git a/shared/static/old_css/.sass-cache/702601a8b7490c5ef78bf7afc3c3f2736c608d56/messages.scssc b/shared/static/old_css/.sass-cache/702601a8b7490c5ef78bf7afc3c3f2736c608d56/messages.scssc deleted file mode 100644 index 7288cfef4f6497014c45feb08dc57a765e737bd4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5807 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 diff --git a/shared/static/old_css/.sass-cache/702601a8b7490c5ef78bf7afc3c3f2736c608d56/variables.scssc b/shared/static/old_css/.sass-cache/702601a8b7490c5ef78bf7afc3c3f2736c608d56/variables.scssc deleted file mode 100644 index c5acfa8fe48a80b6328d2baf9b0e0027cfdc051d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13037 zcmb_jOK2p=8Mc;0D~;Zdk@o4G)yk{&zBGD_G}GczGkjKRY5(fe?CJ)FZfjIwP-Bo{AZH;;s z=lIuDef@oZ{q@&#)@~PWZ)95Sji$YsUoBdtR-s*Lw)a+=YkS3&jkev)ude0u?dFQr zE*3MN8}f{^J5~@F#y#J*4dW%x3t#lw_NXylZXGzCwr{)lzu*}cla*e!e8*~bY^*qL zWXi5}Xm2l!9$JpO+u9s72J82r)c#u6_l#WBaHr)v-H?CfjuYCx)fqNM%Ewmc$o7m& za+{osvZW5~DL&QnHaAGo{DSB&8%G;{Wi zjMeELSk9m^TlVd)ZwIy;TG$*|URm2LtZl3gn!`x49d+eaqbkI%i@! ztPs3{rNhQVIS4I3-0gaSXPlR-e8~$O{K9E73wWbtZ*MQKLuV40+isgRG0(Ce&2!E? ze0k65fYWA$v;ioS_{%90Ym?R&en3#~Kh!C>JZ0r@$loN0#5V+j;QQe#dKCoxC}C|1onh zZ;qEo(1GThXU-3sXFT%RY4d!-nl~?$r_77xY0o@8ZVrj)E1(C>jAxEO*m&j`1`h+B zcw^X{beiUrGw`N4?F{_ToPp2GVn7sX#cE}PHOxAvl~13B?wS;zMoWC!Tm%YFN~00eA5!QKN%YZ5rLTh^`Vs`EKjGR(Aq?o< z78_T+{Xg(eRPYHZ_%NYhwO*@LV+9#SK?XR_iVi^QJn#En9iW3C1ro%=3ex)EQ&jLD zRPeWif<|Mj&ii0QQ7{6WXM_T@&ZQ~PL68Cof-9J`TA_37gb#LG#goJ69xC`TDtMO^ ztT!sPt*Bwv8B-LDNqvA;Y9HtzNPz^QQLuTkf)*8AwH(@6h&NdIT#{k2l5v{i}I z(6mB-TB46uDt#RU(U%}p`f1VgBjo>EqhV=#0c4tyKOx2;wh6 zaQ>sA*Y;9_XW$=5{|7+7N$eXdrADC^dq1nN&jMeXh0#i##&i(GUV>2Ar^F7-y}K+2qQUI7Wmq@cc8C~QV^ch)(pC^!q8vm*DPbs;VH=paae z1ff&VPYhY0;2Wf%(I`|mOYs0WrzkilDL^Y#fewNcNDw*&X>s&l90ea>9Q`h#pjWJwZ&R;myk1PPHKxRCj{Lmn}-{`F93 zH3}lMt|>~c0r&HwOVCk=IVDUl$!l5BY3`29!L7cuMq1ZDh^I%K`Lm9O%we_fGr z9f;EiK`V8H=paaj1fj_2JFvcsI(~yXJ|Z2(Ms2;$N5~CD#|=pbTB$m85Trwb;5z1_ z?&v?RK13mZMIoP%kXp4~sq?+eO-0B}piV;_t<({sgCHRigl8^|M)U0y%(u}*n~P>z z^P2gjJiXplsNDuKG`*rV%|l+sea^Ppw%-$XS;1YFaM4QOMyJnn2MqF7(`voC?|VmX zJD#|W%ksrWw7lRKC?koJYc>LmxiYl1{h;N+c|AK-7f0KCh~yP|c_2hRf|fke@km{B zO09#TUXfsUcwLB9M(In4l*JhcD~z#z7B@y zOE8@NR7}6`HOZ$qFvLlFh7GHDCSO%ltO9S^VWO3K#;b!M1rh{TFw24i@2qY$;igJ) zd~ydJ1q*op;lix5rjTC)x@SZep!GyQU7&*@0TK+2zgZa9&%XDL``$ZnU(j<178HgB z;6y_ktr^Zx_~sxy?1-3DeM2`C(V7xGqZVbI4dtsFl3&oe!oPY_XzF0dFA@wVKMxDE z5H=j2jsK>?e-jwf8UU@U{qWbp5Pu1V^Pds?J-FBtyA~-Sh>#Q)#duYhb&3k>BJi9S z(TJA3xbKk=bTGtPg5j*QR^YT@D5*(XPGr4!mlWP5U`k6BwB(tw2X7q=@s?mX@5dwF zj(cpwEpa^&pKs=ewlfUpID%^$o+Rx z4%Wet1PO*qVBG)`g09_itd35FvOy3kl=7@oQB+ilQ#Gzd|hE*2flRv zjFvb(?DY^r2SMy52+n@8edP8hfcc-@p}tQF3WX9}gvE>GhN7SWoareCTB$eKItWrA zK~SQeghbuA`{KQwo>}@ih1qk!g|akSQ#>-bV|?jEQ!bx+^HdUvJ?GL4 zRh?oA6^Rh<(=pbku64|l{moJHmgp%na>n?VJ^xjB#^?sD7V8LeIda1DikF`U*>q2h zmK5P>UN%>H!(J4=MOb+fTs7Csb#!45KIKzy_vJ!eb8?~dUGBp1Xjs67#YsLKt6E*( z@jBMSE_^|8;R~RS(i~bRxNstXZn+iMzO$D=j=iWuCNCngJP8Xg>KX#2@~L&fJZlEd;u zpX!irh{#0bLK4{&KGih@O660(>dU9P=Hyf5yX?g$Y?5WT9v&ro@Ufo~P$at6fi{}G7a!UITjs}7apG6aaOs;P|eXV<^b z824H7RcqW;v`S^9@uCwTSjW;5oc)BChy16+aX9-8FXR|S^;(Smiq~AoEBaA^#j7Lw zQ3b~97z9=?MF2OtDaUgz^QKQ57$SLAH96clsu``Pg9X=a59_@hI0hB7IjnE<)1`(&^Ssr{#K7)f6G)MqYoDzu>m!37)4n}a?gvRP&jpj$q ziHN8LGQs