diff --git a/customindex/views/default/customindex/content.php b/customindex/views/default/customindex/content.php index 88d2d28ac1bcadbb5d2a3a4537ee7ecbb01d5cd0..59fedda4dc7cad75db5a7c78574c6c180d15e758 100644 --- a/customindex/views/default/customindex/content.php +++ b/customindex/views/default/customindex/content.php @@ -173,8 +173,8 @@ <div class="<?php if (isloggedin()) { echo('two_');} ?>col middle"> <h3 class="sec_main">Latest Wire Posts</h3> <?php - mysql_connect("localhost", "root", "ertyu9") or die(mysql_error()); - mysql_select_db("unl_social") or die(mysql_error()); + mysql_connect($CONFIG->dbhost, $CONFIG->dbuser, $CONFIG->dbpass) or die(mysql_error()); + mysql_select_db($CONFIG->dbname) or die(mysql_error()); //get the most recent wire posts $result = mysql_query("SELECT * from elggentities where type='object' and subtype=4 and site_guid = 1 order by time_created desc limit 0, 3") or die(mysql_error()); diff --git a/customindex/views/default/customindex/css.php b/customindex/views/default/customindex/css.php index a40c5707c507c7ba1e96753fab45bc85462c3504..f3b6ebc0bafcdec2ce4bb757a325f5c9d9443170 100644 --- a/customindex/views/default/customindex/css.php +++ b/customindex/views/default/customindex/css.php @@ -99,6 +99,7 @@ /* member icon */ .member_icon { + float:left; cursor:pointer; margin:0 6px 6px 0; } diff --git a/customindex/views/default/customindex/metatags.php b/customindex/views/default/customindex/metatags.php index abd3ce541affda63b9573d4c82409c21a0443fd5..8012a1825351102013c524198daff077bcf3a70b 100644 --- a/customindex/views/default/customindex/metatags.php +++ b/customindex/views/default/customindex/metatags.php @@ -89,9 +89,11 @@ function openLocation(lng, lat, username, location, displayname, title, comment) }; jQuery(document).ready(function() { - var map = new FE.Map(document.getElementById("globeInner")); - map.onLoad = startMap; - map.load(); + try{ + var map = new FE.Map(document.getElementById("globeInner")); + map.onLoad = startMap; + map.load(); + }catch(e){} }); diff --git a/customindex/witw_people.js b/customindex/witw_people.js index 65a6984b859c71ad421cb68c50ba2289d0cd8cba..06d364b519ad1e5ec7a351188eff72ac48b43010 100644 --- a/customindex/witw_people.js +++ b/customindex/witw_people.js @@ -2,7 +2,7 @@ //row 1 function displayNancyAndreasen() { - return openLocationFeat('-91.5330870','41.6578850','demouser','Iowa City, IA','Nancy Andreasen', + return openLocationFeat('-91.5330870','41.6578850','demouser','USA - Iowa City, IA','Nancy Andreasen', '', 'Nancy Andreasen\'s Breakthrough Research Changed The Way Modern Science Understands Schizophrenia.', 'Nancy_Andreasen'); @@ -14,13 +14,13 @@ function displayAtorodAzizinamini() { 'Atorod_Azizinamini'); }; function displayClaudeMBoltonJr() { - return openLocationFeat('-77.0240550','38.8920910','demouser','Washington, D.C.','Claude M. Bolton, Jr.', + return openLocationFeat('-77.0240550','38.8920910','demouser','USA - Washington, D.C.','Claude M. Bolton, Jr.', '', 'Air Force "Top Gun" Claude Bolton Thrives On New Challenge: Acquiring Equipment For The Army.', 'Claude-M_Bolton-Jr'); }; function displayWarrenBuffett() { - return openLocationFeat('-96.0247270','41.2532250','demouser','Omaha, NE','Warren Buffett', + return openLocationFeat('-96.0247270','41.2532250','demouser','USA - Omaha, NE','Warren Buffett', 'Chairman, Berkshire Hathaway', 'Warren Buffett, \'50, has some investment advice for everyone: invest in yourself.', 'Warren_Buffett'); @@ -34,7 +34,7 @@ function displayAnnChangBarnes() { 'Ann_Chang-Barnes'); }; function displayBingChen() { - return openLocationFeat('-96.7','40.8','demouser','Lincoln, NE','Bing Chen', + return openLocationFeat('-96.7','40.8','demouser','USA - Lincoln, NE','Bing Chen', 'Chair of Computer & Electronics Engineering', 'Bing Chen has taken his robotics-based curriculum to school - in Nebraska and across the U.S.', 'Bing_Chen'); @@ -46,7 +46,7 @@ function displayXunHongChen() { 'Xun-Hong_Chen'); }; function displayGranvilleCoggs() { - return openLocationFeat('-98.4937220','29.4250370','demouser','San Antonio, TX','Granville Coggs', + return openLocationFeat('-98.4937220','29.4250370','demouser','USA - San Antonio, TX','Granville Coggs', '', 'Granville Coggs, \'49, triumphed over 1940s racial discrimination to become part of a living American legend.', 'Granville_Coggs'); @@ -54,11 +54,38 @@ function displayGranvilleCoggs() { //row 3 function displayDrLTreyColeman() { - return openLocationFeat('-80.2064440','25.9794980','demouser','Miami Gardens, FL','Dr. L Trey Coleman', + return openLocationFeat('-80.2064440','25.9794980','demouser','USA - Miami Gardens, FL','Dr. L Trey Coleman', 'Director of Grants and Sponsored Research, Florida Memorial University', 'Football delivered Dr. L. Trey Coleman out of a troubled past to Nebraska. He left with a future.', 'Dr-L-Trey_Coleman'); }; +function displayPamDingman() { + return openLocationFeat('-96.7','40.8','demouser','USA - Lincoln, NE','Pam Dingman', + 'CEO of Engineering Design Consultants (EDC)', + 'Pam Dingman is one of a handful of U.S. women who manages and owns a civil engineering firm.', + 'Pam_Dingman'); +}; +function displayChristopherElbow() { + return openLocationFeat('-94.5836440','39.0904310','demouser','USA - Kansas City, MO','Christopher Elbow', + '', + 'Christopher Elbow, \'96, has developed a national reputation for his exquisite handmade chocolates.', + 'Christopher_Elbow'); +}; +function displayShaneFarritor() { + return openLocationFeat('-96.7','40.8','demouser','USA - Lincoln, NE','Shane Farritor', + 'Associate Professor, Mechanical Engineering', + 'Shane Farritor, \'92, has conducted promising research on railcar derailment and surgical robots.', + 'Shane_Farritor'); +}; + + +//row 4 +function displaySheriFritz() { + return openLocationFeat('-80.2064440','25.9794980','demouser','Bolivia - Lake Titicaca','Sheri Fritz', + 'Willa Cather professor, Department of Geosciences', + 'Football delivered Dr. L. Trey Coleman out of a troubled past to Nebraska. He left with a future.', + 'Sheri_Fritz'); +}; function displayPamDingman() { return openLocationFeat('-96.7','40.8','demouser','Lincoln, NE','Pam Dingman', 'CEO of Engineering Design Consultants (EDC)', @@ -88,9 +115,6 @@ function displayShaneFarritor() { - - - function displayNithalKuwa() { return openLocationFeat('28.2871670','-15.4081930','demouser','Zambia','Nithal Kuwa', 'Graduate student, Biological Sciences',