Author: benj
Date: Thu Jan 12 14:05:36 2017
New Revision: 1774
URL: http://svn.gna.org/viewcvs/gdtc?rev=1774&view=rev
Log:
Bootstrapify more
Modified:
trunk/gdtc/templates/smarty/admin/display_contacts.tpl
trunk/gdtc/templates/smarty/admin/display_modifs.tpl
trunk/gdtc/templates/smarty/admin/header.tpl
trunk/gdtc/templates/smarty/admin/list.tpl
trunk/gdtc/templates/smarty/login.tpl
Modified: trunk/gdtc/templates/smarty/admin/display_contacts.tpl
URL:
http://svn.gna.org/viewcvs/gdtc/trunk/gdtc/templates/smarty/admin/display_contacts.tpl?rev=1774&r1=1773&r2=1774&view=diff
==============================================================================
--- trunk/gdtc/templates/smarty/admin/display_contacts.tpl (original)
+++ trunk/gdtc/templates/smarty/admin/display_contacts.tpl Thu Jan 12
14:05:36 2017
@@ -1,21 +1,46 @@
<div class="btn-group btn-toolbar" role="toolbar"
data-toggle="buttons-checkbox">
- <button type="button" class="btn btn-default"
+ <button type="button" class="btn btn-default active"
id="only-mails"
data-toggle="tooltip"
- title="Voir les courriels">
+ title="Voir/cacher les courriels">
<span class="fa fa-envelope"></span>
</button>
- <button type="button" class="btn btn-default"
+ <button type="button" class="btn btn-default active"
id="only-phone"
data-toggle="tooltip"
- title="Voir les appels téléphoniques">
+ title="Voir/cacher les appels téléphoniques">
<span class="fa fa-phone"></span>
</button>
- <button type="button" class="btn btn-default" id="only-irl"
type="checkbox"><span class="fa fa-comments"></span></button>
- <button type="button" class="btn btn-default" id="only-bounce"
type="checkbox"><span class="fa fa-chain-broken"></span></button>
- <button type="button" class="btn btn-default" id="only-reminders"
type="checkbox"><span class="fa fa-bell"></span></button>
- <button type="button" class="btn btn-default" id="only-past-due"
type="checkbox"><span class="fa fa-exclamation-triangle"></span></button>
- <button type="button" class="btn btn-default" id="only-other"
type="checkbox"><span class="fa fa-question-circle"></span></button>
+ <button type="button" class="btn btn-default active"
+ id="only-irl"
+ data-toggle="tooltip"
+ title="Voir/cacher les appels contacts physiques">
+ <span class="fa fa-comments"></span>
+ </button>
+ <button type="button" class="btn btn-default active"
+ id="only-bounce"
+ data-toggle="tooltip"
+ title="Voir/cacher les bounces">
+ <span class="fa fa-chain-broken"></span>
+ </button>
+ <button type="button" class="btn btn-default active"
+ id="only-reminder"
+ data-toggle="tooltip"
+ title="Voir/cacher les rappels">
+ <span class="fa fa-bell"></span>
+ </button>
+ <button type="button" class="btn btn-default active"
+ id="only-past-due"
+ data-toggle="tooltip"
+ title="Voir/cacher les retards">
+ <span class="fa fa-exclamation-triangle"></span>
+ </button>
+ <button type="button" class="btn btn-default active"
+ id="only-other"
+ data-toggle="tooltip"
+ title="Voir/cacher le reste">
+ <span class="fa fa-question-circle"></span>
+ </button>
</div>
<div class="btn-group btn-toolbar" role="toolbar">
@@ -42,7 +67,19 @@
{if $additional.contacts[contact].contact_type == 'mail' &&
$additional.contacts[contact].mailing_id != 0 &&
$additional.contacts[contact].acked == 0}
<img alt="{$additional.contacts[contact].contact_type}"
src="{$dtc_admin_host_name}/dtcimages/mailing-programmed.png">
{else}
- <img alt="{$additional.contacts[contact].contact_type}"
src="{$dtc_admin_host_name}/dtcimages/{$additional.contacts[contact].contact_type}.png">
+{if $additional.contacts[contact].contact_type == 'irl'}
+<span class=" fa fa-comments"></span>
+{else if $additional.contacts[contact].contact_type == 'bounce'}
+<span class=" fa fa-chain-broken"></span>
+{else if $additional.contacts[contact].contact_type == 'reminder'}
+<span class=" fa fa-chain-bell"></span>
+{else if $additional.contacts[contact].contact_type == 'past_due'}
+<span class=" fa fa-exclamation-triangle"></span>
+{else if $additional.contacts[contact].contact_type == 'phone'}
+<span class=" fa fa-phone"></span>
+{else if $additional.contacts[contact].contact_type == 'mail'}
+<span class=" fa fa-envelope"></span>
+{/if}
{/if}
</td>
<td>{$additional.contacts[contact].contact_date|date_format:"%d/%m/%y - %Hh%M"}</td>
@@ -76,12 +113,12 @@
<script>
function hidecontacts (stuff) { $('.contact-'+stuff).hide(); return true; }
function showcontacts (stuff) { $('.contact-'+stuff).show(); return true; }
- $('input#only-mails').click ( function () { if ( $(this).is(":checked") )
{ showcontacts ('mail') } else { hidecontacts ('mail') } } );
- $('input#only-reminders').click ( function () { if (
$(this).is(":checked") ) { showcontacts ('reminder') } else { hidecontacts
('reminder') } } );
- $('input#only-irl').click ( function () { if ( $(this).is(":checked") ) {
showcontacts ('irl') } else { hidecontacts ('irl') } } );
- $('input#only-other').click ( function () { if ( $(this).is(":checked") )
{ showcontacts ('other') } else { hidecontacts ('other') } } );
- $('input#only-past-due').click ( function () { if ( $(this).is(":checked")
) { showcontacts ('past_due') } else { hidecontacts ('past_due') } } );
- $('input#only-phone').click ( function () { if ( $(this).is(":checked") )
{ showcontacts ('phone') } else { hidecontacts ('phone') } } );
- $('input#only-bounce').click ( function () { if ( $(this).is(":checked") )
{ showcontacts ('bounce') } else { hidecontacts ('bounce') } } );
+ $('button#only-mails').click ( function () { if ( ! $(this).is('.active')
) { showcontacts ('mail') } else { hidecontacts ('mail') } } );
+ $('button#only-reminder').click ( function () { if ( !
$(this).is('.active') ) { showcontacts ('reminder') } else { hidecontacts
('reminder') } } );
+ $('button#only-irl').click ( function () { if ( ! $(this).is('.active') )
{ showcontacts ('irl') } else { hidecontacts ('irl') } } );
+ $('button#only-other').click ( function () { if ( ! $(this).is('.active')
) { showcontacts ('other') } else { hidecontacts ('other') } } );
+ $('button#only-past-due').click ( function () { if ( !
$(this).is('.active') ) { showcontacts ('past_due') } else { hidecontacts
('past_due') } } );
+ $('button#only-phone').click ( function () { if ( ! $(this).is('.active')
) { showcontacts ('phone') } else { hidecontacts ('phone') } } );
+ $('button#only-bounce').click ( function () { if ( ! $(this).is('.active')
) { showcontacts ('bounce') } else { hidecontacts ('bounce') } } );
</script>
{/literal}
Modified: trunk/gdtc/templates/smarty/admin/display_modifs.tpl
URL:
http://svn.gna.org/viewcvs/gdtc/trunk/gdtc/templates/smarty/admin/display_modifs.tpl?rev=1774&r1=1773&r2=1774&view=diff
==============================================================================
--- trunk/gdtc/templates/smarty/admin/display_modifs.tpl (original)
+++ trunk/gdtc/templates/smarty/admin/display_modifs.tpl Thu Jan 12
14:05:36 2017
@@ -1,6 +1,6 @@
{section name=modif loop=$additional.modifications}
{if $smarty.section.modif.first}
- <table class="table table-striped table-condensed table-hover">
+ <table width="100%" class="table table-striped table-condensed
table-hover">
<thead>
<tr>
<th></th>
@@ -30,7 +30,7 @@
<td>{$additional.modifications[modif].table_name}</td>
<td>{$additional.modifications[modif].type_modification}</td>
{if $additional.modifications[modif].type_modification == 'changed'}
- <td>{if
$link}{$additional.modifications[modif].table_name}/{/if}{$additional.modifications[modif].field_name}</td>
+ <td>{$additional.modifications[modif].field_name}</td>
<td align="right">{$additional.modifications[modif].old_value}</td>
<td><i class="fa fa-arrow-right"></i></td>
<td>{$additional.modifications[modif].new_value}{if
$additional.modifications[modif].comment}<br/><em>({$additional.modifications[modif].comment})</em>{/if}</td>
Modified: trunk/gdtc/templates/smarty/admin/header.tpl
URL:
http://svn.gna.org/viewcvs/gdtc/trunk/gdtc/templates/smarty/admin/header.tpl?rev=1774&r1=1773&r2=1774&view=diff
==============================================================================
--- trunk/gdtc/templates/smarty/admin/header.tpl (original)
+++ trunk/gdtc/templates/smarty/admin/header.tpl Thu Jan 12 14:05:36 2017
@@ -58,6 +58,7 @@
<!-- Navbar Right Menu -->
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
+<!--
<li class="dropdown tasks-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-fw fa-bell-o"></i>
@@ -66,25 +67,24 @@
<ul class="dropdown-menu">
<li class="header">Il y a <b>42</b> incohérences</li>
<li>
- <!-- inner menu: contains the actual data -->
<ul class="menu">
- <li><!-- Task item -->
+ <li>
<a href="#">
<small class="pull-right badge alert-danger">21</small>
Date de fin != date de renouvellement
</a>
</li>
- <li><!-- Task item -->
+ <li>
<a href="#">
<small class="pull-right badge alert-danger">12</small>
Montant de cotisation incorrect
</a>
</li>
- <!-- end task item -->
</ul>
</li>
</ul>
</li>
+-->
<!-- User Account Menu -->
<li class="dropdown user-menu">
Modified: trunk/gdtc/templates/smarty/admin/list.tpl
URL:
http://svn.gna.org/viewcvs/gdtc/trunk/gdtc/templates/smarty/admin/list.tpl?rev=1774&r1=1773&r2=1774&view=diff
==============================================================================
--- trunk/gdtc/templates/smarty/admin/list.tpl (original)
+++ trunk/gdtc/templates/smarty/admin/list.tpl Thu Jan 12 14:05:36 2017
@@ -27,7 +27,7 @@
'<a
href="?action=edit&table={$list_data[i].actor_type}&id={$list_data[i].actor_id}"><img
src="/dtcphotos/{$list_data[i].photo_file}" height="24"
style="max-width:48px;"/></a>'
{else}
'<a
href="?action=edit&table={$list_data[i].actor_type}&id={$list_data[i].actor_id}"><img
src="/dtcimages/{$list_data[i].actor_type}.png" height="24"
style="max-width:48px;"/></a>'
-{/if}, '<a
href="?action=edit&table={$list_data[i].actor_type}&id={$list_data[i].actor_id}">{$list_data[i].name|escape:'quotes'}</a>',
'{$list_data[i].firstname|escape:'quotes'}',
'{$list_data[i].email|escape:'quotes'}',
'{$list_data[i].m_start_date|date_format:"%d/%m/%Y"}',
'{$list_data[i].m_renewal_date|date_format:"%d/%m/%Y"}'
+{/if}, '<a
href="?action=edit&table={$list_data[i].actor_type}&id={$list_data[i].actor_id}">{$list_data[i].name|escape:'quotes'}</a>',
{if $list_data[i].actor_type=='entity'}'<a
href="?action=edit&table={$list_data[i].actor_type}&id={$list_data[i].actor_id}">{$list_data[i].name|escape:'quotes'}</a>'{else}'{$list_data[i].firstname|escape:'quotes'}'{/if},
'{$list_data[i].email|escape:'quotes'}',
'{$list_data[i].m_start_date|date_format:"%d/%m/%Y"}',
'{$list_data[i].m_renewal_date|date_format:"%d/%m/%Y"}'
{section name=af loop=$additional.added_fields}
{assign var=f value=$additional.added_fields[af].field}
,{if
$additional.added_fields[af].field}'{$list_data[i].$f|escape:'quotes'}'{/if}
@@ -61,7 +61,7 @@
{assign var=f value=$additional.added_fields[af].field}
{if $additional.added_fields[af].field}{literal}{{/literal} "sTitle":
"{$f|ucfirst|escape:'quotes'}"},{/if}
{/section}
-] } );
+] } ).fnFakeRowspan({},-1);
{literal}
jQuery.extend( jQuery.fn.dataTableExt.oSort, {
Modified: trunk/gdtc/templates/smarty/login.tpl
URL:
http://svn.gna.org/viewcvs/gdtc/trunk/gdtc/templates/smarty/login.tpl?rev=1774&r1=1773&r2=1774&view=diff
==============================================================================
--- trunk/gdtc/templates/smarty/login.tpl (original)
+++ trunk/gdtc/templates/smarty/login.tpl Thu Jan 12 14:05:36 2017
@@ -82,7 +82,7 @@
<div class="row">
<div class="center-block">
<img class="profile-img"
-
src="https://farm6.staticflickr.com/5442/9087583533_3cd0178571_q.jpg"; alt="">
+ src="{if
$nickname}{$dtc_base_url}/dtcphotos/{$nickname}.png{else}{$dtc_base_url}/dtcimages/no_photo-male.png{/if}"
alt="">
</div>
</div>
<div class="row">
_______________________________________________
Gdtc-commits mailing list
[email protected]
https://mail.gna.org/listinfo/gdtc-commits
![https://farm6.staticflickr.com/5442/9087583533_3cd0178571_q.jpg"](https://farm6.staticflickr.com/5442/9087583533_3cd0178571_q.jpg"){kind=link}