Skip to content

Commit 7f70909

Browse files
author
Julia Koblitz
authored
Merge pull request #26 from JKoblitz/dev
v1.3.5
2 parents 2f05e94 + b566b48 commit 7f70909

File tree

179 files changed

+97010
-13380
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+97010
-13380
lines changed

.DS_Store

0 Bytes
Binary file not shown.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ jobs/config.ini
1515
composer.lock
1616
upload.sh
1717
.DS_Store
18+
upload.sh

211e00c18dc7-5-services_extra_5.png

227 KB
Loading

addons/guestforms/form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
</div>
198198

199199
</div>
200-
<button type="submit" class="btn primary">
200+
<button type="submit" class="btn secondary">
201201
<i class="ph ph-user-plus"></i>
202202
<?php if (empty($form)){
203203
echo lang('Save guest', 'Gast anlegen');

addons/guestforms/view.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<br />
8080
<!-- dropdown -->
8181
<div class="dropdown">
82-
<button class="btn primary small dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
82+
<button class="btn secondary small dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
8383
<i class="ph ph-calendar-plus"></i> <?= lang('Prolong', 'Verlängern') ?>
8484
</button>
8585
<div class="dropdown-menu p-10" aria-labelledby="dropdownMenuButton">
@@ -88,7 +88,7 @@
8888
<label for="end"><?=lang('End date', 'Neues End-Datum')?></label>
8989
<input type="date" class="form-control" name="values[end]" id="date_end" value="<?= valueFromDateArray($form['end'] ?? null) ?>" required>
9090
</div>
91-
<button class="btn primary small" type="submit">
91+
<button class="btn secondary small" type="submit">
9292
<i class="ph ph-calendar-plus"></i> <?= lang('Prolong', 'Verlängern') ?>
9393
</button>
9494
</form>
@@ -327,7 +327,7 @@
327327
<?php } ?>
328328
</select>
329329
</div>
330-
<button type="submit" class="btn primary"><?= lang('Connect', 'Verknüpfen') ?></button>
330+
<button type="submit" class="btn secondary"><?= lang('Connect', 'Verknüpfen') ?></button>
331331
</form>
332332
</div>
333333
</div>
@@ -368,7 +368,7 @@
368368

369369

370370
<?php if ($Settings->hasPermission('guests.edit.documents')) { ?>
371-
<a class="btn primary" href="#connect-user">Nutzer verknüpfen</a>
371+
<a class="btn secondary" href="#connect-user">Nutzer verknüpfen</a>
372372
<?php } ?>
373373
</div>
374374
</div>
@@ -395,7 +395,7 @@
395395
<label for="file-input"><?= lang('Append a file', 'Hänge eine Datei an') ?></label>
396396
<br><small class="text-danger">Max. 16 MB.</small>
397397
</div>
398-
<button class="btn primary">
398+
<button class="btn secondary">
399399
<i class="ph ph-upload"></i>
400400
Upload
401401
</button>
@@ -452,7 +452,7 @@
452452

453453

454454
<?php if ($Settings->hasPermission('guests.edit.documents')) { ?>
455-
<a class="btn primary" href="#upload-document">Dokument hochladen</a>
455+
<a class="btn secondary" href="#upload-document">Dokument hochladen</a>
456456
<?php } ?>
457457
</div>
458458
</div>
@@ -493,7 +493,7 @@
493493
</label>
494494
<input type="date" class="form-control" id="registered" name="values[chip][end]" autocomplete="off" value="<?= $chip['end'] ?? '' ?>">
495495
</div>
496-
<button type="submit" class="btn primary"><?= lang('Register', 'Registrieren') ?></button>
496+
<button type="submit" class="btn secondary"><?= lang('Register', 'Registrieren') ?></button>
497497
</form>
498498
</div>
499499
</div>
@@ -523,7 +523,7 @@
523523
</p>
524524
<?php } ?>
525525

526-
<a class="btn primary" href="#chip-registration">Chip hinterlegen</a>
526+
<a class="btn secondary" href="#chip-registration">Chip hinterlegen</a>
527527

528528
</div>
529529
</div>

addons/ida/pages/ida-login.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
<input class="form-control" id="password" type="password" name="password" placeholder="your windows password" required />
1414
</div>
1515

16-
<input class="btn primary" type="submit" name="submit" value="<?= lang("Log-in", 'Einloggen') ?>" />
16+
<input class="btn secondary" type="submit" name="submit" value="<?= lang("Log-in", 'Einloggen') ?>" />
1717
</form>

addons/portal/activities.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
* Page to see all activities
55
*
66
* This file is part of the OSIRIS package.
7-
* Copyright (c) 2024, Julia Koblitz
7+
* Copyright (c) 2024 Julia Koblitz, OSIRIS Solutions GmbH
88
*
99
* @link /activities
1010
* @link /my-activities
1111
*
1212
* @package OSIRIS
1313
* @since 1.0
1414
*
15-
* @copyright Copyright (c) 2024, Julia Koblitz
16-
* @author Julia Koblitz <julia.koblitz@dsmz.de>
15+
* @copyright Copyright (c) 2024 Julia Koblitz, OSIRIS Solutions GmbH
16+
* @author Julia Koblitz <julia.koblitz@osiris-solutions.de>
1717
* @license MIT
1818
*/
1919

0 commit comments

Comments
 (0)