Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

adding notification window and footer tweaks

  • Loading branch information...
commit 8316220a47d0ef71a45c6da56574c2855c4e37bb 1 parent 15b0ab3
@drusellers drusellers authored
View
68 DovetailTheme.6.0.ReSharper.user
@@ -1,16 +1,44 @@
<Configuration>
<RecentFiles>
<RecentFiles>
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Actions/d:Updates/f:Updates.spark" caret="78" fromTop="2" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Actions/d:Updates/f:UpdatesViewAction.cs" caret="367" fromTop="12" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Actions/d:Home/f:HomeAction.cs" caret="0" fromTop="0" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:content/d:scripts/f:dovetail.notification.js" caret="300" fromTop="9" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Actions/d:Home/f:Home.spark" caret="0" fromTop="0" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Form.spark" caret="0" fromTop="0" />
<File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Fluid.spark" caret="0" fromTop="0" />
- <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Form.spark" caret="43" fromTop="0" />
- <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Fixed.spark" caret="19" fromTop="0" />
- <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Baseline.spark" caret="56" fromTop="1" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Fixed.spark" caret="0" fromTop="0" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Baseline.spark" caret="0" fromTop="0" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Master.spark" caret="2379" fromTop="55" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Application.spark" caret="556" fromTop="25" />
</RecentFiles>
<RecentEdits>
<File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Baseline.spark" caret="56" fromTop="1" />
<File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Fluid.spark" caret="19" fromTop="0" />
<File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Fixed.spark" caret="19" fromTop="0" />
<File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Form.spark" caret="43" fromTop="0" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Actions/d:Updates/f:UpdatesViewAction.cs" caret="626" fromTop="15" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Actions/d:Updates/f:UpdatesViewAction.cs" caret="528" fromTop="21" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Actions/d:Updates/f:UpdatesViewAction.cs" caret="378" fromTop="15" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Actions/d:Updates/f:UpdatesViewAction.cs" caret="330" fromTop="10" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Actions/d:Updates/f:Updates.spark" caret="78" fromTop="2" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Master.spark" caret="901" fromTop="17" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:content/d:scripts/f:dovetail.notification.js" caret="637" fromTop="9" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:content/d:scripts/f:dovetail.notification.js" caret="637" fromTop="4" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Master.spark" caret="1456" fromTop="26" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:content/d:scripts/f:dovetail.notification.js" caret="637" fromTop="3" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:content/d:scripts/f:dovetail.notification.js" caret="592" fromTop="2" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:content/d:scripts/f:dovetail.notification.js" caret="592" fromTop="14" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:content/d:scripts/f:dovetail.notification.js" caret="303" fromTop="9" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:content/d:scripts/f:dovetail.notification.js" caret="106" fromTop="3" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:content/d:scripts/f:dovetail.notification.js" caret="628" fromTop="19" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:content/d:scripts/f:dovetail.notification.js" caret="300" fromTop="9" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Master.spark" caret="2213" fromTop="50" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Master.spark" caret="2219" fromTop="51" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Master.spark" caret="2379" fromTop="55" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Application.spark" caret="728" fromTop="27" />
+ <File id="4CBF5A5B-72B5-45C8-BCEB-6E0A81795243/d:Shared/f:Application.spark" caret="556" fromTop="25" />
</RecentEdits>
</RecentFiles>
<NAntValidationSettings>
@@ -31,4 +59,38 @@
<setting name="SolutionAnalysisEnabled">False</setting>
</boolean>
</SettingsComponent>
+ <CompletionStatisticsManager>
+ <ItemStatistics item="CSharpCodeCompletionContext">
+ <Item value="public" priority="156" />
+ <Item value="class" priority="92" />
+ <Item value="UpdatesListView`0" priority="31" />
+ <Item value="UpdatesRequest`0" priority="31" />
+ <Item value="return" priority="31" />
+ <Item value="new" priority="96" />
+ <Item value="UpdatesListView" priority="28" />
+ <Item value="string" priority="31" />
+ <Item value="UpdateItem`0" priority="30" />
+ <Item value="Items" priority="31" />
+ <Item value="UpdateItem" priority="28" />
+ <Item value="Description" priority="31" />
+ </ItemStatistics>
+ <ItemStatistics item="CssCodeCompletionContext">
+ <Item value="background" priority="5" />
+ </ItemStatistics>
+ <ItemStatistics item="JavaScriptSpecificContext">
+ <Item value="function" priority="43" />
+ <Item value="$" priority="49" />
+ <Item value="$div" priority="19" />
+ <Item value="$button" priority="19" />
+ <Item value="$window" priority="29" />
+ <Item value="event" priority="10" />
+ </ItemStatistics>
+ <ItemStatistics item="JavaScriptSpecificContextQualified">
+ <Item value="append" priority="8" />
+ <Item value="attr" priority="8" />
+ <Item value="hide" priority="18" />
+ <Item value="position" priority="8" />
+ <Item value="show" priority="8" />
+ </ItemStatistics>
+ </CompletionStatisticsManager>
</Configuration>
View
3  dovetail.less
@@ -40,3 +40,6 @@
@import "lib/bootstrap/lib/patterns.less";
@import "lib/bootstrap.extensions/lib/patterns.less";
+
+@import "lib/dovetail/notifications.less";
+@import "lib/dovetail/footer.less";
View
1  lessc.bat
@@ -0,0 +1 @@
+"./tools/dotless/dotless.Compiler.exe" -w ./dovetail.less ./%1
View
12 lib/dovetail/footer.less
@@ -0,0 +1,12 @@
+footer {
+ background: darken(@white, 20%);
+ .border-radius(0 0 4px 4px);
+ margin-top:0;
+ padding-top:5px;
+ text-align:left;
+ overflow:hidden;
+
+ p {
+ padding-bottom:6px;
+ }
+}
View
18 lib/dovetail/notifications.less
@@ -0,0 +1,18 @@
+#notification {
+ background: @red;
+ padding:5px;
+ margin: -3px 0 0 0;
+ .border-radius(4px);
+ width:15px;
+ text-align:center;
+ color:@white;
+ font-weight:bold;
+}
+
+#notification-window {
+ border:2px solid @gray;
+ .border-radius(0 0 4px 4px);
+ width:200px;
+ min-height:300px;
+ background:@white;
+}
View
3  src/DovetailTheme/Actions/Updates/Updates.spark
@@ -0,0 +1,3 @@
+<viewdata model="DovetailTheme.Actions.Updates.UpdatesListView" />
+
+stuff hi
View
31 src/DovetailTheme/Actions/Updates/UpdatesViewAction.cs
@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+
+namespace DovetailTheme.Actions.Updates
+{
+ public class UpdatesViewAction
+ {
+ public UpdatesListView Execute(UpdatesRequest request)
+ {
+ return new UpdatesListView()
+ {
+ Items = {new UpdateItem(){Description = "hi"}}
+ };
+ }
+ }
+
+
+ public class UpdatesListView
+ {
+ public IList<UpdateItem> Items { get; set; }
+ }
+
+ public class UpdateItem
+ {
+ public string Description { get; set; }
+ }
+
+ public class UpdatesRequest
+ {
+
+ }
+}
View
107 src/DovetailTheme/DovetailTheme.csproj
@@ -87,8 +87,114 @@
</Reference>
</ItemGroup>
<ItemGroup>
+ <None Include="Actions\Updates\Updates.spark" />
+ <None Include="content\styles\lib\.style.less.swo" />
+ <None Include="content\styles\lib\bootstrap.less" />
+ <None Include="content\styles\lib\forms.less" />
+ <None Include="content\styles\lib\patterns.less" />
+ <None Include="content\styles\lib\preboot.less" />
+ <None Include="content\styles\lib\reset.less" />
+ <None Include="content\styles\lib\scaffolding.less" />
+ <None Include="content\styles\lib\style.less" />
+ <None Include="content\styles\lib\tables.less" />
+ <None Include="content\styles\lib\type.less" />
+ <None Include="content\type\Acknowledgement-webfont.eot" />
+ <None Include="content\type\Acknowledgement-webfont.ttf" />
+ <None Include="content\type\Acknowledgement-webfont.woff" />
+ <None Include="content\type\edition_-webfont.eot" />
+ <None Include="content\type\edition_-webfont.ttf" />
+ <None Include="content\type\edition_-webfont.woff" />
+ <None Include="content\type\League-Gothic-fontfacekit\League_Gothic-webfont.eot" />
+ <None Include="content\type\League-Gothic-fontfacekit\League_Gothic-webfont.ttf" />
+ <None Include="content\type\League-Gothic-fontfacekit\League_Gothic-webfont.woff" />
+ <None Include="content\type\League_Gothic-webfont.eot" />
+ <None Include="content\type\League_Gothic-webfont.ttf" />
+ <None Include="content\type\League_Gothic-webfont.woff" />
+ <None Include="content\type\Sansation_Bold-webfont.eot" />
+ <None Include="content\type\Sansation_Bold-webfont.ttf" />
+ <None Include="content\type\Sansation_Bold-webfont.woff" />
+ <None Include="content\type\Sansation_Light-webfont.eot" />
+ <None Include="content\type\Sansation_Light-webfont.ttf" />
+ <None Include="content\type\Sansation_Light-webfont.woff" />
+ <None Include="content\type\Sansation_Regular-webfont.eot" />
+ <None Include="content\type\Sansation_Regular-webfont.ttf" />
+ <None Include="content\type\Sansation_Regular-webfont.woff" />
+ <None Include="content\type\Vollkorn-Bold-webfont.eot" />
+ <None Include="content\type\Vollkorn-Bold-webfont.ttf" />
+ <None Include="content\type\Vollkorn-Bold-webfont.woff" />
+ <None Include="content\type\Vollkorn-BoldItalic-webfont.eot" />
+ <None Include="content\type\Vollkorn-BoldItalic-webfont.ttf" />
+ <None Include="content\type\Vollkorn-BoldItalic-webfont.woff" />
+ <None Include="content\type\Vollkorn-Italic-webfont.eot" />
+ <None Include="content\type\Vollkorn-Italic-webfont.ttf" />
+ <None Include="content\type\Vollkorn-Italic-webfont.woff" />
+ <None Include="content\type\Vollkorn-Regular-webfont.eot" />
+ <None Include="content\type\Vollkorn-Regular-webfont.ttf" />
+ <None Include="content\type\Vollkorn-Regular-webfont.woff" />
<None Include="Shared\Baseline.spark" />
<None Include="Actions\Home\Home.spark" />
+ <Content Include="content\favicon.ico" />
+ <Content Include="content\images\dt-logo-60.png" />
+ <Content Include="content\images\dt-logo-trans-35.png" />
+ <Content Include="content\images\dt-logo-trans-40.png" />
+ <Content Include="content\images\dt-logo-trans.png" />
+ <Content Include="content\images\large_logo.png" />
+ <Content Include="content\images\search-btn.png" />
+ <Content Include="content\images\sm_spritex16.png" />
+ <Content Include="content\images\sm_spritex32.png" />
+ <Content Include="content\images\ssc_moose.png" />
+ <Content Include="content\images\stc_patt.jpg" />
+ <Content Include="content\images\sweet-icons-settings--white-32.png" />
+ <Content Include="content\images\sweet-icons-settings-32.png" />
+ <Content Include="content\images\transparent.gif" />
+ <Content Include="content\index.html" />
+ <Content Include="content\scripts\dovetail.notification.js" />
+ <Content Include="content\scripts\dovetail.autocomplete.js" />
+ <Content Include="content\scripts\jquery-1.6.2.min.js" />
+ <Content Include="content\scripts\jquery-ui-1.8.15.custom.min.js" />
+ <Content Include="content\scripts\jquery.metadata.js" />
+ <Content Include="content\scripts\jquery.smart_autocomplete.js" />
+ <Content Include="content\scripts\jquery.tmpl.js" />
+ <Content Include="content\scripts\jquery.tmpl.min.js" />
+ <Content Include="content\scripts\jquery.tmplPlus.js" />
+ <Content Include="content\scripts\jquery.tmplplus.min.js" />
+ <Content Include="content\scripts\jquery.ui.ajax.dialog.js" />
+ <Content Include="content\styles\960.css" />
+ <Content Include="content\styles\bootstrap.css" />
+ <Content Include="content\styles\dovetail\images\transparent.gif" />
+ <Content Include="content\styles\dovetail\images\ui-bg_flat_0_aaaaaa_40x100.png" />
+ <Content Include="content\styles\dovetail\images\ui-bg_glass_55_fbf9ee_1x400.png" />
+ <Content Include="content\styles\dovetail\images\ui-bg_glass_65_ffffff_1x400.png" />
+ <Content Include="content\styles\dovetail\images\ui-bg_glass_75_dadada_1x400.png" />
+ <Content Include="content\styles\dovetail\images\ui-bg_glass_75_e6e6e6_1x400.png" />
+ <Content Include="content\styles\dovetail\images\ui-bg_glass_75_ffffff_1x400.png" />
+ <Content Include="content\styles\dovetail\images\ui-bg_highlight-soft_75_cccccc_1x100.png" />
+ <Content Include="content\styles\dovetail\images\ui-bg_inset-soft_95_fef1ec_1x100.png" />
+ <Content Include="content\styles\dovetail\images\ui-icons_222222_256x240.png" />
+ <Content Include="content\styles\dovetail\images\ui-icons_2e83ff_256x240.png" />
+ <Content Include="content\styles\dovetail\images\ui-icons_454545_256x240.png" />
+ <Content Include="content\styles\dovetail\images\ui-icons_888888_256x240.png" />
+ <Content Include="content\styles\dovetail\images\ui-icons_cd0a0a_256x240.png" />
+ <Content Include="content\styles\dovetail\jquery-ui-1.8.15.custom.css" />
+ <Content Include="content\styles\dovetail\jquery-ui-1.8.15.custom.extensions.css" />
+ <Content Include="content\styles\reset.css" />
+ <Content Include="content\styles\structure.css" />
+ <Content Include="content\styles\style.css" />
+ <Content Include="content\type\Acknowledgement-webfont.svg" />
+ <Content Include="content\type\Bernd Montag License.txt" />
+ <Content Include="content\type\edition_-webfont.svg" />
+ <Content Include="content\type\League-Gothic-fontfacekit\demo.html" />
+ <Content Include="content\type\League-Gothic-fontfacekit\League_Gothic-webfont.svg" />
+ <Content Include="content\type\League-Gothic-fontfacekit\SIL Open Font License 1.1.txt" />
+ <Content Include="content\type\League-Gothic-fontfacekit\stylesheet.css" />
+ <Content Include="content\type\League_Gothic-webfont.svg" />
+ <Content Include="content\type\Sansation_Bold-webfont.svg" />
+ <Content Include="content\type\Sansation_Light-webfont.svg" />
+ <Content Include="content\type\Sansation_Regular-webfont.svg" />
+ <Content Include="content\type\Vollkorn-Bold-webfont.svg" />
+ <Content Include="content\type\Vollkorn-BoldItalic-webfont.svg" />
+ <Content Include="content\type\Vollkorn-Italic-webfont.svg" />
+ <Content Include="content\type\Vollkorn-Regular-webfont.svg" />
<Content Include="Web.config" />
<None Include="Shared\Form.spark" />
<None Include="Shared\Application.spark" />
@@ -98,6 +204,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Actions\Home\HomeAction.cs" />
+ <Compile Include="Actions\Updates\UpdatesViewAction.cs" />
<Compile Include="App_Start\FubuMVC.cs" />
<Compile Include="ConfigureFubuMVC.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
View
6 src/DovetailTheme/Shared/Application.spark
@@ -21,7 +21,11 @@
</div>
<footer>
- <p>&copy; Company 2011</p>
+
+ <p>
+ <span style="float:left;margin-left:10px;"> &copy; Dovetail Software Inc. 2011 - <em>Version: 1.0.2.3</em></span>
+ <span style="float:right;" class="label notice"><a href="#">debug info</a> </span>
+ </p>
</footer>
</div>
View
13 src/DovetailTheme/Shared/Master.spark
@@ -16,6 +16,7 @@
<link rel="stylesheet" href="~/content/styles/bootstrap.css" type="text/css" media="screen"/>
<link rel="stylesheet" href="~/content/styles/dovetail/jquery-ui-1.8.15.custom.css" type="text/css" media="screen"/>
<link rel="stylesheet" href="~/content/styles/dovetail/jquery-ui-1.8.15.custom.extensions.css" type="text/css" media="screen"/>
+
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
<script src="~/content/scripts/jquery-ui-1.8.15.custom.min.js"></script>
<script src="~/content/scripts/jquery.ui.ajax.dialog.js"></script>
@@ -23,6 +24,8 @@
<script src="~/content/scripts/jquery.metadata.js"></script>
<script src="~/content/scripts/jquery.smart_autocomplete.js"></script>
<script src="~/content/scripts/dovetail.autocomplete.js"></script>
+ <script src="~/content/scripts/dovetail.notification.js"></script>
+
<script type="text/javascript">
/* HtmlTags uses this syntax for Metadata */
if (jQuery.metadata) {
@@ -40,8 +43,18 @@
<li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li>
<li><a href="#contact">Contact</a></li>
+
</ul>
+ <ul class="nav secondary-nav">
+ <li><a href=""><div id="notification">0</div></a></li>
+ <li><a href="#">Cog</a></li>
+ <li class="dropdown"><a href="#" class="dropdown-toggle">Ryan Rauh</a></li>
+ <ul class="dropdown-menu">
+ <li><a href="#">Logout</a></li>
+ </ul>
+ </li>
+ </ul>
</div>
</div>
</div>
View
24 src/DovetailTheme/content/scripts/dovetail.notification.js
@@ -0,0 +1,24 @@
+(function ($) {
+ $(function () {
+ $button = $('#notification');
+ $window = $("<div>DRU</div>");
+ $window.attr("id", "notification-window");
+ $window.hide();
+ $('body').append($window);
+
+ $button.click(function (event) {
+ $window.toggle();
+
+ //TODO: track scroll on window?
+ $window.position({
+ of: $button,
+ my: 'left top',
+ at: 'left bottom',
+ offset: '0 11'
+ });
+ event.preventDefault();
+ });
+
+ //TODO: add hide
+ });
+})(jQuery);
View
35 src/DovetailTheme/content/styles/bootstrap.css
@@ -2412,4 +2412,37 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
*
* Patterns.less
* Repeatable UI elements outside the base styles provided from the scaffolding
- * ---------------------------------------------------------------------------- */
+ * ---------------------------------------------------------------------------- */#notification {
+ background: #9d261d;
+ padding: 5px;
+ margin: -3px 0 0 0;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ width: 15px;
+ text-align: center;
+ color: white;
+ font-weight: bold;
+}
+#notification-window {
+ border: 2px solid gray;
+ -webkit-border-radius: 0 0 4px 4px;
+ -moz-border-radius: 0 0 4px 4px;
+ border-radius: 0 0 4px 4px;
+ width: 200px;
+ min-height: 300px;
+ background: white;
+}
+footer {
+ background: #cccccc;
+ -webkit-border-radius: 0 0 4px 4px;
+ -moz-border-radius: 0 0 4px 4px;
+ border-radius: 0 0 4px 4px;
+ margin-top: 0;
+ padding-top: 5px;
+ text-align: left;
+ overflow: hidden;
+}
+footer p {
+ padding-bottom: 6px;
+}
Please sign in to comment.
Something went wrong with that request. Please try again.