Author: maxfranz
Date: 2010-06-29 08:37:53 -0700 (Tue, 29 Jun 2010)
New Revision: 20719
Added:
cytoscapeweb/trunk/website/src/php/content/contact/
cytoscapeweb/trunk/website/src/php/content/contact/info.declaration.php
cytoscapeweb/trunk/website/src/php/content/contact/info.php
cytoscapeweb/trunk/website/src/php/content/contact/write.declaration.php
cytoscapeweb/trunk/website/src/php/content/contact/write.php
Removed:
cytoscapeweb/trunk/website/src/php/content/contact.php
Modified:
cytoscapeweb/trunk/website/src/css/content/contact.css
cytoscapeweb/trunk/website/src/css/content/demo.css
cytoscapeweb/trunk/website/src/css/content/home.css
cytoscapeweb/trunk/website/src/css/layout.css
cytoscapeweb/trunk/website/src/js/content/demo.js
cytoscapeweb/trunk/website/src/js/layout/side.js
cytoscapeweb/trunk/website/src/php/content/contact.declaration.php
cytoscapeweb/trunk/website/src/php/content/home.php
cytoscapeweb/trunk/website/src/php/layout/declaration.php
Log:
fixing add node issue; fixing visual style issue; splitting contact page;
Modified: cytoscapeweb/trunk/website/src/css/content/contact.css
===================================================================
--- cytoscapeweb/trunk/website/src/css/content/contact.css 2010-06-29
15:36:02 UTC (rev 20718)
+++ cytoscapeweb/trunk/website/src/css/content/contact.css 2010-06-29
15:37:53 UTC (rev 20719)
@@ -1,8 +1,8 @@
-#content .left label { display: block; margin: 2em 0 0 0; }
-#content .left input, #content .left textarea { width: 25em; }
-#content .left input[disabled], #content .left textarea[disabled] { color:
#000000; }
-#content .left button { margin: 2em 0 0 0; }
-#content .left textarea { height: 10em; }
+#content form label { display: block; margin: 2em 0 0 0; }
+#content form input, #content form textarea { width: 25em; }
+#content form input[disabled], #content form textarea[disabled] { color:
#000000; }
+#content form button { margin: 2em 0 0 0; }
+#content form textarea { height: 10em; }
.example { color: #909090; display: none; }
.ui-validation-completion { margin-left: -20px; margin-top: 3px; }
#error_msg { display: none; }
Modified: cytoscapeweb/trunk/website/src/css/content/demo.css
===================================================================
--- cytoscapeweb/trunk/website/src/css/content/demo.css 2010-06-29 15:36:02 UTC
(rev 20718)
+++ cytoscapeweb/trunk/website/src/css/content/demo.css 2010-06-29 15:37:53 UTC
(rev 20719)
@@ -1,10 +1,10 @@
/* overall style */
body.demo { left: 0; width: 100%; margin: 0; line-height: 1; }
#header-resizer { height: 0; width: 0; }
-body.demo #logo { margin-left: 1em; margin-right: 5em; }
-body.demo #header .text { margin: 0; }
-body.demo #header .text * { text-align: left; }
-body.demo #header h1 { clear: none; padding: 0; margin-top: 0.7em;
border-bottom: 0px solid; }
+body.demo #logo { margin-left: 1em; }
+body.demo #header .message { padding: 0.2em 0.2em 0 0.2em; margin: 0.5em;
position: absolute; bottom: 0; left: 210px; background-color: #fffff0; border:
1px solid #ffff00; }
+body.demo #header .message * { text-align: left; }
+body.demo #header .title { text-transform: uppercase; font-weight: bold; }
body.demo #page, body.demo #copyright, body.demo #navigation_links, body.demo
#search, body.demo #content, body.demo #footer { display: none; }
#cytoweb, #side { border: 1px #cfcfcf solid; -moz-box-shadow: 0 0 50px #bbb;
-webkit-box-shadow: 0 0 50px #bbb; box-shadow: 0 0 50px #bbb; }
.ui-dialog { -moz-box-shadow: 0 0 50px #bbb; -webkit-box-shadow: 0 0 50px
#bbb; box-shadow: 0 0 50px #bbb; }
Modified: cytoscapeweb/trunk/website/src/css/content/home.css
===================================================================
--- cytoscapeweb/trunk/website/src/css/content/home.css 2010-06-29 15:36:02 UTC
(rev 20718)
+++ cytoscapeweb/trunk/website/src/css/content/home.css 2010-06-29 15:37:53 UTC
(rev 20719)
@@ -22,12 +22,12 @@
/* about */
#about { width: 570px; float: left; margin: 0 50px 0 0; font-size: 1.25em; }
-#use_line { height: 23px; line-height: 23px; width: 100%; text-align: center; }
+#use_line { height: 23px; line-height: 23px; width: 100%; text-align: center;
font-size: 0.85em; }
#example { position: relative; width: 570px; height: 475px; background: red;
background: url("../../img/bg/browser_screen_with_peterson.png"); }
#viz, #loader { width: 543px; height: 410px; margin: 0; position: absolute;
top: 51px; left: 13px; }
#loader { display: none; background-color: #ffffff; background-image:
url("../../img/layout/loader.gif"); opacity: 0.999 /*Firefox needs it to fire
the ready event!*/; z-index: 1; background-repeat: no-repeat;
background-position: center center;}
#location { position: absolute; height: 10px; width: 325px; left: 63px; top:
26px; line-height: 10px; padding-left: 2px; font-size: 8px; cursor: default; }
/* note */
-#note { margin: 15px 0 10px 0; padding: 0.25em 0; text-align: center;
background: #d9ecee url("../../img/bg/network_bg.png") left center no-repeat; }
+#note { margin: 15px 0 10px 0; padding: 0.25em 0; text-align: center;
background: #d9ecee; }
#note p { padding: 0; }
\ No newline at end of file
Modified: cytoscapeweb/trunk/website/src/css/layout.css
===================================================================
--- cytoscapeweb/trunk/website/src/css/layout.css 2010-06-29 15:36:02 UTC
(rev 20718)
+++ cytoscapeweb/trunk/website/src/css/layout.css 2010-06-29 15:37:53 UTC
(rev 20719)
@@ -62,15 +62,16 @@
/* cytoweb logo */
#logo { float: left; height: 72px; width: 188px; margin: 8px; background:
url("../img/layout/cytoscape_web_logo.png") no-repeat; }
#logo div { padding: 10px 0 0 78px; color: #000000; font-size: 1.75em;
font-family: Tahoma,Gill Sans,Arial,sans-serif; line-height: 1; }
-#search { float: right; height: 22px; margin: 30px 0 0 0; border: #c1c1c1
solid 1px; border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius:
4px; }
+#search { display: none; float: right; height: 22px; margin: 30px 0 0 0;
border: #c1c1c1 solid 1px; border-radius: 4px; -moz-border-radius: 4px;
-webkit-border-radius: 4px; }
#search.focus { -moz-box-shadow: 0 0 5px #0b94b1; -webkit-box-shadow: 0 0 5px
#0b94b1; box-shadow: 0 0 5px #0b94b1; }
#search input:focus { -moz-box-shadow: none; -webkit-box-shadow: none;
box-shadow: none; }
#search input { background-color: #ffffff; padding: 0.25em; outline: none;
border: none; color: #c1c1c1; border: 0; }
#search input:focus { color: #000000; }
#search_input { float: left; }
#search_button { cursor: pointer; float: left; width: 22px; height: 100%;
background: #aeaeae url("../img/layout/go.png") no-repeat center center;
border-radius: 0; -moz-border-radius: 0; -webkit-border-radius: 0; }
+.warning { background-color: #fffff0; border: 1px solid #ffff00; }
+.warning strong { text-transform: uppercase; font-weight: bold; }
-
/* copyright */
#copyright { text-align: right; font-size: 80%; color: #c6c6c6; float: right;
width: 100%; margin-top: -2em; }
@@ -115,7 +116,7 @@
#content.side .right .nav a:hover { text-decoration: underline; }
#content.side .right .nav li.selected { background-color: #0b94b1;
border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; }
#content.side .right .nav li.selected a { color: #ffffff; }
- #next_section_link { padding: 25px; margin: 2em -25px -25px -25px;
cursor: pointer; }
- #prev_section_link { padding: 25px; margin: -25px; cursor: pointer; }
- #prev_section_link a, #next_section_link a { text-decoration: none; }
- #prev_section_link:hover a, #next_section_link:hover a {
text-decoration: underline; }
\ No newline at end of file
+ #next_section_link { padding: 25px; margin: 2em -25px -25px -25px;
cursor: pointer; display: block; }
+ #prev_section_link { padding: 25px; margin: -25px; cursor: pointer;
display: block; }
+ #prev_section_link, #next_section_link { text-decoration: none; }
+ #prev_section_link:hover, #next_section_link:hovera { text-decoration:
underline; }
\ No newline at end of file
Modified: cytoscapeweb/trunk/website/src/js/content/demo.js
===================================================================
--- cytoscapeweb/trunk/website/src/js/content/demo.js 2010-06-29 15:36:02 UTC
(rev 20718)
+++ cytoscapeweb/trunk/website/src/js/content/demo.js 2010-06-29 15:37:53 UTC
(rev 20719)
@@ -153,9 +153,9 @@
$("body").html('\
<div id="header" class="slice">\
<a href="/"><div id="logo"></div></a>\
- <div class="text">\
- <h1>Demo</h1>\
- <div class="text">Try out some features of
Cytoscape Web to see how you would use it in your site!</div>\
+ <div class="message">\
+ <div class="title">Feature showcase demo</div>\
+ <p>This is a feature showcase of Cytoscape Web.
It is a separate application built around the Cytoscape Web visualization.
Because this showcase is complex, you may experience issues, such as slowdowns,
on older or less efficient browsers.</p>\
</div>\
</div>\
<div id="cytoweb">\
@@ -502,6 +502,8 @@
create_save();
$("#cytoweb_container").bind("available", function(){
+ dirty_attributes_cache();
+
update_background();
update_menu();
update_info();
@@ -987,9 +989,10 @@
}
- // ] Info for selected objects
+ // [info] for selected objects
////////////////////////////////////////////////////////////////////////////////////////////////
+
// Update the info tab with selection information after the graph has
loaded
function update_info(){
@@ -1223,25 +1226,44 @@
}
+
+ var need_to_update = false;
function update_with_loader(){
if (! $("#info").hasClass("ui-tabs-hide")){
- show_msg_on_tabs({
+ need_to_update = false;
+
+
+ $.thread({
+ worker: function(params){
+ update();
+
+ hide_msg({
+ target: $("#side")
+ });
+ }
+ });
+ } else {
+ need_to_update = true;
+ }
+
+ }
+
+ $("#info_link").bind("click", function(){
+ if( need_to_update ){
+
+ show_msg_on_tabs({
type: "loading",
message: "Please wait while the data is updated."
});
+
+ var interval = setInterval(function(){
+ if (!
$("#info").hasClass("ui-tabs-hide")){
+ update_with_loader();
+ clearInterval(interval);
+ }
+ }, 100);
}
- $.thread({
- worker: function(params){
- update();
-
- if (! $("#info").hasClass("ui-tabs-hide")){
- hide_msg({
- target: $("#side")
- });
- }
- }
- });
- }
+ });
function updateContextMenu(){
var cw = $("#cytoweb_container").cw();
@@ -1262,9 +1284,8 @@
})
.addContextMenuItem("Add new node", function(evt) {
cw.addNode(evt.mouseX, evt.mouseY, { }, true);
+ updateContextMenu();
dirty_graph_state();
- updateContextMenu();
- update_with_loader();
})
.addContextMenuItem("Add new edge (then click the target
node...)", "nodes", function(evt) {
_srcId = evt.target.data.id;
@@ -1461,7 +1482,7 @@
function update_vizmapper(){
var parent = $("#vizmapper");
parent.empty();
-
+
$("#vizmapper_header").empty();
$("#vizmapper_header").append('<div
id="vizmapper_tabs"><ul></ul></div>');
@@ -1752,8 +1773,10 @@
]
};
- var cached_style = $("#cytoweb_container").cw().visualStyle();
+ var cached_style = cw.visualStyle();
+
+
function get_property(variable){
var style = cached_style;
@@ -1788,6 +1811,9 @@
}
cached_style = $.extend( true, cached_style, style );
+
+ console.log(cached_style);
+
$("#cytoweb_container").cw().visualStyle(cached_style);
update_background();
}
Modified: cytoscapeweb/trunk/website/src/js/layout/side.js
===================================================================
--- cytoscapeweb/trunk/website/src/js/layout/side.js 2010-06-29 15:36:02 UTC
(rev 20718)
+++ cytoscapeweb/trunk/website/src/js/layout/side.js 2010-06-29 15:37:53 UTC
(rev 20719)
@@ -8,9 +8,13 @@
ul_root.append(li_show_all);
li_show_all.append(a_show_all);
+ function make_id(name){
+ return "section/" + name.replace(/\s/g, "_").replace(/\_\(.+/, "");
+ }
+
function create_level(ul, h) {
var name = (h.attr("name") != undefined ? h.attr("name") : h.text());
- var id = (h.attr("id") != undefined ? h.attr("id") : "");
+ var id = make_id( h.text() );
var a = $('<a href="#' + id + '" name="' + name + '">' + name +
'</a>');
var li = $("<li></li>");
var tag;
@@ -50,26 +54,24 @@
var prev = h.prevAll(tags + ":first");
var prev_name = (prev.attr("name") != undefined ?
prev.attr("name") : prev.text());
if( prev.size() > 0 ) {
- h.before("<div id=\"prev_section_link\"><a href=\"#\">Previous
section: <em>" + prev_name + "</em></a></div>");
+ h.before("<a id=\"prev_section_link\" href=\"#" +
make_id(prev_name) + "\">Previous section: <em>" + prev_name + "</em></a>");
}
$("#prev_section_link").bind("click", function(){
- $("#content .right
.selected").prev().find("a").trigger("click");
+ $("#content .right .selected").prev().find("a").click();
});
var next = h.nextAll(tags + ":first");
var next_name = (next.attr("name") != undefined ?
next.attr("name") : next.text());
if( next.size() > 0 ) {
- next.before("<div id=\"next_section_link\"><a href=\"#\">Next
section: <em>" + next_name + "</em></a></div>");
+ next.before("<a id=\"next_section_link\" href=\"#" +
make_id(next_name) + "\">Next section: <em>" + next_name + "</em></a>");
}
$("#next_section_link").bind("click", function(){
- $("#content .right
.selected").next().find("a").trigger("click");
+ $("#content .right .selected").next().find("a").click();
});
fix_height();
-
- return false;
});
}
@@ -103,8 +105,6 @@
$("#content .left").children().show();
$("#next_section_link").remove();
$("#prev_section_link").remove();
-
- return false;
});
$("#content .right a").click(function(){
@@ -140,4 +140,6 @@
$("#content .right a[href=" + match + "]").click();
}
+
+
});
\ No newline at end of file
Added: cytoscapeweb/trunk/website/src/php/content/contact/info.declaration.php
===================================================================
--- cytoscapeweb/trunk/website/src/php/content/contact/info.declaration.php
(rev 0)
+++ cytoscapeweb/trunk/website/src/php/content/contact/info.declaration.php
2010-06-29 15:37:53 UTC (rev 20719)
@@ -0,0 +1,5 @@
+<?php
+
+ $content_style = "side";
+
+?>
\ No newline at end of file
Added: cytoscapeweb/trunk/website/src/php/content/contact/info.php
===================================================================
--- cytoscapeweb/trunk/website/src/php/content/contact/info.php
(rev 0)
+++ cytoscapeweb/trunk/website/src/php/content/contact/info.php 2010-06-29
15:37:53 UTC (rev 20719)
@@ -0,0 +1,26 @@
+<div class="left">
+
+ <h1>Discussion Group</h1>
+
+ <p>The Cytoscape Web <a
href="http://groups.google.com/group/cytoscapeweb-discuss";
rel="external">discussion group</a> is the main forum for users to share
questions, solutions and new ideas.</p>
+
+
+ <h1>Reporting software bugs</h1>
+
+ <p>The best way to report a bug to us is to <a
href="http://cbio.mskcc.org/cytoscape/bugs"; rel="external">use our bug
tracker</a>. However, if you find it difficult to use the bug tracker, feel
free to use the contact form on this page to contact us about the bug.</p>
+
+ <p>Though we greatly appreciate it when you point out a bug, several
pieces of information are required to fix it, including</p>
+
+ <ul>
+ <li>how to reproduce the bug;</li>
+ <li>what part of the API the bug affects;</li>
+ <li>a description of the bug as compared to the behaviour you
expected.</li>
+ </ul>
+
+
+ <h1>Other feedback</h1>
+
+ <p>Any other feedback that you provide is greatly appreciated. Please use
the <a href="http://groups.google.com/group/cytoscapeweb-discuss";
rel="external">discussion group</a> for your feedback.</p>
+
+
+</div>
Added: cytoscapeweb/trunk/website/src/php/content/contact/write.declaration.php
===================================================================
--- cytoscapeweb/trunk/website/src/php/content/contact/write.declaration.php
(rev 0)
+++ cytoscapeweb/trunk/website/src/php/content/contact/write.declaration.php
2010-06-29 15:37:53 UTC (rev 20719)
@@ -0,0 +1,22 @@
+<?php
+
+ include_js("/js/jquery/plugins/jquery.validate.js");
+
+ $content_style="half_and_half";
+
+ $email_file = "php/content/contact/write.email.php";
+ $email_var = "\$address_to_send_email";
+
+ if ( !(@include("php/content/contact.email.php")) ) {
+ echo "<p class='ui-validation-error-message'>$email_file: file not
found; please create the file and define $email_var</p>";
+ } else if( !preg_match( '/^([a-z|A-Z])+\@([a-z|A-Z])+\.([a-z|A-Z])+$/',
$address_to_send_email) ){
+ echo "<p class='ui-validation-error-message'>$email_file: $email_var
was not properly defined (it should be a valid email address)</p>";
+ }
+
+ // error messages
+ $error_msg = array(
+ "empty" => "must not be empty",
+ "invalid" => "must be complete and valid"
+ );
+
+?>
\ No newline at end of file
Property changes on:
cytoscapeweb/trunk/website/src/php/content/contact/write.declaration.php
___________________________________________________________________
Name: svn:executable
+ *
Added: cytoscapeweb/trunk/website/src/php/content/contact/write.php
===================================================================
--- cytoscapeweb/trunk/website/src/php/content/contact/write.php
(rev 0)
+++ cytoscapeweb/trunk/website/src/php/content/contact/write.php
2010-06-29 15:37:53 UTC (rev 20719)
@@ -0,0 +1,93 @@
+<?php
+
+ $submitted = $_POST["submitted"];
+ $name = $_POST["name"];
+ $email = $_POST["email"];
+ $nature = $_POST["nature"];
+ $message = $_POST["message"];
+
+ $name_empty = ($name == "");
+ $email_empty = ($email == "");
+ $email_invalid = (
!preg_match('/^(([a-z]|[A-Z])+)(@)(([a-z]|[A-Z])+)(\.)(([a-z]|[A-Z])+)$/',
$email) );
+ $nature_empty = ($nature == "");
+ $message_empty = ($message == "");
+
+ $parameters_valid = false;
+
+ if( $submitted ) {
+ if(!$name_empty && !$email_empty && !$email_invalid && !$nature_empty
&& !$message_empty) {
+ $headers = 'From: ' . "$name <$email>" . "\r\n" .
+ 'Reply-To: ' . $email . "\r\n" .
+ 'X-Mailer: PHP/' . phpversion();
+ mail($address_to_send_email, $nature, $message, $headers);
+ $parameters_valid = true;
+ }
+ }
+?>
+
+<div id="error_msg">
+ <?php
+ foreach($error_msg as $e => $m) {
+ echo "<div class=\"$e\">$m</div>";
+ }
+ ?>
+</div>
+
+<div class="left">
+
+ <?php
+ $complete = $submitted && $parameters_valid;
+ if( $complete ) { ?>
+
+ <h1>Thank you!</h1>
+
+ <p>Thank you for your feedback! The message as it was sent is as
follows.</p>
+
+ <?php } else { ?>
+
+ <h1>Contact form</h1>
+
+ <p>Please note that the <a
href="http://groups.google.com/group/cytoscapeweb-discuss";
rel="external">discussion group</a> is the preferred method of communication,
as you will get a faster response there compared to here.</p>
+
+ <?php } ?>
+
+ <form method="post" action="<?php echo $PHP_SELF; ?>">
+
+ <label>Name <span
class="ui-validation-error-message"></span></label>
+ <input id="name" name="name" type="text" <?php echo ($complete ?
"disabled=\"true\"" : ""); ?> <?php echo "value=\"$name\""; ?> <?php echo
($submitted && $name_empty ? "class=\"error\"" : ""); ?> />
+
+ <label>Email address <span
class="ui-validation-error-message"><?php
+ if($submitted && $email_empty) {
+ echo $error_msg["empty"];
+ } else if($submitted && $email_invalid) {
+ echo $error_msg["invalid"];
+ }
+ ?></span></label>
+ <input id="email" name="email" type="text" <?php echo ($complete ?
"disabled=\"true\"" : ""); ?> <?php echo "value=\"$email\""; ?> <?php echo
($submitted && ($email_empty || $email_invalid) ? "class=\"error\"" : ""); ?> />
+
+ <label>Nature of message <span
class="ui-validation-error-message"></span></label>
+ <input id="nature" name="nature" type="text" <?php echo ($complete
? "disabled=\"true\"" : ""); ?> <?php echo "value=\"$nature\""; ?> <?php echo
($submitted && $nature_empty ? "class=\"error\"" : ""); ?> />
+ <div class="example">Examples: <a href="#">software bug</a>, <a
href="#">feedback</a>, <a href="#">feature request</a></div>
+
+ <label>Message <span
class="ui-validation-error-message"></span></label>
+ <textarea id="message" name="message" <?php echo ($complete ?
"disabled=\"true\"" : ""); ?> <?php echo ($submitted && $message_empty ?
"class=\"error\"" : ""); ?>><?php echo $message; ?></textarea>
+
+ <input type="hidden" id="submitted" name="submitted" value="true"
/>
+
+ <button type="submit" <?php echo ($complete ? "class=\"hidden\"" :
""); ?> id="submit" class="emphasis">Send message</button>
+
+ </form>
+
+</div>
+
+<div class="right">
+
+ <h1>What can I write here?</h1>
+
+ <p class="warning"><strong>Do not use this form to ask questions on how
to use Cytoscape Web.</strong> That information can be found in the <a
href="/documentation">documentation</a> or asked in the <a
href="http://groups.google.com/group/cytoscapeweb-discuss";
rel="external">discussion group</a>.</p>
+
+ <p>This form is a way for you to contact the developers of Cytoscape
Web. However, you will probably get a slower response to your query here as
compared to the <a href="http://groups.google.com/group/cytoscapeweb-discuss";
rel="external">discussion group</a>.</p>
+
+ <p>If you have ideas on how to improve Cytoscape Web or you would like
to report a bug, we would greatly appreciate your feedback.</p>
+
+</div>
\ No newline at end of file
Property changes on:
cytoscapeweb/trunk/website/src/php/content/contact/write.php
___________________________________________________________________
Name: svn:executable
+ *
Modified: cytoscapeweb/trunk/website/src/php/content/contact.declaration.php
===================================================================
--- cytoscapeweb/trunk/website/src/php/content/contact.declaration.php
2010-06-29 15:36:02 UTC (rev 20718)
+++ cytoscapeweb/trunk/website/src/php/content/contact.declaration.php
2010-06-29 15:37:53 UTC (rev 20719)
@@ -1,22 +1,11 @@
<?php
-
- include_js("/js/jquery/plugins/jquery.validate.js");
-
- $content_style="half_and_half";
-
- $email_file = "php/content/contact.email.php";
- $email_var = "\$address_to_send_email";
-
- if ( !(@include("php/content/contact.email.php")) ) {
- echo "<p class='ui-validation-error-message'>$email_file: file not
found; please create the file and define $email_var</p>";
- } else if( !preg_match( '/^([a-z|A-Z])+\@([a-z|A-Z])+\.([a-z|A-Z])+$/',
$address_to_send_email) ){
- echo "<p class='ui-validation-error-message'>$email_file: $email_var
was not properly defined (it should be a valid email address)</p>";
- }
-
- // error messages
- $error_msg = array(
- "empty" => "must not be empty",
- "invalid" => "must be complete and valid"
+
+ $content_style="half_and_half";
+
+ $page_links = array(
+ "info" => "Contact information",
+ "write" => "Email us a message"
);
+
?>
\ No newline at end of file
Deleted: cytoscapeweb/trunk/website/src/php/content/contact.php
===================================================================
--- cytoscapeweb/trunk/website/src/php/content/contact.php 2010-06-29
15:36:02 UTC (rev 20718)
+++ cytoscapeweb/trunk/website/src/php/content/contact.php 2010-06-29
15:37:53 UTC (rev 20719)
@@ -1,106 +0,0 @@
-<?php
-
- $submitted = $_POST["submitted"];
- $name = $_POST["name"];
- $email = $_POST["email"];
- $nature = $_POST["nature"];
- $message = $_POST["message"];
-
- $name_empty = ($name == "");
- $email_empty = ($email == "");
- $email_invalid = (
!preg_match('/^(([a-z]|[A-Z])+)(@)(([a-z]|[A-Z])+)(\.)(([a-z]|[A-Z])+)$/',
$email) );
- $nature_empty = ($nature == "");
- $message_empty = ($message == "");
-
- $parameters_valid = false;
-
- if( $submitted ) {
- if(!$name_empty && !$email_empty && !$email_invalid && !$nature_empty
&& !$message_empty) {
- $headers = 'From: ' . "$name <$email>" . "\r\n" .
- 'Reply-To: ' . $email . "\r\n" .
- 'X-Mailer: PHP/' . phpversion();
- mail($address_to_send_email, $nature, $message, $headers);
- $parameters_valid = true;
- }
- }
-?>
-
-<div id="error_msg">
- <?php
- foreach($error_msg as $e => $m) {
- echo "<div class=\"$e\">$m</div>";
- }
- ?>
-</div>
-
-<div class="left">
-
- <?php
- $complete = $submitted && $parameters_valid;
- if( $complete ) { ?>
-
- <h1>Thank you!</h1>
-
- <p>Thank you for your feedback! The message as it was sent is as
follows.</p>
-
- <?php } else { ?>
-
- <h1>Contact form</h1>
-
- <p>If you have any questions or comments, please contact us via
the form below.</p>
-
- <?php } ?>
-
- <form method="post" action="<?php echo $PHP_SELF; ?>">
-
- <label>Name <span
class="ui-validation-error-message"></span></label>
- <input id="name" name="name" type="text" <?php echo ($complete ?
"disabled=\"true\"" : ""); ?> <?php echo "value=\"$name\""; ?> <?php echo
($submitted && $name_empty ? "class=\"error\"" : ""); ?> />
-
- <label>Email address <span
class="ui-validation-error-message"><?php
- if($submitted && $email_empty) {
- echo $error_msg["empty"];
- } else if($submitted && $email_invalid) {
- echo $error_msg["invalid"];
- }
- ?></span></label>
- <input id="email" name="email" type="text" <?php echo ($complete ?
"disabled=\"true\"" : ""); ?> <?php echo "value=\"$email\""; ?> <?php echo
($submitted && ($email_empty || $email_invalid) ? "class=\"error\"" : ""); ?> />
-
- <label>Nature of message <span
class="ui-validation-error-message"></span></label>
- <input id="nature" name="nature" type="text" <?php echo ($complete
? "disabled=\"true\"" : ""); ?> <?php echo "value=\"$nature\""; ?> <?php echo
($submitted && $nature_empty ? "class=\"error\"" : ""); ?> />
- <div class="example">Examples: <a href="#">software bug</a>, <a
href="#">feedback</a>, <a href="#">feature request</a></div>
-
- <label>Message <span
class="ui-validation-error-message"></span></label>
- <textarea id="message" name="message" <?php echo ($complete ?
"disabled=\"true\"" : ""); ?> <?php echo ($submitted && $message_empty ?
"class=\"error\"" : ""); ?>><?php echo $message; ?></textarea>
-
- <input type="hidden" id="submitted" name="submitted" value="true"
/>
-
- <button type="submit" <?php echo ($complete ? "class=\"hidden\"" :
""); ?> id="submit" class="emphasis">Send message</button>
-
- </form>
-
-</div>
-
-<div class="right">
-
- <h1>Discussion Group</h1>
-
- <p>The Cytoscape Web <a
href="http://groups.google.com/group/cytoscapeweb-discuss";
rel="external">discussion group</a> is the main forum for users to share
questions, solutions and new ideas.</p>
-
- <h1>Reporting software bugs</h1>
-
- <p>The best way to report a bug to us is to <a
href="http://cbio.mskcc.org/cytoscape/bugs"; rel="external">use our bug
tracker</a>. However, if you find it difficult to use the bug tracker, feel
free to use the contact form on this page to contact us about the bug.</p>
-
- <p>Though we greatly appreciate it when you point out a bug, several
pieces of information are required to fix it, including</p>
-
- <ul>
- <li>how to reproduce the bug;</li>
- <li>what part of the API the bug affects;</li>
- <li>a description of the bug as compared to the behaviour you
expected.</li>
- </ul>
-
- <h1>Other feedback</h1>
-
- <p>Any other feedback that you provide is greatly appreciated. To make
sure that we get the most out of your feedback, please make sure to provide
your name and email address so we can get back to you if need be.</p>
-
-
-</div>
\ No newline at end of file
Modified: cytoscapeweb/trunk/website/src/php/content/home.php
===================================================================
--- cytoscapeweb/trunk/website/src/php/content/home.php 2010-06-29 15:36:02 UTC
(rev 20718)
+++ cytoscapeweb/trunk/website/src/php/content/home.php 2010-06-29 15:37:53 UTC
(rev 20719)
@@ -1,7 +1,7 @@
<div id="main">
<div id="about">
<div id="use_line">
- <span>Easily embed interactive networks in your website, like
this:</span>
+ <span>Easily embed interactive networks in your website with
Cytoscape Web.</span>
</div>
<div id="example">
@@ -27,7 +27,7 @@
</div>
<div class="link">
- <a href="/demo"><div id="live_demo" class="button">View live
demo</div></a>
+ <a href="/demo"><div id="live_demo" class="button">View
showcase demo</div></a>
</div>
<div class="link">
Modified: cytoscapeweb/trunk/website/src/php/layout/declaration.php
===================================================================
--- cytoscapeweb/trunk/website/src/php/layout/declaration.php 2010-06-29
15:36:02 UTC (rev 20718)
+++ cytoscapeweb/trunk/website/src/php/layout/declaration.php 2010-06-29
15:37:53 UTC (rev 20719)
@@ -22,7 +22,7 @@
$navigation_links = array(
"download" => "Download",
"documentation" => "Documentation",
- "demo" => "Demo",
+ "demo" => "Showcase demo",
"news" => "News",
"about" => "About",
"contact" => "Contact"
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
