Skip to content
This repository has been archived by the owner on Aug 10, 2020. It is now read-only.

Commit

Permalink
added notification partial view and modified the layout of messages view
Browse files Browse the repository at this point in the history
  • Loading branch information
ndsinister committed Oct 2, 2011
1 parent 47e5798 commit f87db0c
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 26 deletions.
42 changes: 32 additions & 10 deletions src/TravelersAround.WebMvc/Content/Site.css
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,20 @@ div#logo img
display: none;
}

#ui_message
{
width:75%;
margin-left: 50px;
}
p.notification_message
{
background: transparent url(/content/img/icons/check.png) no-repeat center left;
}

p.info-message
{
background: transparent url(/content/img/icons/info.png) no-repeat center left;
}
/* Styles for editor and display helpers
----------------------------------------------------------*/
.display-label,
Expand Down Expand Up @@ -441,7 +455,7 @@ fieldset.send-message input[type="text"]

.main-area
{
float:left;
/*float:left;*/
width:100%;
}

Expand All @@ -461,17 +475,27 @@ fieldset.send-message input[type="text"]
}


.list
{
float:inherit;
}



/* Messages List
-----------------------*/

ul.side-menu li
#side-menu
{
display:inline-block;
width:110px;
margin-right:20px;
}

#messages-list
{
display:inline-block;
vertical-align:top;
margin-top:10px;
}

#side-menu ul li
{
margin-bottom:10px;
}
Expand Down Expand Up @@ -537,7 +561,8 @@ ul#search-results div.traveler-statusmsg
.add-icon, .logout-icon, .search-icon,
.trash-icon, .remove-icon, .new-icon, .inbox-icon,
.sent-icon, .send-message-icon, mail-icon, .edit-icon,
profile-icon, friends-icon
profile-icon, friends-icon, .notification_message,
.info-message
{
padding-left: 32px;
padding-top: 16px;
Expand Down Expand Up @@ -615,9 +640,6 @@ profile-icon, friends-icon
background: transparent url(/content/img/icons/users.png) no-repeat center left;
}




/* Profile
-----------*/

Expand Down
26 changes: 14 additions & 12 deletions src/TravelersAround.WebMvc/Views/Messages/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,20 @@
</p>

<div class="main-area">
<ul class="side-menu rounded-box">
<li>
@Html.ActionLink("Inbox", "Index", new { folder = "Inbox" }, new { @class = "inbox-icon" })
</li>
<li>
@Html.ActionLink("Sent", "Index", new { folder = "Sent" }, new { @class = "sent-icon" })
</li>
<li>
@Html.ActionLink("Trash", "Index", new { folder = "Trash" }, new { @class = "trash-icon" })
</li>
</ul>
<div class="list">
<div id="side-menu">
<ul class="rounded-box">
<li>
@Html.ActionLink("Inbox", "Index", new { folder = "Inbox" }, new { @class = "inbox-icon" })
</li>
<li>
@Html.ActionLink("Sent", "Index", new { folder = "Sent" }, new { @class = "sent-icon" })
</li>
<li>
@Html.ActionLink("Trash", "Index", new { folder = "Trash" }, new { @class = "trash-icon" })
</li>
</ul>
</div>
<div id="messages-list">
@if (Model.MessagesList.TotalEntitiesCount > 0)
{
using (Html.BeginForm("Delete", "Messages"))
Expand Down
2 changes: 1 addition & 1 deletion src/TravelersAround.WebMvc/Views/Search/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<div class="main-area">
@if (Model.Travelers.Entities.Count == 0)
{
<p>It seems that currently now there are no travelers around you</p>
<p class="info-message">It seems that currently now there are no travelers around you</p>
}
else
{
Expand Down
4 changes: 1 addition & 3 deletions src/TravelersAround.WebMvc/Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@

<div id="main">
<div id="content-container">
<div id="ui_message">
<span class="notification_message">@ViewBag.NotificationMessage</span>
</div>
@Html.Partial("_UiNotification")
@RenderBody()
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@if (ViewBag.NotificationMessage != null)
{
<div id="ui_message" class="rounded-box">
<p class="notification_message">@ViewBag.NotificationMessage</p>
</div>
}

0 comments on commit f87db0c

Please sign in to comment.