Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
This commit is contained in:
commit
2ef4fd314c
|
@ -93,7 +93,7 @@
|
|||
|
||||
<?php } elseif ($this->blType == "Dynamic") { ?>
|
||||
<div><span>Dynamic Playlist Criteria: </span></div>
|
||||
<table class='library-get-file-md table-small'>
|
||||
<table class='library-get-file-md'>
|
||||
<?php foreach ($this->contents["crit"] as $criterias) : ?>
|
||||
<?php foreach ($criterias as $crit ) : ?>
|
||||
<?php
|
||||
|
@ -111,11 +111,11 @@
|
|||
<?php } ?>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
<?php endforeach; ?>
|
||||
<tr>
|
||||
<td>Limit to </td>
|
||||
<td><?php echo $this->contents["limit"]["value"] ?> <?php echo $this->contents["limit"]["modifier"] ?></td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
</table>
|
||||
<?php } ?>
|
||||
<?php endif; ?>
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<div class="button-holder">
|
||||
<button type="button" id="add_user_button" name="search_add_group" class="ui-button ui-widget ui-state-default ui-button-text-icon-primary">
|
||||
<span class="ui-icon ui-icon-plusthick"></span>
|
||||
<span class="ui-button-text">New User</span>
|
||||
<span class="ui-button-text">New User</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
|
@ -15,9 +15,9 @@
|
|||
<tr>
|
||||
<th>id</th>
|
||||
<th>Username</th>
|
||||
<th>First Name</th>
|
||||
<th>Last Name</th>
|
||||
<th>User Type</th>
|
||||
<th>First Name</th>
|
||||
<th>Last Name</th>
|
||||
<th>User Type</th>
|
||||
<th> </th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
|
@ -434,10 +434,6 @@ table.library-get-file-md{
|
|||
width:350px;
|
||||
}
|
||||
|
||||
table.library-get-file-md.table-small{
|
||||
width:290px !important;
|
||||
}
|
||||
|
||||
.file-md-qtip-criteria-width-small{
|
||||
width:80px;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue