Skip to content

Commit

Permalink
Merge pull request #59 from DNNCommunity/development
Browse files Browse the repository at this point in the history 
release/8.0.0
  • Loading branch information
@valadas
valadas authored Apr 25, 2021
2 parents 202257f + f2ca34b commit f962db6
Show file tree
Hide file tree
Showing 15 changed files with 163 additions and 788 deletions.
7 changes: 5 additions & 2 deletions App_LocalResources/Settings.ascx.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,11 @@
<data name="plUsePermissions.Text" xml:space="preserve">
<value>Use Permissions</value>
</data>
<data name="plUsePopup.Text" xml:space="preserve">
<value>Telerik Popup</value>
<data name="plUseEllipsis.Text" xml:space="preserve">
<value>Ellipsis</value>
</data>
<data name="plUseTooltip.Text" xml:space="preserve">
<value>Tooltip</value>
</data>
<data name="plDisplayAttribute.Help" xml:space="preserve">
<value>Profile attribute needs to be displayed in Ascending or Descending order</value>
Expand Down
124 changes: 0 additions & 124 deletions Components/LinksFriend.cs
View file

This file was deleted.

10 changes: 5 additions & 5 deletions DNN_Links.dnn
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN_Links" type="Module" version="7.1.0">
<package name="DNN_Links" type="Module" version="8.0.0">
<friendlyName>Links</friendlyName>
<description>This module renders a list of hyperlinks. Links includes an edit page, which allows authorized users to edit the Links data stored in the SQL database.</description>
<iconFile>img/links-icon.png</iconFile>
<owner>
<name>DotNetNuke Corporation</name>
<organization>DotNetNuke Corporation</organization>
<url>http://www.dotnetnuke.com</url>
<email>support@dotnetnuke.com</email>
<name>DNN Community</name>
<organization>DNN Community</organization>
<url>http://www.dnncommunity.org</url>
<email>info@dnncommunity.org</email>
</owner>
<license src="License.htm" />
<releaseNotes src="ReleaseNotes.htm" />
Expand Down
11 changes: 0 additions & 11 deletions Dnn.Links.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
</Reference>
<Reference Include="DotNetNuke.Web.Deprecated, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Web.Deprecated.9.4.0\lib\net45\DotNetNuke.Web.Deprecated.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
</Reference>
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
Expand All @@ -84,17 +79,11 @@
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="Telerik.Web.UI, Version=2013.2.717.40, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Web.Deprecated.9.4.0\lib\net45\Telerik.Web.UI.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Components\FeatureController.cs" />
<Compile Include="Components\Link.cs" />
<Compile Include="Components\LinkController.cs" />
<Compile Include="Components\LinksFriend.cs" />
<Compile Include="Components\TargetInfo.cs" />
<Compile Include="Consts\Consts.cs" />
<Compile Include="Consts\SettingName.cs" />
Expand Down
7 changes: 5 additions & 2 deletions Enums.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
namespace DotNetNuke.Modules.Links.Enums
using System;

namespace DotNetNuke.Modules.Links.Enums
{
public enum ModuleContentTypes
{
Links = 1,
Menu = 2,
Folder = 3,
Friends = 4
[Obsolete("Friends mode has been removed in v8.0.0. This enum value will be deleted as soon as we have a 5 value in the enum.")]
Friends = 4,
}

public enum LinkView
Expand Down
49 changes: 29 additions & 20 deletions License.htm
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
 Copyright (c) 2011 DotNetNuke Corporation<br />
<br />
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the &quot;Software&quot;), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:<br />
<br />
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.<br />
<br />
THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


<div class="License">
<h3>MIT License</h3>
<p>&nbsp;</p>
<h4>Copyright (c) 2021 DNN Community</h4>
<p>&nbsp;</p>
<p>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
</p>
<p>&nbsp;</p>
<p>
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
</p>
<p>&nbsp;</p>
<p>
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
</p>
</div>
107 changes: 1 addition & 106 deletions Links.ascx
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<%@ Control Language="C#" Inherits="DotNetNuke.Modules.Links.Links"
AutoEventWireup="true" Explicit="True" Codebehind="Links.ascx.cs" %>
<%@ Register TagPrefix="telerik" Namespace="Telerik.Web.UI" Assembly="Telerik.Web.UI" %>
<%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
<asp:Panel ID="pnlList" runat="server" CssClass="link_module" >
<asp:Repeater ID="lstLinks" runat="server" OnItemDataBound="lstLinks_ItemDataBound">
Expand All @@ -25,11 +24,6 @@
<asp:Panel ID="pnlDescription" CssClass="item_desc" Style="display: none" runat="server">
<asp:Label runat="server" CssClass="Normal" ID="lbldescrdiv" />
</asp:Panel>
<telerik:RadToolTip ID="radToolTip" runat="server" TargetControlID="linkHyp" RelativeTo="Element"
Position="BottomCenter" RenderInPageRoot="true" EnableShadow="true" Animation="Slide"
AnimationDuration="150" ShowDelay="200" AutoCloseDelay="0" Skin="Telerik" Width="300">
<%# HtmlDecode(Eval("Description").ToString()) %>
</telerik:RadToolTip>
</li>
</ItemTemplate>
<FooterTemplate>
Expand All @@ -50,103 +44,4 @@
<asp:LinkButton ID="cmdGo" runat="server" CssClass="CommandButton" resourcekey="cmdGo" OnClick="cmdGo_Click" ></asp:LinkButton>&nbsp;
<asp:LinkButton ID="cmdInfo" runat="server" CssClass="CommandButton" Text="..." OnClick="cmdInfo_Click" ></asp:LinkButton>
<asp:Label ID="lblDescription" runat="server" CssClass="Normal"></asp:Label>
</asp:Panel>
<asp:Panel runat="server" ID="pnlFriends" Visible="false">
<telerik:RadListView runat="server" ID="lvFriends" ItemPlaceholderID="lvFriendsContainer"
PageSize="6">
<LayoutTemplate>
<fieldset style="border: 1px solid #cccccc;">
<legend>
<h3>
<span>My Friends</span>
</h3>
</legend>
<asp:PlaceHolder runat="server" ID="lvFriendsContainer" />
<div style="clear: both">
</div>
<div style="padding: 5px;">
<div style="float: left; margin-left: 15%;">
<asp:Button runat="server" ID="btnFirst" CommandName="Page" CommandArgument="First"
Text="First" Enabled="<%#Container.CurrentPageIndex > 0 %>" />
<asp:Button runat="server" ID="btnPrev" CommandName="Page" CommandArgument="Prev"
Text="Prev" Enabled="<%#Container.CurrentPageIndex > 0 %>" />
<span style="vertical-align: middle;">Page <strong>
<%#Container.CurrentPageIndex + 1 %></strong> of <strong>
<%#Container.PageCount %></strong></span>
<asp:Button runat="server" ID="btnNext" CommandName="Page" CommandArgument="Next"
Text="Next" Enabled="<%#Container.CurrentPageIndex + 1 < Container.PageCount %>" />
<asp:Button runat="server" ID="btnLast" CommandName="Page" CommandArgument="Last"
Text="Last" Enabled="<%#Container.CurrentPageIndex + 1 < Container.PageCount %>" />
</div>
<div>
<span style="vertical-align: middle; font-weight: bold; padding-left: 5px;">Page Size:</span>
<telerik:RadComboBox runat="server" ID="cmbPageSize" OnSelectedIndexChanged="cmbPageSize_SelectedIndexChanged"
Width="40px" SelectedValue='<%#Container.PageSize %>' AutoPostBack="true">
<Items>
<telerik:RadComboBoxItem Text="6" Value="6" />
<telerik:RadComboBoxItem Text="9" Value="9" />
<telerik:RadComboBoxItem Text="12" Value="12" />
</Items>
</telerik:RadComboBox>
</div>
</div>
</fieldset>
</LayoutTemplate>
<ItemTemplate>
<div style="float: left; margin: 5px 10px 5px 10px">
<fieldset style="width: 300px; height: 100px; border: none;">
<table border="0" cellpadding="0" cellspacing="5" width="350px">
<tr>
<td>
<asp:Image ID="Image2" ImageUrl='<%# Eval("PhotoUrl")%>' runat="server" Height="65px"
Width="65px" BorderStyle="Solid" BorderWidth="3px" BorderColor="#cccccc" ToolTip='<%# Eval("UserName", "Photo of {0}") %>'
onclick='<%# RedirectUserProfile((int)Eval("UserID")) %>' />
</td>
<td>
<table border="0" cellpadding="3" cellspacing="0" width="100%" style="text-align: left;">
<tr>
<td style="width: 35%">
<dnn:Label runat="server" ID="lblUsername" Text="User Name" Suffix=":" />
</td>
<td>
<%# Eval("UserName")%>
</td>
</tr>
<tr>
<td style="width: 35%">
<dnn:Label runat="server" ID="lblDisplayname" Text="Display Name" Suffix=":" />
</td>
<td>
<%# Eval("DisplayName")%>
</td>
</tr>
<tr>
<td style="width: 35%">
<dnn:Label runat="server" ID="lblStatus" Text="Status" Suffix=":" />
</td>
<td>
<%# Eval("Status") %>
</td>
</tr>
<tr>
<td colspan="2">
<asp:LinkButton runat="server" Text="Remove Friend" ID="btnRemoveFriend" OnCommand="btnRemoveFriend_OnCommand"
CommandName='<%# Eval("UserID") %>' Visible='<%# MakeVisible(Eval("Status").ToString()) %>'>
</asp:LinkButton>
<asp:LinkButton runat="server" Text="Accept Friend Request" ID="btnAcceptFriendRequest"
OnCommand="btnAcceptFriendRequest_OnCommand" CommandName='<%# Eval("UserRelationshipID") %>'
Visible='<%# MakeAcceptFriendRequestVisible(Eval("Status").ToString(), (int)Eval("UserID")) %>'>
</asp:LinkButton>
</td>
<td>
</td>
</tr>
</table>
</td>
</tr>
</table>
</fieldset>
</div>
</ItemTemplate>
</telerik:RadListView>
</asp:Panel>
</asp:Panel>
Loading

0 comments on commit f962db6

Please sign in to comment.