Skip to content
This repository has been archived by the owner on May 1, 2019. It is now read-only.

Commit

Permalink
Fix: Wrapping, indentation, trailing semicolons
Browse files Browse the repository at this point in the history
  • Loading branch information
@localheinz
localheinz committed Feb 18, 2015
1 parent 122b41a commit 2ef4438
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 57 deletions.
63 changes: 33 additions & 30 deletions module/Application/view/layout/layout-small-header.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,38 @@
<?php echo $this->headLink(); ?>
</head>
<body>
<a href="https://github.com/zendframework/modules.zendframework.com"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png" alt="Fork me on GitHub"></a>

<a href="https://github.com/zendframework/modules.zendframework.com">
<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png" alt="Fork me on GitHub">
</a>
<div id="toppanel">
<div class="tab">
<ul class="login">
<li class="left">&nbsp;</li>
<li><a href="<?php echo $this->url('home'); ?>">Home</a></li>
<?php $userDisplayName = $this->zfcUserDisplayName(); ?>
<?php if ($userDisplayName): ?>
<li class="sep">|</li>
<li class="user-info">
<?php /* @var User\Entity\User $identity */ ?>
<?php $identity = $this->zfcUserIdentity(); ?>
<div class="gravatar-container"><a class="login" href="<?php
echo $this->url('zfcuser');
?>" title="My profile">
<img src="<?php
echo $this->escapeHtmlAttr($identity->getPhotoUrl());
?>" alt="<?php echo $this->escapeHtmlAttr($this->zfcUserDisplayName());
?>" style="width:23px;height:23px;" />
</a></div><a class="login" href="<?php echo $this->url('zfcuser') ?>" title="My profile"> Hello <?php echo $this->escapeHtml(ucfirst($userDisplayName)); ?></a>
</li>
<li class="sep">|</li>
<li ><a href="<?php echo $this->url('zfcuser/logout'); ?>">Logout</a></li>
<?php else: ?>
<li id="toggle">
<a class="login" href="<?php echo $this->url('scn-social-auth-user/login/provider', ['provider' => 'github']); ?>">GitHub Login</a>
</li>
<?php endif; ?>
<li>
<a href="<?php echo $this->url('home'); ?>">Home</a>
</li>
<?php $userDisplayName = $this->zfcUserDisplayName(); ?>
<?php if ($userDisplayName): ?>
<li class="sep">|</li>
<li class="user-info">
<?php /* @var User\Entity\User $identity */ ?>
<?php $identity = $this->zfcUserIdentity(); ?>
<div class="gravatar-container">
<a class="login" href="<?php echo $this->url('zfcuser'); ?>" title="My profile">
<img src="<?php echo $this->escapeHtmlAttr($identity->getPhotoUrl()); ?>" alt="<?php echo $this->escapeHtmlAttr($this->zfcUserDisplayName()); ?>" style="width:23px;height:23px;" />
</a>
</div>
<a class="login" href="<?php echo $this->url('zfcuser'); ?>" title="My profile"> Hello <?php echo $this->escapeHtml(ucfirst($userDisplayName)); ?></a>
</li>
<li class="sep">|</li>
<li>
<a href="<?php echo $this->url('zfcuser/logout'); ?>">Logout</a>
</li>
<?php else: ?>
<li id="toggle">
<a class="login" href="<?php echo $this->url('scn-social-auth-user/login/provider', ['provider' => 'github']); ?>">GitHub Login</a>
</li>
<?php endif; ?>
<li class="right">&nbsp;</li>
</ul>
</div>
Expand All @@ -57,22 +60,22 @@
<div class="col-md-8">
<a href="<?php echo $this->url('home'); ?>" style="text-decoration:none">
<img src="<?php echo $this->basePath('/img/zend-logo_small.png'); ?>" alt="ZF Modules"/>
<p class="zf-green">Modules</p>
<p class="zf-green">
Modules
</p>
</a>
</div>
<div class="col-md-4">

</div>
<div class="col-md-4"></div>
</div>
</div>
</div>


<div class="container main-content">
<div class="container-fluid">
<?php echo $this->content; ?>
</div
</div>

<hr style="clear:both" />

<?php echo $this->partial('layout/footer'); ?>
Expand Down
59 changes: 32 additions & 27 deletions module/Application/view/layout/layout.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,38 @@
<?php echo $this->headLink(); ?>
</head>
<body>
<a href="https://github.com/zendframework/modules.zendframework.com"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png" alt="Fork me on GitHub"></a>

<a href="https://github.com/zendframework/modules.zendframework.com">
<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png" alt="Fork me on GitHub">
</a>
<div id="toppanel">
<div class="tab">
<ul class="login">
<li class="left">&nbsp;</li>
<li><a href="<?php echo $this->url('home') ?>">Home</a></li>
<?php $userDisplayName = $this->zfcUserDisplayName(); ?>
<?php if ($userDisplayName): ?>
<li class="sep">|</li>
<li class="user-info">
<?php /* @var User\Entity\User $identity */ ?>
<?php $identity = $this->zfcUserIdentity(); ?>
<div class="gravatar-container"><a class="login" href="<?php echo $this->url('zfcuser') ?>" title="My profile">
<img src="<?php
echo $this->escapeHtmlAttr($identity->getPhotoUrl());
?>" alt="<?php echo $this->escapeHtmlAttr($this->zfcUserDisplayName());
?>" style="width:23px;height:23px;" />
</a></div><a class="login" href="<?php echo $this->url('zfcuser') ?>" title="My profile"> Hello <?php echo $this->escapeHtml(ucfirst($userDisplayName)) ?></a>
</li>
<li class="sep">|</li>
<li ><a href="<?php echo $this->url('zfcuser/logout') ?>">Logout</a></li>
<?php else: ?>
<li id="toggle">
<a class="login" href="<?php echo $this->url('scn-social-auth-user/login/provider', ['provider' => 'github']) ?>">GitHub Login</a>
</li>
<?php endif; ?>
<li>
<a href="<?php echo $this->url('home'); ?>">Home</a>
</li>
<?php $userDisplayName = $this->zfcUserDisplayName(); ?>
<?php if ($userDisplayName): ?>
<li class="sep">|</li>
<li class="user-info">
<?php /* @var User\Entity\User $identity */ ?>
<?php $identity = $this->zfcUserIdentity(); ?>
<div class="gravatar-container">
<a class="login" href="<?php echo $this->url('zfcuser'); ?>" title="My profile">
<img src="<?php echo $this->escapeHtmlAttr($identity->getPhotoUrl()); ?>" alt="<?php echo $this->escapeHtmlAttr($this->zfcUserDisplayName()); ?>" style="width:23px;height:23px;" />
</a>
</div>
<a class="login" href="<?php echo $this->url('zfcuser'); ?>" title="My profile"> Hello <?php echo $this->escapeHtml(ucfirst($userDisplayName)); ?></a>
</li>
<li class="sep">|</li>
<li>
<a href="<?php echo $this->url('zfcuser/logout'); ?>">Logout</a>
</li>
<?php else: ?>
<li id="toggle">
<a class="login" href="<?php echo $this->url('scn-social-auth-user/login/provider', ['provider' => 'github']); ?>">GitHub Login</a>
</li>
<?php endif; ?>
<li class="right">&nbsp;</li>
</ul>
</div>
Expand All @@ -57,7 +62,7 @@
<h1 class="zf-green">
<strong>Welcome to the ZF2 Modules Site</strong>
</h1>
<h3 class="text-muted">Find one of <strong><?php echo $this->totalModules() ?></strong> modules that fits your needs.</h3>
<h3 class="text-muted">Find one of <strong><?php echo $this->totalModules(); ?></strong> modules that fits your needs.</h3>
<div>
<p>
This website is a work-in-progress. In the future you will be able to use this website to browse, search, rate, and comment on all of the great modules the Zend Framework community has to offer.
Expand All @@ -70,18 +75,18 @@
</div>
</div>
<div class="col-md-4 hidden-xs hidden-sm">
<img class="attentionimage pull-right" src="<?php echo $this->basePath('/img/rsz_logo.png') ?>" alt="ZF Modules"/>
<img class="attentionimage pull-right" src="<?php echo $this->basePath('/img/rsz_logo.png'); ?>" alt="ZF Modules"/>
</div>
</div>
</div>
</div>


<div class="container main-content">
<div class="container-fluid">
<?php echo $this->content; ?>
</div>
</div
</div>

<hr style="clear:both" />

<?php echo $this->partial('layout/footer'); ?>
Expand Down

0 comments on commit 2ef4438

Please sign in to comment.