Skip to content

Commit

Permalink
Fix issue with meeting pop up and potential other issues
Browse files Browse the repository at this point in the history
  • Loading branch information
barryo committed Aug 15, 2012
1 parent 1f8c5f4 commit 280a39b
Show file tree
Hide file tree
Showing 18 changed files with 47 additions and 47 deletions.
2 changes: 1 addition & 1 deletion application/views/customer/leagueTable.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -274,4 +274,4 @@ $(document).ready(function() {ldelim}



{tmplinclude file="footer.tpl"}
{include file="footer.tpl"}
6 changes: 3 additions & 3 deletions application/views/customer/ninety-fifth.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{tmplinclude file="header.tpl"}
{include file="header.tpl"}

<!-- <div class="yui-g" style="height: 600px"> -->

Expand All @@ -11,7 +11,7 @@
</table>


{tmplinclude file="message.tpl"}
{include file="message.tpl"}

<div class="content">

Expand Down Expand Up @@ -199,4 +199,4 @@ $(document).ready(function() {ldelim}



{tmplinclude file="footer.tpl"}
{include file="footer.tpl"}
6 changes: 3 additions & 3 deletions application/views/customer/statistics-by-lan.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{tmplinclude file="header.tpl"}
{include file="header.tpl"}

<!-- <div class="yui-g" style="height: 600px"> -->

Expand All @@ -16,7 +16,7 @@
</table>


{tmplinclude file="message.tpl"}
{include file="message.tpl"}

<div class="content">

Expand Down Expand Up @@ -102,4 +102,4 @@

</table>

{tmplinclude file="footer.tpl"}
{include file="footer.tpl"}
2 changes: 1 addition & 1 deletion application/views/dashboard/index.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{include file="message.tpl"}
{if $meeting neq false}
{tmplinclude file="dashboard/popups/meeting.tpl"}
{include file="dashboard/popups/meeting.tpl"}
{/if}
<div id='ajaxMessage'></div>

Expand Down
8 changes: 4 additions & 4 deletions application/views/dashboard/popups/meeting.tpl
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@

<div id="dialog-meeting" title="INEX Members' Meeting" style="display: none;">
<p>
The next INEX members' meeting is scheduled for {$meeting.date|date_format}.
Please <a href="{genUrl controller='meeting' action='read'}">click here</a>
The next INEX members' meeting is scheduled for {$meeting.date|date_format}.
Please <a href="{genUrl controller='meeting' action='read'}">click here</a>
for details or let us know if you can make it by choosing an option below.
</p>
</div>

<div id="dialog-meeting-skip" title="INEX Members' Meeting" style="display: none;">
<p>
We will not ask you to RSVP for this meeting again. However, you can always do
this later via the menu option <em>Member Information -> Meetings</em>.
We will not ask you to RSVP for this meeting again. However, you can always do
this later via the menu option <em>Member Information -> Meetings</em>.
</p>
</div>

Expand Down
6 changes: 3 additions & 3 deletions application/views/dashboard/sec-event-email-config.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{tmplinclude file="header.tpl" pageTitle="IXP Manager :: SEC Event Notification Config"}
{include file="header.tpl" pageTitle="IXP Manager :: SEC Event Notification Config"}

<div class="yui-g">

Expand All @@ -12,7 +12,7 @@
</tr>
</table>

{tmplinclude file="message.tpl"}
{include file="message.tpl"}

<div id='ajaxMessage'></div>

Expand Down Expand Up @@ -94,5 +94,5 @@ at your earliest convenience.
</div>
</div>

{tmplinclude file="footer.tpl"}
{include file="footer.tpl"}

4 changes: 2 additions & 2 deletions application/views/frontend/view.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{/if}

{if $perspective neq 'panel'}
{tmplinclude file="header.tpl"}
{include file="header.tpl"}

<table class="adminheading" border="0">
<tr>
Expand Down Expand Up @@ -81,5 +81,5 @@
</div>

{if $perspective neq 'panel'}
{tmplinclude file="footer.tpl"}
{include file="footer.tpl"}
{/if}
6 changes: 3 additions & 3 deletions application/views/index/controller-disabled.tpl
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{tmplinclude file="header.tpl"}
{include file="header.tpl"}

<div class="content">

<h1>Controller Disabled</h1>

{tmplinclude file="message.tpl"}
{include file="message.tpl"}

<p>
The administrators have disabled the requested controller.
</p>

</div>

{tmplinclude file="footer.tpl"}
{include file="footer.tpl"}
6 changes: 3 additions & 3 deletions application/views/index/index.tpl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{tmplinclude file="header.tpl" pageTitle="IXP Manager"}
{include file="header.tpl" pageTitle="IXP Manager"}

<div class="yui-g" style="height: 600px">

{tmplinclude file="message.tpl"}
{include file="message.tpl"}

<h1>Welcome to the INEX IXP Manager</h1>

Expand All @@ -24,4 +24,4 @@ Pellentesque euismod consequat odio, quis hendrerit libero sodales condimentum.

</div>

{tmplinclude file="footer.tpl"}
{include file="footer.tpl"}
4 changes: 2 additions & 2 deletions application/views/logical-circuit/addEdit.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{tmplinclude file="header.tpl"}
{include file="header.tpl"}


<table class="adminheading" border="0">
Expand All @@ -15,5 +15,5 @@

</div>

{tmplinclude file="footer.tpl"}
{include file="footer.tpl"}

6 changes: 3 additions & 3 deletions application/views/meeting/compose.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{tmplinclude file="header.tpl" pageTitle="IXP Manager :: Member Dashboard"}
{include file="header.tpl" pageTitle="IXP Manager :: Member Dashboard"}

<div class="yui-g" style="margin-bottom: 70px;">

Expand All @@ -8,7 +8,7 @@
</tr>
</table>

{tmplinclude file="message.tpl"}
{include file="message.tpl"}

<div class="content">

Expand Down Expand Up @@ -109,4 +109,4 @@ When you're happy with the result, you can send it to <code>members@inex.ie</cod
</div>


{tmplinclude file="footer.tpl"}
{include file="footer.tpl"}
2 changes: 1 addition & 1 deletion application/views/meeting/simple.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -130,5 +130,5 @@
</em>
</p>
{tmplinclude file='meeting/core.tpl'}
{include file='meeting/core.tpl'}
6 changes: 3 additions & 3 deletions application/views/patch-panel/addEdit.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{tmplinclude file="header.tpl"}
{include file="header.tpl"}

<div class="content">

Expand All @@ -15,7 +15,7 @@
</table>


{tmplinclude file="message.tpl"}
{include file="message.tpl"}

<div id="ajaxMessage"></div>

Expand All @@ -33,5 +33,5 @@ patch panel will also have their co-location reference updated also.

</div>

{tmplinclude file="footer.tpl"}
{include file="footer.tpl"}

6 changes: 3 additions & 3 deletions application/views/patch-panel/edit-ports.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{tmplinclude file="header.tpl"}
{include file="header.tpl"}

<div class="content">

Expand All @@ -11,7 +11,7 @@
</table>


{tmplinclude file="message.tpl"}
{include file="message.tpl"}

<div id="ajaxMessage"></div>

Expand All @@ -21,5 +21,5 @@

</div>

{tmplinclude file="footer.tpl"}
{include file="footer.tpl"}

6 changes: 3 additions & 3 deletions application/views/provision/interface/list.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{tmplinclude file="header.tpl" pageTitle="IXP Manager :: Provision New Interface"}
{include file="header.tpl" pageTitle="IXP Manager :: Provision New Interface"}

<div class="yui-g">

Expand All @@ -10,7 +10,7 @@
</tr>
</table>

{tmplinclude file="message.tpl"}
{include file="message.tpl"}

<div id="ajaxMessage"></div>

Expand Down Expand Up @@ -153,4 +153,4 @@ YAHOO.util.Event.addListener( window, "load", function() {ldelim}
</script>
{tmplinclude file="footer.tpl"}
{include file="footer.tpl"}
6 changes: 3 additions & 3 deletions application/views/provision/interface/overview.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{tmplinclude file="header.tpl" pageTitle="IXP Manager :: Provision New Interface"}
{include file="header.tpl" pageTitle="IXP Manager :: Provision New Interface"}

<div class="yui-g">

Expand All @@ -11,7 +11,7 @@
</table>


{tmplinclude file="message.tpl"}
{include file="message.tpl"}

<div id="ajaxMessage"></div>

Expand Down Expand Up @@ -215,4 +215,4 @@
</div> <!-- content -->
</div> <!-- yui-g -->

{tmplinclude file="footer.tpl"}
{include file="footer.tpl"}
6 changes: 3 additions & 3 deletions application/views/provision/interface/switch-config.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{tmplinclude file="header.tpl" pageTitle="IXP Manager :: Provision New Interface"}
{include file="header.tpl" pageTitle="IXP Manager :: Provision New Interface"}

<div class="yui-g">

Expand All @@ -11,7 +11,7 @@
</table>


{tmplinclude file="message.tpl"}
{include file="message.tpl"}

<div id="ajaxMessage"></div>

Expand Down Expand Up @@ -119,4 +119,4 @@ exit
</div>


{tmplinclude file="footer.tpl"}
{include file="footer.tpl"}
6 changes: 3 additions & 3 deletions application/views/sec-viewer/read.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{tmplinclude file="header.tpl" pageTitle="IXP Manager :: SEC Event Notification Config"}
{include file="header.tpl" pageTitle="IXP Manager :: SEC Event Notification Config"}

<div class="yui-g">

Expand All @@ -12,7 +12,7 @@
</tr>
</table>

{tmplinclude file="message.tpl"}
{include file="message.tpl"}

<div id='ajaxMessage'></div>

Expand Down Expand Up @@ -66,5 +66,5 @@ action='sec-event-email-config'}">here</a>.
{/literal}
</script>
{tmplinclude file="footer.tpl"}
{include file="footer.tpl"}

0 comments on commit 280a39b

Please sign in to comment.