Skip to content

Commit

Permalink
Fixed issue #19025: When there are question themes installed, can't u…
Browse files Browse the repository at this point in the history
…pload survey themes (#3358)

Co-authored-by: lapiudevgit <devgit@lapiu.biz>
  • Loading branch information
gabrieljenik and lapiudevgit committed Sep 19, 2023
1 parent d11e0cb commit 11051a9
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 24 deletions.
44 changes: 23 additions & 21 deletions application/views/themeOptions/availablethemelist.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,31 @@
<div id="templates_no_db" >
<table class="items table table-hover">
<thead>
<tr>
<th><?php eT('Preview'); ?></th>
<th><?php eT('Folder'); ?></th>
<th><?php eT('Description'); ?></th>
<th><?php eT('Type'); ?></th>
<th><?php eT('Extends'); ?></th>
<th></th>
</tr>
<tr>
<th><?php eT('Preview'); ?></th>
<th><?php eT('Folder'); ?></th>
<th><?php eT('Description'); ?></th>
<th><?php eT('Type'); ?></th>
<th><?php eT('Extends'); ?></th>
<th></th>
</tr>
</thead>

<tbody>
<?php foreach ($aQuestionThemes['available_themes'] as $oTheme): ?>
<tr class="odd">
<td class="col-lg-1">preview</td>
<td class="col-lg-2"><?php echo $oTheme->name; ?></td>
<td class="col-lg-3"><?php echo $oTheme->description; ?></td>
<td class="col-lg-2"><?php eT('XML themes'); ?></td>
<td class="col-lg-2"><?php echo $oTheme->extends; ?></td>
<td class="col-lg-1"><?php echo $oTheme->manifestbuttons; ?></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
<tbody>
<?php foreach ($aQuestionThemes['available_themes'] as $oTheme): ?>
<tr class="odd">
<td class="col-lg-1">preview</td>
<td class="col-lg-2"><?php echo $oTheme->name; ?></td>
<td class="col-lg-3"><?php echo $oTheme->description; ?></td>
<td class="col-lg-2"><?php eT('XML themes'); ?></td>
<td class="col-lg-2"><?php echo $oTheme->extends; ?></td>
<td class="col-lg-1"><?php echo $oTheme->manifestbuttons; ?></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
</div>
</div>
<?php endif; ?>

Expand Down
7 changes: 4 additions & 3 deletions application/views/themeOptions/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,10 @@ class="btn btn-outline-secondary btn-sm">
<div class="col-12 list-surveys">
<?php echo '<h3>' . gT('Question themes:') . '</h3>'; ?>
<!-- Installed Question Themes -->
<?php $this->renderPartial('./installedthemelist', array('oQuestionTheme' => $oQuestionTheme, 'pageSize' => $pageSize)); ?>
<!-- Available Quesiton Themes and broken question themes-->
<?php $this->renderPartial('./availablethemelist', array('oQuestionTheme' => $oQuestionTheme, 'pageSize' => $pageSize)); ?>
<?php $this->renderPartial('./installedthemelist', array('oQuestionTheme' => $oQuestionTheme, 'pageSize' => $pageSize)); ?>
<!-- Available Quesiton Themes and broken question themes-->
<?php $this->renderPartial('./availablethemelist', array('oQuestionTheme' => $oQuestionTheme, 'pageSize' => $pageSize)); ?>
</div>
</div>
</div>
</div>
Expand Down

0 comments on commit 11051a9

Please sign in to comment.