Overview
Comment: | New version of public website |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | stable |
Files: | files | file ages | folders |
SHA3-256: |
ca2fc23dd5f03ca0d5273f438e0c87fb |
User & Date: | bohwaz on 2022-07-30 22:17:42 |
Other Links: | manifest | tags |
Context
2022-07-31
| ||
00:02 | Make navigation slightly smaller check-in: 428baf82c4 user: bohwaz tags: trunk | |
2022-07-30
| ||
22:17 | New version of public website check-in: ca2fc23dd5 user: bohwaz tags: trunk, stable | |
19:35 | Fix direction in debt/credit payoff check-in: b30208f10f user: bohwaz tags: trunk, stable | |
Changes
Modified src/include/lib/Garradin/Template.php from [939b751f55] to [3554df1e22].
︙ | ︙ | |||
646 647 648 649 650 651 652 | $couleur2 = $config->get('couleur2') ?: ADMIN_COLOR2; $admin_background = ADMIN_BACKGROUND_IMAGE; if ($url = $config->fileURL('admin_background')) { $admin_background = $url; } | < < < < | | 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 | $couleur2 = $config->get('couleur2') ?: ADMIN_COLOR2; $admin_background = ADMIN_BACKGROUND_IMAGE; if ($url = $config->fileURL('admin_background')) { $admin_background = $url; } $out = ' <style type="text/css"> :root { --gMainColor: %s; --gSecondColor: %s; --gBgImage: url("%s"); } </style>'; if ($url = $config->fileURL('admin_css')) { $out .= "\n" . sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $url); } return sprintf($out, CommonModifiers::css_hex_to_rgb($couleur1), CommonModifiers::css_hex_to_rgb($couleur2), $admin_background); } protected function displayChampMembre($v, $config = null) { if (is_string($config)) { $config = Config::getInstance()->get('champs_membres')->get($config); } |
︙ | ︙ |
Modified src/include/lib/Garradin/UserTemplate/CommonModifiers.php from [a9fbcd8794] to [6fd1d69f86].
︙ | ︙ | |||
17 18 19 20 21 22 23 24 25 26 27 28 29 30 | 'date_short', 'date_long', 'date_hour', 'date', 'strftime', 'size_in_bytes' => [Utils::class, 'format_bytes'], 'typo', ]; const FUNCTIONS_LIST = [ 'pagination', ]; /** | > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | 'date_short', 'date_long', 'date_hour', 'date', 'strftime', 'size_in_bytes' => [Utils::class, 'format_bytes'], 'typo', 'css_hex_to_rgb', ]; const FUNCTIONS_LIST = [ 'pagination', ]; /** |
︙ | ︙ | |||
266 267 268 269 270 271 272 | if ($current < $total) { $out[] = ['id' => $current + 1, 'label' => 'Page suivante' . ' »', 'class' => 'next', 'accesskey' => 'z']; } return $out; } | | > > > > > > > > > > | 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 | if ($current < $total) { $out[] = ['id' => $current + 1, 'label' => 'Page suivante' . ' »', 'class' => 'next', 'accesskey' => 'z']; } return $out; } static public function css_hex_to_rgb($str): ?string { $hex = sscanf((string)$str, '#%02x%02x%02x'); if (empty($hex)) { return null; } return implode(', ', $hex); } } |
Modified src/www/skel-dist/_foot.html from [8e09fe42c0] to [051a09b414].
1 2 3 | </section> <footer class="main"> | > > | > > | 1 2 3 4 5 6 7 8 9 10 11 12 | </section> </main> <footer class="main"> Propulsé par <a href="https://garradin.eu/" target="_blank" id="garradin">Garradin</a> — logiciel libre de gestion associative </footer> <script type="text/javascript" src="{{$admin_url}}static/scripts/wiki_gallery.js"></script> </body> </html> |
Modified src/www/skel-dist/_head.html from [f9b2a89dba] to [51b4b6d103].
1 2 3 4 5 6 | <!DOCTYPE html> <html lang="fr"> <head> <meta charset="utf-8" /> <title>{{if $title}}{{$title}} — {{/if}}{{$config.nom_asso}}</title> <meta name="viewport" content="width=device-width, initial-scale=1.0, target-densitydpi=device-dpi" /> | > > > > > > | | > > | > > > > > | > > > | | > > > | | | | | | | | | | | > > < | | | | | | < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | <!DOCTYPE html> <html lang="fr"> <head> <meta charset="utf-8" /> <title>{{if $title}}{{$title}} — {{/if}}{{$config.nom_asso}}</title> <meta name="viewport" content="width=device-width, initial-scale=1.0, target-densitydpi=device-dpi" /> <style type="text/css"> :root { --first-color: {{if $config.couleur1}}{{$config.couleur1|css_hex_to_rgb}}{{else}}120, 120, 120{{/if}}; --second-color: {{if $config.couleur2}}{{$config.couleur2|css_hex_to_rgb}}{{else}}30, 30, 30{{/if}}; } </style> <link rel="stylesheet" type="text/css" href="{{$root_url}}default.css?2022" media="screen,projection,handheld" /> <link rel="stylesheet" type="text/css" href="{{$root_url}}content.css" media="all" /> <link rel="alternate" type="application/atom+xml" title="{{$config.nom_asso}}" href="{{$root_url}}atom.xml" /> <link rel="icon" type="image/png" href="{{$config.files.favicon}}" /> </head> <body> <header class="nav"> <nav> <ul> <li class="current"><a href="{{$root_url}}">Accueil</a></li> <li><a href="{{$admin_url}}">Connexion</a></li> </ul> </nav> </header> <main> <header class="main{{if $home}} home{{/if}}"> <h1> <a href="{{$root_url}}"> {{if $config.files.logo}} <img src="{{$config.files.logo}}&500px" alt="" class="logo" /> {{else}} <span>{{$config.nom_asso}}</span> {{/if}} </a> </h1> {{if ($config.adresse_asso || $config.telephone_asso || $config.email_asso)}} <article class="contacts"> {{if $config.files.logo}} <h3>{{$config.nom_asso}}</h3> {{/if}} {{if $config.adresse_asso}} <h4>{{$config.adresse_asso|escape|nl2br}}</h4> {{/if}} {{if $config.telephone_asso}} <h5>{{$config.telephone_asso|raw|protect_contact}}</h5> {{/if}} {{if $config.email_asso}} <h5>{{$config.email_asso|raw|protect_contact}}</h5> {{/if}} </article> {{/if}} </header> <nav class="main"> <form method="get" action="{{ $root_url }}search.html" class="search-widget"> <p> <input type="search" name="search" placeholder="Rechercher…" /> <input type="submit" value="»" /> </p> </form> <ul> {{#categories parent=null order="title"}} <li><a href="{{$url}}" {{if $url == $.url}}class="current"{{/if}}>{{ $title }}</a></li> {{/categories}} </ul> </nav> <section class="page"> |
Modified src/www/skel-dist/category.html from [21f3b64cc6] to [24fc3db0a3].
1 2 3 4 5 6 7 8 9 10 11 12 13 | {{:include file="_head.html" title=$page.title}} {{:include file="_breadcrumbs.html" parent=$page.path}} <section class="subcategories"> {{#categories parent=$page.path order="title"}} <ul> <li><a href="{{$url}}">{{$title}}</a></li> </ul> {{/categories}} </section> <article class="single"> | > > > < < > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | {{:include file="_head.html" title=$page.title}} {{:include file="_breadcrumbs.html" parent=$page.path}} <h1>{{$page.title}}</h1> <section class="subcategories"> {{#categories parent=$page.path order="title"}} <ul> <li><a href="{{$url}}">{{$title}}</a></li> </ul> {{/categories}} </section> {{if $page.content|trim}} <article class="single"> {{$page.html|raw}} {{:include file="gallery.html" parent=$page.path}} {{:include file="documents.html" parent=$page.path}} </article> {{/if}} <section class="articles"> {{#articles parent=$page.path order="published DESC" future=false}} <article> <h3><a href="{{$url}}">{{$title}}</a></h3> <h5>{{$published|date_long}}</h5> <p>{{$html|raw|strip_tags|truncate:200}}</p> </article> {{/articles}} </section> {{:include file="_foot.html"}} |
Modified src/www/skel-dist/default.css from [0334d88d82] to [47a972984d].
︙ | ︙ | |||
17 18 19 20 21 22 23 | article, aside, figure, footer, header, hgroup, menu, nav, section { display: block; } /* CORPS */ body { font-size: 100.01%; color: #000; font-family: "Trebuchet MS", Helvetica, Sans-serif; | | > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | article, aside, figure, footer, header, hgroup, menu, nav, section { display: block; } /* CORPS */ body { font-size: 100.01%; color: #000; font-family: "Trebuchet MS", Helvetica, Sans-serif; background: #eee; background: rgba(var(--first-color), 0.2); } /* DISPOSITION GÉNÉRALE DE LA PAGE */ main { max-width: 950px; margin: 0 auto; display: grid; grid-gap: 1em; grid-template-columns: 1.4fr 0.6fr; grid-template-areas: "header header" "content nav" } header.main { grid-area: header; display: grid; grid-gap: 1em; grid-template-columns: 1.4fr 0.6fr; } nav.main { grid-area: nav; } section.page { grid-area: content; } header.main h1, header.main .contacts, nav.main { background: #fff; padding: 1em; border-radius: .5em } header.main .contacts { border-top-left-radius: 0; border-top-right-radius: 0; } section.page article { margin-bottom: 1em; padding: 1em; background: #fff; clear: both; border-radius: .5em; } /* ENTÊTE AVEC LOGO ET CONTACTS */ header.main h1 { padding: 0; background: none; border-radius: 0; } header.main h1 a { display: flex; padding: 1rem; background: #fff; border-bottom-left-radius: .5rem; border-bottom-right-radius: .5rem; text-decoration: none; height: calc(100% - 2rem); align-items: center; justify-content: center; } header.main h1 a span { font-size: 3vw; font-weight: normal; color: rgb(var(--second-color)); display: block; } header.main h1 a:hover span { color: rgb(var(--first-color)); } header.main h1 a:hover img { opacity: 0.8; } header.main h1 a img { max-height: 200px; } header.main.home h1 a img { max-height: 300px; } header.main.home h1 a span { font-size: 5vw; } header.main .contacts { font-size: 1.3em; display: flex; justify-content: flex-end; flex-direction: column; } /* NAVIGATION EN HAUT DE LA PAGE */ header.nav { background: #ddd; background: rgba(var(--second-color), 0.2); border-bottom: 1px solid #999; border-top: .3em solid #666; text-align: center; padding-top: .3em; border-color: rgba(var(--first-color), 1); } header.nav li { display: inline-block; padding: .3em .5em; margin-bottom: -1px; } |
︙ | ︙ | |||
59 60 61 62 63 64 65 | border-top-right-radius: .3em; } header.nav li a:hover { color: #000; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | | | | < | > > > > > | | > > > > > | > | | > | > | > > > > > > > > > > > > > | | | > | > > > > > | | | | | 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | border-top-right-radius: .3em; } header.nav li a:hover { color: #000; } /* LISTE DES CATÉGORIES RACINES */ .subcategories { text-align: center; margin: 2em 0; } nav.main ul li, .subcategories li { font-size: 1.4em; margin: .8em 0; padding: 0; } nav.main ul li a, .subcategories li a { margin: 0; padding: .2em .5em; color: #006; text-decoration: underline; background: #ddd; background: rgba(var(--second-color), 0.2); border-radius: .5rem; } .subcategories li a { background: #fff; } nav.main ul li a:hover, .subcategories li a:hover { color: darkred; background: #eee; } /* Formulaire de recherche */ .search article p b { background: #ff9; padding: .2em 0; } .search-widget p { display: flex; flex-direction: row; align-items: center; margin-bottom: 1em; } .search-widget input { font-size: 1.2em; padding: .2em .5em; border: 1px solid #999; border-radius: .3rem; line-height: 1rem; max-width: 10em; } .search-widget input[type=submit] { margin-left: .5em; background: #999; color: #fff; cursor: pointer; } /* PIED DE PAGE */ footer.main { color: #666; margin: 1em; text-align: center; } footer.main a { text-decoration: none; font-weight: bold; color: #333; } footer.main a:hover { color: #006; text-decoration: underline; } footer.main a#garradin { padding-left: 20px; background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAGFBMVEX///+qjnmcTxWgYzWeWyiysrGzs7Ozs7MzVhJAAAAAB3RSTlMAGtv2e9p5oKuvKgAAAH1JREFUCNcdzLEOwjAMBNCrFDoXEGK3zA906RoifwBLmpVUSrMTpf59DNM9nU4HYNhjzJNlUaUPAzddN54NKU5uJsGoL4CYce9vA3mUJiLEHrURiRUoXQLRM6N2F4jrajcXm9YDJ+Xwx5AegX/Addn82eA4tah6QPwYNe75C+4yHrwP6fqUAAAAAElFTkSuQmCC") no-repeat left center; min-height: 16px; display: inline-block; } /* CHEMIN VERS L'ARTICLE (BREADCRUMBS), affiche les catégories parentes */ .breadcrumbs { margin-bottom: 1em; text-align: center; } .breadcrumbs ul { margin: 0; } .breadcrumbs ul li { display: inline-block; } .breadcrumbs ul li::before { content: "»"; color: #999; margin: .5em; } .breadcrumbs ul li:nth-child(1)::before { display: none; } .breadcrumbs a { color: #666; } /* MESSAGES ALERTE ET ERREUR (par exemple : page non trouvée) */ .error { border-bottom: .2em solid #c00; border-radius: .5em; |
︙ | ︙ | |||
192 193 194 195 196 197 198 | padding: .5em; margin-bottom: 1em; font-size: 1.2em; color: #990; } /* AFFICHAGE D'UN ARTICLE */ | < < < < < < < | 287 288 289 290 291 292 293 294 295 296 297 298 299 300 | padding: .5em; margin-bottom: 1em; font-size: 1.2em; color: #990; } /* AFFICHAGE D'UN ARTICLE */ section.articles article h3, section.articles article h1 { margin-bottom: .3em; } section.articles article h1 a { color: #000; text-decoration: none; |
︙ | ︙ | |||
225 226 227 228 229 230 231 | section.articles article h5 { color: #666; font-weight: normal; font-size: .8em; margin-bottom: .3em; } | | > > > > > > > | 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 | section.articles article h5 { color: #666; font-weight: normal; font-size: .8em; margin-bottom: .3em; } section.page > h1 { text-align: center; margin-bottom: 1em; } /* CONTENU DE L'ARTICLE */ article > h4 { margin-bottom: 1em; color: #666; font-weight: normal; } article ul, article ol, article blockquote { margin-left: 2em; } article ul { list-style-type: disc; } |
︙ | ︙ | |||
314 315 316 317 318 319 320 | box-shadow: 0px 0px 5px 2px orange; } fieldset dl dd { margin: .5em 1em; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < > > > > | > > | < < | > | > | | | | > > | > | > > > > > | > > | > > > > > > > | > > | > > > > > | | | < < | 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 | box-shadow: 0px 0px 5px 2px orange; } fieldset dl dd { margin: .5em 1em; } /* Modifications du style pour les petits écrans */ @media handheld, screen and (max-width: 980px) { body { padding: 0; } main, header.main { display: block; } header.nav { font-size: .9em; margin: 0; } header.main h1 a, header.main .contacts { border-radius: 0; margin: .2em 0; padding: 0; } header.main { background: #fff; padding: 1em; } header.main .contacts * { text-align: center; font-size: .8em; } header.main h1 a img { max-height: 100px; max-width: 100%; } header.main.home h1 a img { max-height: 300px; } .search-widget p { display: block; text-align: center; } .search-widget input { font-size: 1em; } nav.main ul, .subcategories { text-align: center; } nav.main ul li, .subcategories li { font-size: 1.2em; display: inline-block; margin: .3em; } nav.main ul li a, .subcategories li a { background: #fff; } .breadcrumbs { display: none; } nav.main { font-size: 1em; background: none; } section.page article { border-radius: 0; } section.page h1 { font-size: 1.5em; } section.page h2 { font-size: 1.3em; } section.page h3 { font-size: 1.2em; } section.page h4 { font-size: 1em; } section.page h5 { font-size: .9em; } section.page h6 { font-size: .8em; } footer.main { font-size: .8em; } } |
Modified src/www/skel-dist/gallery.html from [3e079fae32] to [29b010ae23].
1 2 3 4 5 6 7 | <section class="gallery"> {{#images order="name" parent=$parent except_in_text=true}} <figure> <a href="{{$url}}" class="internal-image"><img src="{{$thumb_url}}" alt="{{$name}}" /></a> </figure> {{/images}} </section> | < < | 1 2 3 4 5 6 7 | <section class="gallery"> {{#images order="name" parent=$parent except_in_text=true}} <figure> <a href="{{$url}}" class="internal-image"><img src="{{$thumb_url}}" alt="{{$name}}" /></a> </figure> {{/images}} </section> |
Modified src/www/skel-dist/index.html from [64144e4af6] to [4fbfd506fe].
|
| | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | {{:include file="_head.html" home=true}} {{#articles order="published DESC" future=false limit=1}} <section class="articles main"> <article> <h1><a href="{{ $url }}">{{ $title }}</a></h1> <h5>{{ $published|relative_date }}</h5> <p>{{ $html|raw }}</p> </article> </section> {{/articles}} {{#articles order="published DESC" future=false begin=1 limit=9}} <section class="articles"> <article> <h3><a href="{{ $url }}">{{ $title }}</a></h3> <h5>{{ $published|relative_date }}</h5> <p>{{ $html|raw|strip_tags|truncate:200 }}</p> </article> </section> {{/articles}} {{:include file="_foot.html"}} |