Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Martin Konecny 2012-08-01 15:37:58 -04:00
parent b9bb87f69d bcab41cb86
commit 2ef4fd314c
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
View File

@ -93,7 +93,7 @@
<?php } elseif ($this->blType == "Dynamic") { ?> <?php } elseif ($this->blType == "Dynamic") { ?>
<div><span>Dynamic Playlist Criteria: </span></div> <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 ($this->contents["crit"] as $criterias) : ?>
<?php foreach ($criterias as $crit ) : ?> <?php foreach ($criterias as $crit ) : ?>
<?php <?php
@ -111,11 +111,11 @@
<?php } ?> <?php } ?>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
<?php endforeach; ?>
<tr> <tr>
<td>Limit to </td> <td>Limit to </td>
<td><?php echo $this->contents["limit"]["value"] ?> <?php echo $this->contents["limit"]["modifier"] ?></td> <td><?php echo $this->contents["limit"]["value"] ?> <?php echo $this->contents["limit"]["modifier"] ?></td>
</tr> </tr>
<?php endforeach; ?>
</table> </table>
<?php } ?> <?php } ?>
<?php endif; ?> <?php endif; ?>

8
airtime_mvc/application/views/scripts/user/add-user.phtml
View File

@ -6,7 +6,7 @@
<div class="button-holder"> <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"> <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-icon ui-icon-plusthick"></span>
<span class="ui-button-text">New User</span> <span class="ui-button-text">New&nbsp;User</span>
</button> </button>
</div> </div>
@ -15,9 +15,9 @@
<tr> <tr>
<th>id</th> <th>id</th>
<th>Username</th> <th>Username</th>
<th>First Name</th> <th>First&nbsp;Name</th>
<th>Last Name</th> <th>Last&nbsp;Name</th>
<th>User Type</th> <th>User&nbsp;Type</th>
<th>&nbsp;</th> <th>&nbsp;</th>
</tr> </tr>
</thead> </thead>

4
airtime_mvc/public/css/styles.css
View File

@ -434,10 +434,6 @@ table.library-get-file-md{
width:350px; width:350px;
} }
table.library-get-file-md.table-small{
width:290px !important;
}
.file-md-qtip-criteria-width-small{ .file-md-qtip-criteria-width-small{
width:80px; width:80px;
} }