swcs/OurUmbraco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some more error fixing after noticing them in the logs

Browse Source
This commit is contained in:
Sebastiaan Janssen
2015-08-02 12:07:41 +02:00
parent 97dfd23934
commit 10335a8788
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OurUmbraco.Site/Views/MacroPartials/Forum/ForumActions.cshtml
+5 -2
View File
@@ -12,8 +12,11 @@
} }
var mem = Members.GetCurrentMember(); var mem = Members.GetCurrentMember();
var subscribed = false;
var subscribed = NotificationsWeb.Library.Utils.IsSubscribedToForum(CurrentPage.Id, mem.Id); if (mem != null)
{
subscribed = NotificationsWeb.Library.Utils.IsSubscribedToForum(CurrentPage.Id, mem.Id);
}
if (CurrentPage.Level == 4) if (CurrentPage.Level == 4)
{ {
OurUmbraco.Site/Views/MacroPartials/Forum/TopicActions.cshtml
+13 -9
View File
@@ -7,15 +7,19 @@
} }
<div class="utility-actions"> <div class="utility-actions">
@if(topic != null) @if(topic != null)
{ {
if (Members.IsLoggedIn()) if (Members.IsLoggedIn())
{ {
var mem = Members.GetCurrentMember(); var mem = Members.GetCurrentMember();
var subscribed = NotificationsWeb.Library.Utils.IsSubscribedToForumTopic(topic.Id, mem.Id); var subscribed = false;
if (mem != null)
if (Members.IsAdmin()) {
{ subscribed = NotificationsWeb.Library.Utils.IsSubscribedToForumTopic(topic.Id, mem.Id);
}
if (Members.IsAdmin())
{
<a href="#" class="delete-thread button" data-id="@topic.Id"> <a href="#" class="delete-thread button" data-id="@topic.Id">
<i class="icon-Delete-key"></i><span>Delete thread</span> <i class="icon-Delete-key"></i><span>Delete thread</span>
</a> </a>
OurUmbraco.Site/masterpages/Events.master
-1
View File
@@ -32,7 +32,6 @@
</ul> </ul>
</div> </div>
<div id="events"> <div id="events">
<umbraco:Macro Alias="Events-ShowUpcoming" runat="server"></umbraco:Macro>
</div> </div>
</asp:ContentPlaceHolder> </asp:ContentPlaceHolder>
</div> </div>
OurUmbraco.Site/xslt/Project-Tags.xslt
+1 -1
View File
@@ -157,7 +157,7 @@ $recordsPerPage )">
<xsl:when test="string-length($project/defaultScreenshotPath) &gt; 0"> <xsl:when test="string-length($project/defaultScreenshotPath) &gt; 0">
<div style="float:left;padding-top:15px;width:75px;height:80px;"> <div style="float:left;padding-top:15px;width:75px;height:80px;">
<div style="padding-left:16px;"> <div style="padding-left:16px;">
<img style="width:40px;height:40px" src="/umbraco/imagegen.ashx?image={$project/defaultScreenshotPath}&amp;pad=true&amp;width=40&amp;height=40;" alt="{$project/@nodeName}"/> <img style="width:40px;height:40px" src="{$project/defaultScreenshotPath}?width=40&amp;height=40;" alt="{$project/@nodeName}"/>
</div> </div>
</div> </div>
</xsl:when> </xsl:when>