Permalink
Browse files

misc/little structural changes

  • Loading branch information...
1 parent f127411 commit b441c75c1a7b0e62eb8da3b0547c442ef403e0dd @FlorianLB FlorianLB committed Feb 24, 2012
@@ -44,18 +44,14 @@
</div>
<div id="main">
-{if $is_home}
- <h1>Booster : What's that ?</h1>
- <p id="booster_description">
- Booster is the portal that provides all the existing Jelix ressources provided by the community :
- Applications, Modules, Plugins, and Language Packs. <a href="{jurl 'booster~default:add'}">You can now add your own work</a> on <em>Booster</em>.
- </p>
-{/if}
<div id="content-menu">
{$MENU}
</div>
<div id="content">
{jmessage}
+
+ {$SEARCH}
+
{$MAIN}
</div>
<div class="clear"></div>
@@ -0,0 +1,17 @@
+ <h2>Booster : What's that ?</h2>
+ <p id="booster_description">
+ Booster is the portal that provides all the existing Jelix ressources provided by the community :
+ Applications, Modules, Plugins, and Language Packs. <a href="{jurl 'booster~default:add'}">You can now add your own work</a> on <em>Booster</em>.
+ </p>
+
+{ifuserconnected}
+<h2>{@main.item@}</h2>
+<a class="jforms-submit" href="{jurl 'booster~add'}">{@main.add.an.item@}</a>
+{ifacl2 'booster.admin.index'}
+<div class="booster_tasktodo">
+<span>{@main.waiting.your.validation@} : </span>
+{zone 'boosteradmin~tasktodo'}
+</div>
+{/ifacl2}
+{/ifuserconnected}
+{zone "jtags~tagscloud", array('destination'=>'booster~default:cloud', 'maxcount'=>20)}
@@ -51,7 +51,7 @@
<div id="content">
{jmessage}
- {zone 'booster~search'}
+ {$SEARCH}
{$MAIN}
</div>
@@ -1,18 +1,17 @@
-
- <h2>Booster : Qu'est-ce ?</h1>
- <p id="booster_description">
- Booster est le portail qui vous fourni l'ensemble des ressources Jelix existantes produites par la communauté :
- Applications, Modules, Plugins, Paquets de langage. <a href="{jurl 'booster~default:add'}">Vous pouvez, à votre tour, déposer vos propres créations</a> sur <em>Booster</em>
- </p>
-
-{ifuserconnected}
-<h2>{@main.item@}</h2>
-<a class="jforms-submit" href="{jurl 'booster~add'}">{@main.add.an.item@}</a>
-{ifacl2 'booster.admin.index'}
-<div class="booster_tasktodo">
-<span>{@main.waiting.your.validation@} : </span>
-{zone 'boosteradmin~tasktodo'}
-</div>
-{/ifacl2}
-{/ifuserconnected}
-{zone "jtags~tagscloud", array('destination'=>'booster~default:cloud', 'maxcount'=>20)}
+ <h2>Booster : Qu'est-ce ?</h2>
+ <p id="booster_description">
+ Booster est le portail qui vous fourni l'ensemble des ressources Jelix existantes produites par la communauté :
+ Applications, Modules, Plugins, Paquets de langage. <a href="{jurl 'booster~default:add'}">Vous pouvez, à votre tour, déposer vos propres créations</a> sur <em>Booster</em>
+ </p>
+
+{ifuserconnected}
+<h2>{@main.item@}</h2>
+<a class="jforms-submit" href="{jurl 'booster~add'}">{@main.add.an.item@}</a>
+{ifacl2 'booster.admin.index'}
+<div class="booster_tasktodo">
+<span>{@main.waiting.your.validation@} : </span>
+{zone 'boosteradmin~tasktodo'}
+</div>
+{/ifacl2}
+{/ifuserconnected}
+{zone "jtags~tagscloud", array('destination'=>'booster~default:cloud', 'maxcount'=>20)}
@@ -15,11 +15,11 @@ $(document).ready(function(){
<h3>{$data->type_name}: <a href="{jurl 'booster~viewItem',array('name'=>$data->name,'id'=>$data->id)}">{$data->name}</a> {if $item_not_moderated || $data->status == 0}(Non validé){/if}</h3>
<div class="booster_item">
<div class="booster_itemauthor">
- <ul class="member-ident">
- <li class="user-name user-image">{@booster~main.author@} {$data->author}</li>
- <li class="user-rank user-image">{@booster~main.item_by@} {zone 'booster~author', array('id'=>$data->item_by)}</li>
+ <ul>
+ <li>{@booster~main.author@} {$data->author}</li>
+ <li>{@booster~main.item_by@} {zone 'booster~author', array('id'=>$data->item_by)}</li>
</ul>
- <ul class="member-info">
+ <ul>
<li class="booster_url">
{if $data->url_website != null}<a href="{$data->url_website}">{@booster~main.website@}</a>{/if}
{if $data->url_website != null && $data->url_repo != null}::{/if}
@@ -71,7 +71,6 @@ $(document).ready(function(){
</div>
{/if}
{zone 'booster~tagsitem',array('id'=>$data->id)}
-
</div>
<div class="booster_itemaction">&nbsp;
{assign $canEditVersion = false}
@@ -10,28 +10,29 @@
<div class="booster_version {if $count == 0}last-version {assign $count= 1}{/if}">
<h4>{$version->version_name} ({$version->stability})</h4>
<div class="body">
-
- <ul class="version-infos">
- <li class="booster_created">
- {@booster~main.created@} {$version->created|date_format:'%d/%m/%y %H:%M'}
- </li>
-
- <li class="compatibility">
- {@booster~main.compatible.with@} <span class="jelix-version">{$version->version}</span>
- </li>
- {if $canEditVersion}
- <li>(<a href="{jurl 'booster~editVersion',array('id'=>$version->id)}">{@booster~main.edit@}</a>)</li>
- {else}
- {ifacl2 'booster.edit.version'}
+ <div class="wrapper">
+ <ul class="version-infos">
+ <li class="booster_created">
+ {@booster~main.created@} {$version->created|date_format:'%d/%m/%y %H:%M'}
+ </li>
+
+ <li class="compatibility">
+ {@booster~main.compatible.with@} <span class="jelix-version">{$version->version}</span>
+ </li>
+ {if $canEditVersion}
<li>(<a href="{jurl 'booster~editVersion',array('id'=>$version->id)}">{@booster~main.edit@}</a>)</li>
- {/ifacl2}
- {/if}
+ {else}
+ {ifacl2 'booster.edit.version'}
+ <li>(<a href="{jurl 'booster~editVersion',array('id'=>$version->id)}">{@booster~main.edit@}</a>)</li>
+ {/ifacl2}
+ {/if}
+
+ </ul>
- </ul>
-
- <div class="booster_postbody">
- <h5>{@booster~main.last_changes@}</h5>
- <blockquote>{$version->last_changes|wiki:'wr3_to_xhtml'}</blockquote>
+ <div class="booster_postbody">
+ <h5>{@booster~main.last_changes@}</h5>
+ <blockquote>{$version->last_changes|wiki:'wr3_to_xhtml'}</blockquote>
+ </div>
</div>
<div class="booster_downloads">
{@booster~main.download@}: <a href="{$version->download_url}">{$version->filename}</a>
@@ -23,6 +23,7 @@ protected function doAfterActions() {
global $gJConfig, $gJCoord;
$this->body->assignIfNone('MAIN','<p>no content</p>');
$this->body->assignIfNone('MENU','');
+ $this->body->assign('SEARCH',jZone::get('booster~search'));
$title = $gJConfig->booster['title'];
if ($this->title)
$this->title = $this->title .' | '. $title;
@@ -59,6 +60,7 @@ protected function doAfterActions() {
elseif ( $gJCoord->request->params['module'] == 'jcommunity' ) {
$this->body->assign('is_home' ,false);
$this->body->assign('tout' ,false);
+ $this->body->assign('SEARCH','');
}
}
else {
@@ -546,6 +546,10 @@ text-shadow: #aaa 0px 0px 5px;}
margin-bottom:5px;
font-size:1.2em !important;
}
+.booster_version .wrapper{
+ overflow:hidden;
+}
+
#booter_old_version{
margin:0.5em 1em;
font-weight:bold;

0 comments on commit b441c75

Please sign in to comment.