yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge with 4.11.5

Browse Source
This commit is contained in:
Shannon Deminick
2013-02-26 21:11:20 +06:00
parent 429522a0bc d503deb8c5
commit 4b29d7ba2e
4 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web.UI/config/ExamineIndex.Release.config
View File

@@ -11,7 +11,17 @@ More information and documentation can be found on CodePlex: http://umbracoexami
<IndexSet SetName="InternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/Internal/" />
<!-- The internal index set used by Umbraco back-office for indexing members - DO NOT REMOVE -->
<IndexSet SetName="InternalMemberIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/InternalMember/" />
<IndexSet SetName="InternalMemberIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/InternalMember/">
<IndexAttributeFields>
<add Name="id" />
<add Name="nodeName"/>
<add Name="updateDate" />
<add Name="writerName" />
<add Name="loginName" />
<add Name="email" />
<add Name="nodeTypeAlias" />
</IndexAttributeFields>
</IndexSet>
<!-- Default Indexset for external searches, this indexes all fields on all types of nodes-->
<IndexSet SetName="ExternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/External/" />

12
src/Umbraco.Web.UI/config/ExamineIndex.config
View File

@@ -11,5 +11,15 @@ More information and documentation can be found on CodePlex: http://umbracoexami
<IndexSet SetName="InternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/Internal/" />
<!-- The internal index set used by Umbraco back-office for indexing members - DO NOT REMOVE -->
<IndexSet SetName="InternalMemberIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/InternalMember/" />
<IndexSet SetName="InternalMemberIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/InternalMember/">
<IndexAttributeFields>
<add Name="id" />
<add Name="nodeName"/>
<add Name="updateDate" />
<add Name="writerName" />
<add Name="loginName" />
<add Name="email" />
<add Name="nodeTypeAlias" />
</IndexAttributeFields>
</IndexSet>
</ExamineLuceneIndexSets>

6
src/Umbraco.Web.UI/umbraco/members/MemberSearch.ascx
View File

@@ -2,7 +2,7 @@
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<div class="dashboardWrapper">
<h2>Member Search</h2>
<img src="./dashboard/images/membersearch.png" alt="Videos" class="dashboardIcon" />
<img src="<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/dashboard/images/membersearch.png" %>" alt="Member Search" class="dashboardIcon" />
<p class="guiDialogNormal">
<asp:TextBox id="searchQuery" runat="server"></asp:TextBox>
<asp:Button id="ButtonSearch" runat="server" Text="Button" onclick="ButtonSearch_Click"></asp:Button></p>
@@ -19,14 +19,14 @@
</HeaderTemplate>
<ItemTemplate>
<tr>
<td><asp:HyperLink runat="server" NavigateUrl='<%# umbraco.IO.SystemDirectories.Umbraco + "/members/EditMember.aspx?id=" + Eval("Id") %>'><%# Eval("Name") %></asp:HyperLink></td>
<td><asp:HyperLink runat="server" NavigateUrl='<%# Umbraco.Core.IO.SystemDirectories.Umbraco + "/members/EditMember.aspx?id=" + Eval("Id") %>'><%# Eval("Name") %></asp:HyperLink></td>
<td><%# Eval("Email") %></td>
<td><%# Eval("LoginName") %></td>
</tr>
</ItemTemplate>
<AlternatingItemTemplate>
<tr class="alt">
<td><asp:HyperLink runat="server" NavigateUrl='<%# umbraco.IO.SystemDirectories.Umbraco + "/members/EditMember.aspx?id=" + Eval("Id") %>'><%# Eval("Name") %></asp:HyperLink></td>
<td><asp:HyperLink runat="server" NavigateUrl='<%# Umbraco.Core.IO.SystemDirectories.Umbraco + "/members/EditMember.aspx?id=" + Eval("Id") %>'><%# Eval("Name") %></asp:HyperLink></td>
<td><%# Eval("Email") %></td>
<td><%# Eval("LoginName") %></td>
</tr>

6
src/Umbraco.Web/umbraco.presentation/umbraco/members/MemberSearch.ascx
View File

@@ -2,7 +2,7 @@
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<div class="dashboardWrapper">
<h2>Member Search</h2>
<img src="./dashboard/images/membersearch.png" alt="Videos" class="dashboardIcon" />
<img src="<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/dashboard/images/membersearch.png" %>" alt="Member Search" class="dashboardIcon" />
<p class="guiDialogNormal">
<asp:TextBox id="searchQuery" runat="server"></asp:TextBox>
<asp:Button id="ButtonSearch" runat="server" Text="Button" onclick="ButtonSearch_Click"></asp:Button></p>
@@ -19,14 +19,14 @@
</HeaderTemplate>
<ItemTemplate>
<tr>
<td><asp:HyperLink runat="server" NavigateUrl='<%# umbraco.IO.SystemDirectories.Umbraco + "/members/EditMember.aspx?id=" + Eval("Id") %>'><%# Eval("Name") %></asp:HyperLink></td>
<td><asp:HyperLink runat="server" NavigateUrl='<%# Umbraco.Core.IO.SystemDirectories.Umbraco + "/members/EditMember.aspx?id=" + Eval("Id") %>'><%# Eval("Name") %></asp:HyperLink></td>
<td><%# Eval("Email") %></td>
<td><%# Eval("LoginName") %></td>
</tr>
</ItemTemplate>
<AlternatingItemTemplate>
<tr class="alt">
<td><asp:HyperLink runat="server" NavigateUrl='<%# umbraco.IO.SystemDirectories.Umbraco + "/members/EditMember.aspx?id=" + Eval("Id") %>'><%# Eval("Name") %></asp:HyperLink></td>
<td><asp:HyperLink runat="server" NavigateUrl='<%# Umbraco.Core.IO.SystemDirectories.Umbraco + "/members/EditMember.aspx?id=" + Eval("Id") %>'><%# Eval("Name") %></asp:HyperLink></td>
<td><%# Eval("Email") %></td>
<td><%# Eval("LoginName") %></td>
</tr>