Skip to content

Commit cd97abf

Browse files
Catalin Davidwww-data
Catalin David
authored and
www-data
committed
vaibhav's changes
1 parent 179487a commit cd97abf

27 files changed

+3002
-63
lines changed

‎applications/vanilla/design/favicon.ico

2.62 KB
Binary file not shown.

‎applications/vanilla/design/favicon.png

10.2 KB
Loading

‎applications/vanilla/design/logo.png

16.4 KB
Loading

‎applications/vanilla/design/v1.jpeg

23.6 KB
Loading

‎applications/vanilla/design/v2.jpeg

30.7 KB
Loading

‎applications/vanilla/views/discussions/discussion.php ‎applications/vanilla/views/discussions/discussion.php.backup

File renamed without changes.

‎applications/vanilla/views/discussions/index.php

+27-16
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
1-
<?php if (!defined('APPLICATION')) exit();
2-
$this->Title(T('All Discussions'));
3-
include($this->FetchViewLocation('helper_functions', 'discussions', 'vanilla'));
1+
<div class="container">
42

5-
WriteFilterTabs($this);
6-
if ($this->DiscussionData->NumRows() > 0 || (is_object($this->AnnounceData) && $this->AnnounceData->NumRows() > 0)) {
7-
?>
8-
<ul class="DataList Discussions">
9-
<?php include($this->FetchViewLocation('discussions')); ?>
10-
</ul>
11-
<?php
12-
echo $this->Pager->ToString('more');
13-
} else {
14-
?>
15-
<div class="Empty"><?php echo T('No discussions were found.'); ?></div>
16-
<?php
17-
}
3+
<!-- Main hero unit for a primary marketing message or call to action -->
4+
<div class="hero-unit">
5+
<img src="uploads/logo.png"></img>
6+
<p>Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
7+
<p><a class="btn primary large">Learn more &raquo;</a></p>
8+
</div>
9+
10+
<!-- Example row of columns -->
11+
<div class="row">
12+
<div class="span6">
13+
<h2>Heading</h2>
14+
<p>Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
15+
<p><a class="btn" href="#">View details &raquo;</a></p>
16+
</div>
17+
<div class="span5">
18+
<h2>Heading</h2>
19+
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
20+
<p><a class="btn" href="#">View details &raquo;</a></p>
21+
</div>
22+
<div class="span5">
23+
<h2>Heading</h2>
24+
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
25+
<p><a class="btn" href="#">View details &raquo;</a></p>
26+
</div>
27+
</div>
28+
</div> <!-- /container -->

‎applications/vanilla/views/discussions/index.php.backup

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php if (!defined('APPLICATION')) exit();
2+
$this->Title(T('All Discussions'));
3+
include($this->FetchViewLocation('helper_functions', 'discussions', 'vanilla'));
4+
5+
WriteFilterTabs($this);
6+
if ($this->DiscussionData->NumRows() > 0 || (is_object($this->AnnounceData) && $this->AnnounceData->NumRows() > 0)) {
7+
?>
8+
<ul class="DataList Discussions">
9+
<?php include($this->FetchViewLocation('discussions')); ?>
10+
</ul>
11+
<?php
12+
echo $this->Pager->ToString('more');
13+
} else {
14+
?>
15+
<div class="Empty"><?php echo T('No discussions were found.'); ?></div>
16+
<?php
17+
}

‎applications/vanilla/views/discussions/index.php~

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<div class="container">
2+
3+
<!-- Main hero unit for a primary marketing message or call to action -->
4+
<div class="hero-unit">
5+
<img src="../../uploads/logo.png"></img>
6+
<p>Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
7+
<p><a class="btn primary large">Learn more &raquo;</a></p>
8+
</div>
9+
10+
<!-- Example row of columns -->
11+
<div class="row">
12+
<div class="span6">
13+
<h2>Heading</h2>
14+
<p>Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
15+
<p><a class="btn" href="#">View details &raquo;</a></p>
16+
</div>
17+
<div class="span5">
18+
<h2>Heading</h2>
19+
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
20+
<p><a class="btn" href="#">View details &raquo;</a></p>
21+
</div>
22+
<div class="span5">
23+
<h2>Heading</h2>
24+
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
25+
<p><a class="btn" href="#">View details &raquo;</a></p>
26+
</div>
27+
</div>
28+
</div> <!-- /container -->

‎applications/vanilla/views/modules/categories.php

-44
Original file line numberDiff line numberDiff line change
@@ -1,45 +1 @@
11
<?php if (!defined('APPLICATION')) exit();
2-
$CountDiscussions = 0;
3-
$CategoryID = isset($this->_Sender->CategoryID) ? $this->_Sender->CategoryID : '';
4-
5-
if ($this->Data !== FALSE) {
6-
foreach ($this->Data->Result() as $Category) {
7-
$CountDiscussions = $CountDiscussions + $Category->CountDiscussions;
8-
}
9-
?>
10-
<div class="Box BoxCategories">
11-
<h4><?php echo Anchor(T('Categories'), 'categories/all'); ?></h4>
12-
<ul class="PanelInfo PanelCategories">
13-
<li<?php
14-
if (!is_numeric($CategoryID))
15-
echo ' class="Active"';
16-
17-
?>><span><strong><?php echo Anchor(Gdn_Format::Text(T('All Discussions')), '/discussions'); ?></strong><span class="Count"><?php echo number_format($CountDiscussions); ?></span></span></li>
18-
<?php
19-
$MaxDepth = C('Vanilla.Categories.MaxDisplayDepth');
20-
$DoHeadings = C('Vanilla.Categories.DoHeadings');
21-
22-
foreach ($this->Data->Result() as $Category) {
23-
if ($Category->CategoryID < 0 || $MaxDepth > 0 && $Category->Depth > $MaxDepth)
24-
continue;
25-
26-
if ($DoHeadings && $Category->Depth == 1)
27-
$CssClass = 'Heading';
28-
else
29-
$CssClass = 'Depth'.$Category->Depth.($CategoryID == $Category->CategoryID ? ' Active' : '');
30-
31-
echo '<li class="'.$CssClass.'">';
32-
33-
if ($DoHeadings && $Category->Depth == 1) {
34-
echo Gdn_Format::Text($Category->Name);
35-
} else {
36-
echo Wrap(Anchor(($Category->Depth > 1 ? '↳ ' : '').Gdn_Format::Text($Category->Name), '/categories/'.$Category->UrlCode), 'strong')
37-
.'<span class="Count">'.number_format($Category->CountAllDiscussions).'</span>';
38-
}
39-
echo "</li>\n";
40-
}
41-
?>
42-
</ul>
43-
</div>
44-
<?php
45-
}

‎applications/vanilla/views/modules/categories.php.backup

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?php if (!defined('APPLICATION')) exit();
2+
$CountDiscussions = 0;
3+
$CategoryID = isset($this->_Sender->CategoryID) ? $this->_Sender->CategoryID : '';
4+
5+
if ($this->Data !== FALSE) {
6+
foreach ($this->Data->Result() as $Category) {
7+
$CountDiscussions = $CountDiscussions + $Category->CountDiscussions;
8+
}
9+
?>
10+
<div class="Box BoxCategories">
11+
<h4><?php echo Anchor(T('Categories'), 'categories/all'); ?></h4>
12+
<ul class="PanelInfo PanelCategories">
13+
<li<?php
14+
if (!is_numeric($CategoryID))
15+
echo ' class="Active"';
16+
17+
?>><span><strong><?php echo Anchor(Gdn_Format::Text(T('All Discussions')), '/discussions'); ?></strong><span class="Count"><?php echo number_format($CountDiscussions); ?></span></span></li>
18+
<?php
19+
$MaxDepth = C('Vanilla.Categories.MaxDisplayDepth');
20+
$DoHeadings = C('Vanilla.Categories.DoHeadings');
21+
22+
foreach ($this->Data->Result() as $Category) {
23+
if ($Category->CategoryID < 0 || $MaxDepth > 0 && $Category->Depth > $MaxDepth)
24+
continue;
25+
26+
if ($DoHeadings && $Category->Depth == 1)
27+
$CssClass = 'Heading';
28+
else
29+
$CssClass = 'Depth'.$Category->Depth.($CategoryID == $Category->CategoryID ? ' Active' : '');
30+
31+
echo '<li class="'.$CssClass.'">';
32+
33+
if ($DoHeadings && $Category->Depth == 1) {
34+
echo Gdn_Format::Text($Category->Name);
35+
} else {
36+
echo Wrap(Anchor(($Category->Depth > 1 ? '↳ ' : '').Gdn_Format::Text($Category->Name), '/categories/'.$Category->UrlCode), 'strong')
37+
.'<span class="Count">'.number_format($Category->CountAllDiscussions).'</span>';
38+
}
39+
echo "</li>\n";
40+
}
41+
?>
42+
</ul>
43+
</div>
44+
<?php
45+
}

‎applications/vanilla/views/modules/categories.php~

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?php if (!defined('APPLICATION')) exit();
2+
$CountDiscussions = 0;
3+
$CategoryID = isset($this->_Sender->CategoryID) ? $this->_Sender->CategoryID : '';
4+
5+
if ($this->Data !== FALSE) {
6+
foreach ($this->Data->Result() as $Category) {
7+
$CountDiscussions = $CountDiscussions + $Category->CountDiscussions;
8+
}
9+
?>
10+
<div class="Box BoxCategories">
11+
<h4><?php echo Anchor(T('Categories'), 'categories/all'); ?></h4>
12+
<ul class="PanelInfo PanelCategories">
13+
<li<?php
14+
if (!is_numeric($CategoryID))
15+
echo ' class="Active"';
16+
17+
?>><span><strong><?php echo Anchor(Gdn_Format::Text(T('All Discussions')), '/discussions'); ?></strong><span class="Count"><?php echo number_format($CountDiscussions); ?></span></span></li>
18+
<?php
19+
$MaxDepth = C('Vanilla.Categories.MaxDisplayDepth');
20+
$DoHeadings = C('Vanilla.Categories.DoHeadings');
21+
22+
foreach ($this->Data->Result() as $Category) {
23+
if ($Category->CategoryID < 0 || $MaxDepth > 0 && $Category->Depth > $MaxDepth)
24+
continue;
25+
26+
if ($DoHeadings && $Category->Depth == 1)
27+
$CssClass = 'Heading';
28+
else
29+
$CssClass = 'Depth'.$Category->Depth.($CategoryID == $Category->CategoryID ? ' Active' : '');
30+
31+
echo '<li class="'.$CssClass.'">';
32+
33+
if ($DoHeadings && $Category->Depth == 1) {
34+
echo Gdn_Format::Text($Category->Name);
35+
} else {
36+
echo Wrap(Anchor(($Category->Depth > 1 ? '↳ ' : '').Gdn_Format::Text($Category->Name), '/categories/'.$Category->UrlCode), 'strong')
37+
.'<span class="Count">'.number_format($Category->CountAllDiscussions).'</span>';
38+
}
39+
echo "</li>\n";
40+
}
41+
?>
42+
</ul>
43+
</div>
44+
<?php
45+
}

‎applications/vanilla/views/modules/newdiscussion.php

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
<?php if (!defined('APPLICATION')) exit();
2-
echo Anchor(T('Start a New Discussion'), '/post/discussion'.(array_key_exists('CategoryID', $Data) ? '/'.$Data['CategoryID'] : ''), 'BigButton NewDiscussion');

‎applications/vanilla/views/modules/newdiscussion.php.backup

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?php if (!defined('APPLICATION')) exit();
2+
echo Anchor(T('Start a New Discussion'), '/post/discussion'.(array_key_exists('CategoryID', $Data) ? '/'.$Data['CategoryID'] : ''), 'BigButton NewDiscussion');

‎applications/vanilla/views/modules/newdiscussion.php~

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?php if (!defined('APPLICATION')) exit();
2+
echo Anchor(T('Start a New Discussion'), '/post/discussion'.(array_key_exists('CategoryID', $Data) ? '/'.$Data['CategoryID'] : ''), 'BigButton NewDiscussion');

‎applications/wattsapp/controllers/class.wattsappcontroller.php

+3
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,9 @@ public function requireAccess($ClientID, $Token, $Address, $Port, $Justification
295295
}
296296

297297
public function _RenameRelocate ($Method, $ArgName, $ClientID, $Token, $CollectorID = null, $MoteID = null, $NewValue = null) {
298+
logger($NewValue);
299+
$NewValue = urldecode(urldecode($NewValue));
300+
logger($NewValue);
298301
if ($ClientID && $Token && $CollectorID != null && $MoteID != null && $NewValue != null &&
299302
is_numeric($ClientID) && is_numeric($CollectorID) && is_numeric($MoteID)) {
300303
$this->OkToRender = self::_verifyFacebookLogin($ClientID, $Token);

‎cache/empty

Whitespace-only changes.

‎themes/bootstrap/design/logo.png

16.4 KB
Loading

0 commit comments

Comments
 (0)