beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

eventlog: css and layout style tweaks

Browse source
This commit is contained in:
Hylke Bons 2012-09-24 18:14:42 +02:00
parent 8b228fbd3b
commit ab344dc92c
3 changed files with 15 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SparkleShare/Common/HTML/event-entry.html
View file

@ -1,6 +1,6 @@
<div class='event-entry' style='background-image: url("<!-- $event-avatar-url -->");'> <div class='event-entry'>
<div class='event-user-name'><!-- $event-user-name --></div> <div class='event-avatar' style='background-image: url("<!-- $event-avatar-url -->");'></div>
<div class='event-folder'><!-- $event-folder --><span><!-- $event-url --></span></div> <div class='event-user-name'><!-- $event-user-name --><span class='event-folder'><!-- $event-folder --></span></div>
<!-- $event-entry-content --> <!-- $event-entry-content -->

37
SparkleShare/Common/HTML/event-log.html
View file

@ -80,10 +80,8 @@
.day-entry-header { .day-entry-header {
color: #aaa; color: #aaa;
margin-left: auto; margin-left: 32px;
margin-right: auto;
display: block; display: block;
text-align: center;
padding-top: 24px; padding-top: 24px;
font-weight: bold; font-weight: bold;
} }
@ -110,38 +108,18 @@
font-weight: bold; font-weight: bold;
} }
.event-folder { .event-folder {
float: right;
color: <!-- $secondary-font-color -->; color: <!-- $secondary-font-color -->;
position: relative; font-size: 80%;
cursor: pointer;
}
.event-folder span {
display: none
}
.event-folder:hover span {
display: block;
position: absolute;
top: 20px;
right: 0;
background-color: rgba(20, 20, 20, 0.8);
color: #fafafa;
padding: 7px 12px;
border-radius: 5px;
font-family: sans-serif;
font-size: <!-- $small-font-size -->;
float: right;
} }
.event-entry { .event-entry {
padding-top: 24px; padding-top: 24px;
padding-bottom: 14px; padding-bottom: 14px;
border-bottom: 1px #ddd solid; border-bottom: 1px #ddd solid;
padding-left: 96px; padding-left: 64px;
padding-right: 32px; margin-left: 32px;
margin-right: 32px;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 36px 24px; background-position: 36px 24px;
display: block; display: block;
@ -232,9 +210,12 @@
background-position: top center; background-position: top center;
} }
.buddy-icon { .event-avatar {
width: 48px; width: 48px;
height: 48px; height: 48px;
border-radius: 4px;
position: absolute;
left: 32px;
} }
</style> </style>
</head> </head>

6
SparkleShare/SparkleEventLogController.cs
View file

@ -311,14 +311,14 @@ namespace SparkleShare {
timestamp = change_set.FirstTimestamp.ToString ("H:mm") + " – " + timestamp; timestamp = change_set.FirstTimestamp.ToString ("H:mm") + " – " + timestamp;
} }
if (this.selected_folder == null)
event_entry_html = event_entry_html.Replace ("<!-- $event-folder -->", change_set.Folder.Name);
event_entries += event_entry_html.Replace ("<!-- $event-entry-content -->", event_entry) event_entries += event_entry_html.Replace ("<!-- $event-entry-content -->", event_entry)
.Replace ("<!-- $event-user-name -->", change_set.User.Name) .Replace ("<!-- $event-user-name -->", change_set.User.Name)
.Replace ("<!-- $event-avatar-url -->", change_set_avatar) .Replace ("<!-- $event-avatar-url -->", change_set_avatar)
.Replace ("<!-- $event-url -->", change_set.RemoteUrl.ToString ()) .Replace ("<!-- $event-url -->", change_set.RemoteUrl.ToString ())
.Replace ("<!-- $event-revision -->", change_set.Revision); .Replace ("<!-- $event-revision -->", change_set.Revision);
if (this.selected_folder == null)
event_entries = event_entries.Replace ("<!-- $event-folder -->", " @ " + change_set.Folder.Name);
} }
string day_entry = ""; string day_entry = "";