Put back Tihomirs lost changes

This commit is contained in:
Richard Flamsholt 2013-11-08 04:05:45 +01:00
Родитель 26b6c737ff
Коммит 822a7351d9
5 изменённых файлов: 73 добавлений и 2 удалений

Просмотреть файл

@ -8,6 +8,6 @@
</MobileProjectProvisionSettings>
<SolutionSettings xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.datacontract.org/2004/07/Telerik.BlackDragon.Client.Modules.Settings">
<BuildConfiguration>Debug</BuildConfiguration>
<StartUpProject>Eventer</StartUpProject>
<StartUpProject i:nil="true" />
</SolutionSettings>
</JustDevelopSettings>

Просмотреть файл

@ -19,6 +19,10 @@
</section>
<!--WELCOME VIEW -->
<div data-role="view" id="welcome" data-layout="default" class="welcome-scrn form-view" data-model="app.viewModels.login">
<script>
app.viewModels.login.login();
</script>
<!--
<h1><b>Whee!</b> sample application</h1>
<form id="login-form">
<ul data-role="listview" data-style="inset">
@ -39,6 +43,7 @@
</ol>
<div data-role="footer"><p>Powered by Icenium Everlive.</p></div>
-->
</div>
</body>
</html>

Просмотреть файл

@ -629,3 +629,33 @@ background-color: #A36A57;
}
/* Team15 code starts here */
.event-white-box {
padding: 1rem;
background-color: #fff;
clear: both;
color: #000 !important;
font-size: 1rem;
line-height: 1.4;
-webkit-box-shadow: 0 3px 5px rgba(0, 0, 0, 0.5);
box-shadow: 0 3px 5px rgba(0, 0, 0, 0.5);
text-align: center;
}
.event-title {
font-size: 1.5rem;
}
.event-title-desc {
font-size: 1rem;
}
.event-join-btn
{
padding: .5em .5em;
padding-left: 3em;
padding-right: 3em;
font-size: 1.3em;
font-weight: normal;
}

Просмотреть файл

@ -0,0 +1,36 @@
<div data-role="view" id="single-activity" data-layout="default" class="activities-view" data-show="app.viewModels.event.show">
<script>
</script>
<header data-role="header">
<div data-role="navbar">
Event
<a class="nav-button" data-align="left" data-role="backbutton">Back</a>
</div>
</header>
<div id="status-container" class="user-status-wrp" data-role="listview" data-style="inset">
<img data-bind="attr:{src: CoverImageURL()}" style="width: 292px; height: 140px;" />
<div class="event-white-box">
<span data-bind="text: Title" class="event-title"></span>
</div>
<div class="event-white-box" style="padding: 0;">
<span data-bind="text: LocationDescription" class="event-title-desc"></span>
<br />
<span data-bind="text: StartTimeFormatted()" class="event-title-desc"></span>
</div>
<div class="event-white-box">
<button id="joinBtn" class="event-join-btn">Join!</button>
</div>
<!--
<div class="user-info">
<img data-bind="attr:{src: User().PictureUrl}" alt="styles/images/avatar.png" />
<h2 id="personName" data-bind='text: User().DisplayName'></h2>
<time id="activityDate" data-bind="text: CreatedAtFormatted"></time>
</div>
<img id="picture" data-bind="attr:{src: PictureUrl()}" width="100%"/>
<div class="user-share">
<span id="activityText" data-bind="text: Text" class="user-share-txt"></span>
</div>
-->
</div>
</div>

Просмотреть файл

@ -23,7 +23,7 @@
<time class="timeSpan">${StartTimeFormatted()}</time>
</div>
<div>
<img src="${CoverImageURL()}" style="width: 291px; height: 140px;" />
<img src="${CoverImageURL()}" style="width: 292px; height: 140px;" />
</div>
<div class="user-share">
<a class="user-share-txt">${Description}</a>