Permalink
Browse files

Moved the CSS for rounded corners into demo.css.

  • Loading branch information...
1 parent 9645799 commit fac5291c679aa8b12ad5c761fab3f6c0cfefd165 deiu committed Apr 29, 2012
Showing with 46 additions and 14 deletions.
  1. +2 −0 css/bootstrap.css
  2. +6 −0 css/demo.css
  3. +3 −14 header.php
  4. +35 −0 messages.php
View
@@ -130,6 +130,7 @@ textarea {
-ms-box-sizing: border-box;
box-sizing: border-box;
}
+
body {
margin: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -425,6 +426,7 @@ ol {
li {
line-height: 18px;
}
+
ul.unstyled,
ol.unstyled {
margin-left: 0;
View
@@ -14,6 +14,12 @@
margin-bottom: 0.5em;
}
+.rounded {
+ -webkit-border-radius: 3px 3px 3px 3px;
+ -moz-border-radius: 3px 3px 3px 3px;
+ border-radius: 3px 3px 3px 3px;
+}
+
#dialog_link,#modal_link {
padding: .4em 1em .4em 20px;
text-decoration: none;
View
@@ -73,17 +73,6 @@
border: 0;
}
- #rounded {
- border-color: #ccc;
- border-color: rgba(0, 0, 0, 0.2);
- border-style: solid;
- border-width: 0px;
- -webkit-border-radius: 3px 3px 3px 3px;
- -moz-border-radius: 3px 3px 3px 3px;
- border-radius: 3px 3px 3px 3px;
- }
-
-
</style>
<link rel="SHORTCUT ICON" href="favicon.png" />
@@ -134,16 +123,16 @@
// Wall message
$pbg = ($private_msg > 0) ? '#dc4212;' : 'grey';
- echo "<li class=\"dropdown\"><a data-toggle=\"dropdown\" class=\"dropdown-toggle\" href=\"#menu2\"><table><tr><td id=\"rounded\" style=\"padding: 2px 9px 2px 9px; color: white; background-color: " . $bg . "\">" . $messages . "</td><td> <b class=\"caret\"></b></td></tr></table></a>";
+ echo "<li class=\"dropdown\"><a data-toggle=\"dropdown\" class=\"dropdown-toggle\" href=\"#menu2\"><table><tr><td class=\"rounded\" style=\"padding: 2px 9px 2px 9px; color: white; background-color: " . $bg . "\">" . $messages . "</td><td> <b class=\"caret\"></b></td></tr></table></a>";
echo "<ul class=\"dropdown-menu\">\n";
echo "<li><a href=\"messages.php\">";
- echo "<div id=\"rounded\" style=\"float: left; margin-right: 5px; padding: 0px 7px 0px 7px; color: white; background-color: " . $pbg . "\">" . $private_msg . "</div><div align=\"left\">Message";
+ echo "<div class=\"rounded\" style=\"float: left; margin-right: 5px; padding: 0px 7px 0px 7px; color: white; background-color: " . $pbg . "\">" . $private_msg . "</div><div align=\"left\">Message";
// add plural if more than 1 message or less than one message (0 messages)
echo ($private_msg != 1) ? 's' : '';
echo "</div>\n";
echo "</a></li>\n";
echo "<li><a href=\"wall.php?user=" . $_SESSION['user_hash'] . "\">";
- echo "<div id=\"rounded\" style=\"float: left; margin-right: 5px; padding: 0px 7px 0px 7px; color: white; background-color: " . $wbg . "\">" . $wall_msg . "</div><div align=\"left\">Wall messages</div>\n";
+ echo "<div class=\"rounded\" style=\"float: left; margin-right: 5px; padding: 0px 7px 0px 7px; color: white; background-color: " . $wbg . "\">" . $wall_msg . "</div><div align=\"left\">Wall messages</div>\n";
echo "</a></li>\n";
echo "<li class=\"divider\"></li>\n";
echo "<li><a href=\"messages.php?new=true\">Send message</a></li>\n";
View
@@ -115,6 +115,39 @@
// proceed only if we have a valid pingback resource
if ($triple['o'] == 'http://purl.org/net/pingback/Container') {
+ /*
+ $ret .= '<script>
+ $.ajax({
+ url: "' . $pingback_service . '",
+ type: "POST",
+ data: {source: "' . $source. '", target: "' . $to . '", comment: "' . $comment . '"},
+ statusCode: {
+ 200: function () {
+ alert("Success!");
+ },
+ 201: function () {
+ alert("Success!");
+ }
+ }
+ });
+ // ------- OR ------- //
+ var request = $.ajax({
+ url: "' . $pingback_service . '",
+ type: "POST",
+ data: {source: "' . $source. '", target: "' . $to . '", comment: "' . $comment . '"},
+ dataType: "html"
+ });
+
+ request.done(function() {
+ alert("Success");
+ });
+
+ request.done(function(jqXHR, textStatus) {
+ alert( "Request failed: " + textStatus );
+ });
+ </script>';
+ */
+
$fields = array ('source' => $source,
'target' => $to,
'comment' => $comment
@@ -143,6 +176,8 @@
$ret .= "<p>Details:</p>\n";
$ret .= "</p>" . $return . "</p>\n";
}
+*/
+
break;
}
}

0 comments on commit fac5291

Please sign in to comment.