From c0d48915c173ad31ec5ad839e4ee8905b8e00f1f Mon Sep 17 00:00:00 2001 From: "ziheng.li" <liziheng1996@gmail.com> Date: Wed, 19 Dec 2018 22:52:34 +0100 Subject: [PATCH] test youtube display --- .idea/workspace.xml | 182 +++++++++++++++++----------------------- page_user/css/style.css | 1 - page_user/user.php | 22 ++++- 3 files changed, 97 insertions(+), 108 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d3930db..f667692 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,6 +3,7 @@ <component name="ChangeListManager"> <list default="true" id="97544618-4bb5-471f-b62a-ec86a2a69f7b" name="Default" comment=""> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/page_user/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/page_user/css/style.css" afterDir="false" /> <change beforePath="$PROJECT_DIR$/page_user/user.php" beforeDir="false" afterPath="$PROJECT_DIR$/page_user/user.php" afterDir="false" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -20,8 +21,8 @@ <file leaf-file-name="login.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/page_welcome/login.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1134"> - <caret line="42" column="2" selection-start-line="42" selection-start-column="2" selection-end-line="42" selection-end-column="22" /> + <state relative-caret-position="630"> + <caret line="42" selection-start-line="42" selection-end-line="42" selection-end-column="22" /> </state> </provider> </entry> @@ -29,22 +30,35 @@ <file leaf-file-name="user.php" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/page_user/user.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="214"> - <caret line="26" column="74" selection-start-line="26" selection-start-column="74" selection-end-line="26" selection-end-column="74" /> + <state relative-caret-position="584"> + <caret line="159" column="70" selection-start-line="159" selection-start-column="70" selection-end-line="159" selection-end-column="70" /> <folding> <element signature="n#style#0;n#table#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#tr#0;n#table#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#tr#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#tr#0;n#!!top" expanded="true" /> </folding> </state> </provider> </entry> </file> + <file leaf-file-name="style.css" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/page_user/css/style.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="363"> + <caret line="269" column="21" lean-forward="true" selection-start-line="269" selection-start-column="21" selection-end-line="269" selection-end-column="21" /> + </state> + </provider> + </entry> + </file> <file leaf-file-name="userpage.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/page_welcome/userpage.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="355"> - <caret line="18" selection-start-line="18" selection-end-line="18" /> + <state relative-caret-position="1665"> + <caret line="111" column="28" lean-forward="true" selection-start-line="111" selection-start-column="28" selection-end-line="111" selection-end-column="28" /> + <folding> + <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + </folding> </state> </provider> </entry> @@ -52,7 +66,7 @@ <file leaf-file-name="userInfosFunctions.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/API_Twitter/userInfosFunctions.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="437"> + <state relative-caret-position="285"> <caret line="19" column="28" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="28" /> </state> </provider> @@ -61,16 +75,8 @@ <file leaf-file-name="profil.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/page_profile/profil.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="24"> + <state relative-caret-position="15"> <caret line="1" selection-start-line="1" selection-end-line="1" selection-end-column="54" /> - <folding> - <element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#button#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#form#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#form#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - </folding> </state> </provider> </entry> @@ -78,7 +84,7 @@ <file leaf-file-name="register.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/page_user/register.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="373"> + <state relative-caret-position="540"> <caret line="36" column="38" selection-start-line="34" selection-start-column="2" selection-end-line="36" selection-end-column="38" /> </state> </provider> @@ -87,8 +93,8 @@ <file leaf-file-name="login.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/page_user/login.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="654"> - <caret line="42" column="1" lean-forward="true" selection-start-line="42" selection-start-column="1" selection-end-line="42" selection-end-column="1" /> + <state relative-caret-position="630"> + <caret line="42" column="1" selection-start-line="42" selection-start-column="1" selection-end-line="42" selection-end-column="1" /> </state> </provider> </entry> @@ -98,19 +104,10 @@ <provider selected="true" editor-type-id="text-editor" /> </entry> </file> - <file leaf-file-name="facto.php" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/facto.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="750"> - <caret line="50" column="22" selection-start-line="50" selection-start-column="20" selection-end-line="50" selection-end-column="22" /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="index.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/page_welcome/index.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="197"> + <state relative-caret-position="345"> <caret line="23" selection-start-line="23" selection-end-line="23" /> </state> </provider> @@ -120,7 +117,6 @@ </component> <component name="FindInProjectRecents"> <findStrings> - <find>button</find> <find>profile</find> <find>suggestionButtons</find> <find>home</find> @@ -129,6 +125,8 @@ <find>js</find> <find>user information</find> <find>unserialize</find> + <find>.w3l-overlay, .bg1, .bg2</find> + <find>button</find> </findStrings> </component> <component name="Git.Settings"> @@ -192,6 +190,12 @@ <item name="PIMA" type="462c0819:PsiDirectoryNode" /> <item name="page_user" type="462c0819:PsiDirectoryNode" /> </path> + <path> + <item name="PIMA" type="b2602c69:ProjectViewProjectNode" /> + <item name="PIMA" type="462c0819:PsiDirectoryNode" /> + <item name="page_user" type="462c0819:PsiDirectoryNode" /> + <item name="css" type="462c0819:PsiDirectoryNode" /> + </path> <path> <item name="PIMA" type="b2602c69:ProjectViewProjectNode" /> <item name="PIMA" type="462c0819:PsiDirectoryNode" /> @@ -205,7 +209,7 @@ </panes> </component> <component name="PropertiesComponent"> - <property name="SearchEverywhereHistoryKey" value="suggestion	FILE	file:///Applications/MAMP/htdocs/PIMA/API_Twitter/userSuggestions.php profile	null	null" /> + <property name="SearchEverywhereHistoryKey" value=".w3l-overlay	null	null suggestion	FILE	file:///Applications/MAMP/htdocs/PIMA/API_Twitter/userSuggestions.php profile	null	null" /> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" /> </component> @@ -237,7 +241,7 @@ <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="15413000" /> + <option name="totallyTimeSpent" value="16609000" /> </component> <component name="ToolWindowManager"> <frame x="0" y="0" width="1680" height="1050" extended-state="0" /> @@ -283,33 +287,6 @@ <option name="myLimit" value="2678400000" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/page_user/user.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="722"> - <caret line="49" column="61" lean-forward="true" selection-start-line="49" selection-start-column="61" selection-end-line="49" selection-end-column="61" /> - <folding> - <element signature="n#style#0;n#table#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#tr#0;n#table#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#tr#0;n#!!top" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/page_profile/profil.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-328"> - <caret line="28" column="1" selection-start-line="28" selection-start-column="1" selection-end-line="28" selection-end-column="1" /> - <folding> - <element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#button#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#form#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#form#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/page_user/register.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="-65"> @@ -394,14 +371,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="566"> <caret line="30" column="1" selection-start-line="30" selection-start-column="1" selection-end-line="30" selection-end-column="1" /> - <folding> - <element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#button#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#form#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#form#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - </folding> </state> </provider> </entry> @@ -420,6 +389,7 @@ <element signature="n#style#0;n#table#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#tr#0;n#table#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#tr#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#tr#0;n#!!top" expanded="true" /> </folding> </state> </provider> @@ -432,6 +402,7 @@ <element signature="n#style#0;n#table#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#tr#0;n#table#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#tr#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#tr#0;n#!!top" expanded="true" /> </folding> </state> </provider> @@ -514,6 +485,7 @@ <element signature="n#style#0;n#table#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#tr#0;n#table#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#tr#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#tr#0;n#!!top" expanded="true" /> </folding> </state> </provider> @@ -522,14 +494,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="-328"> <caret line="28" column="1" selection-start-line="28" selection-start-column="1" selection-end-line="28" selection-end-column="1" /> - <folding> - <element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#button#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#form#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#form#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - </folding> </state> </provider> </entry> @@ -555,13 +519,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/css/style.css"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="310"> - <caret line="1448" column="1" selection-start-line="1448" selection-start-column="1" selection-end-line="1448" selection-end-column="1" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/API_Twitter/userSuggestions.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="161"> @@ -585,7 +542,7 @@ </entry> <entry file="file://$PROJECT_DIR$/page_welcome/index.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="197"> + <state relative-caret-position="345"> <caret line="23" selection-start-line="23" selection-end-line="23" /> </state> </provider> @@ -595,62 +552,77 @@ </entry> <entry file="file://$PROJECT_DIR$/page_user/register.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="373"> + <state relative-caret-position="540"> <caret line="36" column="38" selection-start-line="34" selection-start-column="2" selection-end-line="36" selection-end-column="38" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/page_profile/profil.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="24"> + <state relative-caret-position="15"> <caret line="1" selection-start-line="1" selection-end-line="1" selection-end-column="54" /> - <folding> - <element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#button#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#form#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#form#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> - </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/page_user/login.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="654"> - <caret line="42" column="1" lean-forward="true" selection-start-line="42" selection-start-column="1" selection-end-line="42" selection-end-column="1" /> + <state relative-caret-position="630"> + <caret line="42" column="1" selection-start-line="42" selection-start-column="1" selection-end-line="42" selection-end-column="1" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/page_welcome/login.php"> + <entry file="file://$PROJECT_DIR$/API_Twitter/userInfosFunctions.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1134"> - <caret line="42" column="2" selection-start-line="42" selection-start-column="2" selection-end-line="42" selection-end-column="22" /> + <state relative-caret-position="285"> + <caret line="19" column="28" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="28" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/API_Twitter/userInfosFunctions.php"> + <entry file="file://$PROJECT_DIR$/page_welcome/register.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="437"> - <caret line="19" column="28" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="28" /> + <state relative-caret-position="-275" /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/css/style.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="310"> + <caret line="1055" column="5" selection-start-line="1055" selection-start-column="5" selection-end-line="1055" selection-end-column="5" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/page_user/css/style.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="363"> + <caret line="269" column="21" lean-forward="true" selection-start-line="269" selection-start-column="21" selection-end-line="269" selection-end-column="21" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/page_welcome/login.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="630"> + <caret line="42" selection-start-line="42" selection-end-line="42" selection-end-column="22" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/page_welcome/userpage.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="355"> - <caret line="18" selection-start-line="18" selection-end-line="18" /> + <state relative-caret-position="1665"> + <caret line="111" column="28" lean-forward="true" selection-start-line="111" selection-start-column="28" selection-end-line="111" selection-end-column="28" /> + <folding> + <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/page_user/user.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="214"> - <caret line="26" column="74" selection-start-line="26" selection-start-column="74" selection-end-line="26" selection-end-column="74" /> + <state relative-caret-position="584"> + <caret line="159" column="70" selection-start-line="159" selection-start-column="70" selection-end-line="159" selection-end-column="70" /> <folding> <element signature="n#style#0;n#table#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#tr#0;n#table#0;n#div#0;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#tr#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#tr#0;n#!!top" expanded="true" /> </folding> </state> </provider> diff --git a/page_user/css/style.css b/page_user/css/style.css index 1ba30c8..6d4ccfa 100644 --- a/page_user/css/style.css +++ b/page_user/css/style.css @@ -268,7 +268,6 @@ button.submit:hover { .bg1, .bg2 { min-height: 50vw; - height: 700px; } /*-- text Slider --*/ diff --git a/page_user/user.php b/page_user/user.php index 2f172f1..e02e093 100644 --- a/page_user/user.php +++ b/page_user/user.php @@ -52,6 +52,11 @@ error_reporting(E_ALL); $result = mysqli_query($db, $fav); $fav = mysqli_fetch_assoc($result); $favt = unserialize($fav['twitter']); + + $favyou = "SELECT youtube FROM favorites WHERE userid='$userid'"; + $result = mysqli_query($db, $favyou); + $favyou = mysqli_fetch_assoc($result); + $favy = unserialize($favyou['youtube']); ?> @@ -114,7 +119,15 @@ error_reporting(E_ALL); $twitter = getUserScreenName($favt[$i]); $id = $favt[$i]; $image = getUserProfileImage($id); - echo "<tr onclick='showId(this.id)' id=\"$id\" style=\"background: #d4e3e5;\" onmouseover=\"this.style.backgroundColor='#ffff66';\" onmouseout=\"this.style.backgroundColor='#d4e3e5';\"><td><img src='$image'></td><td>$twitter</td></tr>"; + echo "<tr onclick='showtId(this.id)' id=\"$id\" style=\"background: #d4e3e5;\" onmouseover=\"this.style.backgroundColor='#ffff66';\" onmouseout=\"this.style.backgroundColor='#d4e3e5';\"><td><img src='$image'></td><td>$twitter</td></tr>"; + } + + $datarowy = count($favy); + for($i=0;$i<$datarowy;$i++){ + $youtube = getUserScreenName($favy[$i]); + $id = $favy[$i]; + $image = getUserProfileImage($id); + echo "<tr onclick='showyId(this.id)' id=\"$id\" style=\"background: #d4e3e5;\" onmouseover=\"this.style.backgroundColor='#ffff66';\" onmouseout=\"this.style.backgroundColor='#d4e3e5';\"><td><img src='$image'></td><td>$youtube</td></tr>"; } @@ -138,11 +151,16 @@ error_reporting(E_ALL); <!-- Default-JavaScript-File --> <script type="text/javascript"> - function showId(id){ + function showtId(id){ location.href="../page_profile/profil.php?id="+id+"&sn=Twitter"; } + function showyId(id){ + location.href="../page_profile/profil.php?id="+id+"&sn=Youtube"; + + } + </script> <!-- banner slider --> -- GitLab