wine-commits November 2016

wine-commits@winehq.org

2 participants
465 discussions

Jeremy Newman : update object style, cleanup html, remove javascript where css can be used
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 682ac81620e4d9222b3fab39ec74bd0d098b8104 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=682ac81620e4d9222b3fab39… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 10:10:25 2016 -0600 update object style, cleanup html, remove javascript where css can be used --- include/table.php | 203 ++++++++++++++---------------------------------------- 1 file changed, 52 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=682ac81620e4d9222b3f…

1 0

Jeremy Newman : boostrapify and cleanup html
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 44250217bfdaa715d6e515ba1af9cc7d5f1a94f6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=44250217bfdaa715d6e515ba… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 10:09:57 2016 -0600 boostrapify and cleanup html --- include/objectManager.php | 108 +++++++++++++++------------------------------- 1 file changed, 35 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=44250217bfdaa715d6e5…

1 0

Jeremy Newman : wrap body in container fluid
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: febea42089aa7423c66d28a35fedcdecf3adafc2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=febea42089aa7423c66d28a3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 10:09:12 2016 -0600 wrap body in container fluid --- include/footer.php | 1 + include/header.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/include/footer.php b/include/footer.php index 623b5fa..1340d41 100644 --- a/include/footer.php +++ b/include/footer.php @@ -1,6 +1,7 @@  </div> +</div> <div id="footer"> <a href="https://wiki.winehq.org/WineHQ_Wiki:Privacy_policy">Privacy Policy</a><br><br> diff --git a/include/header.php b/include/header.php index 47b8e8c..427a824 100644 --- a/include/header.php +++ b/include/header.php @@ -110,4 +110,6 @@ echo "</div>\n"; ?> <div id="whq-page-body"> +<div class="container-fluid"> +

1 0

Jeremy Newman : form-control-inline should be auto width
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: dae8be61e591557506fafb446c26039a97ef865b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=dae8be61e591557506fafb44… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 10:08:17 2016 -0600 form-control-inline should be auto width --- styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles.css b/styles.css index d00d51f..9426e95 100644 --- a/styles.css +++ b/styles.css @@ -39,7 +39,7 @@ PRE { /* make a form control inline */ input.form-control-inline { display: inline; - width: 100%; + width: auto; } select.form-control-inline { display: inline;

1 0

Jeremy Newman : cleanup and bootstrapify
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 4d982243bb797e1b8754d849e59e6428adb9d4a8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4d982243bb797e1b8754d849… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 09:43:23 2016 -0600 cleanup and bootstrapify --- include/db_filter_ui.php | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/include/db_filter_ui.php b/include/db_filter_ui.php index 4c71465..f0d2b33 100644 --- a/include/db_filter_ui.php +++ b/include/db_filter_ui.php @@ -174,7 +174,7 @@ class FilterInterface $sId = $iId; $shEditor = "<input type=\"hidden\" name=\"i{$sColumn}Op$sId\" value=\"{$oFilter->getOperatorId()}\">"; - $shEditor .= "<input type=\"hidden\" name=\"s{$sColumn}Data$sId\" value=\"{$oFilter->getData()}\" />"; + $shEditor .= "<input type=\"hidden\" name=\"s{$sColumn}Data$sId\" value=\"{$oFilter->getData()}\">"; return $shEditor; } @@ -198,14 +198,14 @@ class FilterInterface $sData = $oFilter->getData(); } - $shRet = "<input type=\"hidden\" name=\"i{$sColumn}Op$sId\" value=\"$iOp\" />"; + $shRet = "<input type=\"hidden\" name=\"i{$sColumn}Op$sId\" value=\"$iOp\">"; if($sData == 'true') $sChecked = ' checked="checked"'; else $sChecked = ''; - $shRet .= "<input value=\"true\" $sChecked name=\"s{$sColumn}Data$sId\" type=\"checkbox\" />"; + $shRet .= "<input value=\"true\" $sChecked name=\"s{$sColumn}Data$sId\" type=\"checkbox\">"; $shRet .= ' '.$oColumn->getDisplayName(); return $shRet; @@ -225,14 +225,14 @@ class FilterInterface If the filter is already active then there are more than one; one to remove */ if($iId == -1 && sizeof($aTypes) == 1) { - echo "<input type=\"hidden\" name=\"i{$sColumn}Op$sId\" value=\"{$aTypes[0]}\" />"; + echo "<input type=\"hidden\" name=\"i{$sColumn}Op$sId\" value=\"{$aTypes[0]}\">"; /* Printing 'equal to' sounds weird if it is the only choice */ if($aTypes[0] != FILTER_EQUALS) $shEditor .= $oColumn->getOpName($aTypes[0]); } else if ($aTypes[0] != FILTER_OPTION_ENUM) { - $shEditor .= "<select name='i{$sColumn}Op$sId'>"; + $shEditor .= "<select name='i{$sColumn}Op$sId' class='form-control form-control-inline'>"; if($iId != -1) { @@ -248,18 +248,18 @@ class FilterInterface $sSel = " selected='selected'"; else $sSel = ''; - $shEditor .= "<option value='$iType'$sSel>".$oColumn->getOpName($iType).'</option><br />'; + $shEditor .= "<option value='$iType'$sSel>".$oColumn->getOpName($iType).'</option><br>'; } $shEditor .= '</select> '; } else { - echo "<input type=\"hidden\" name=\"i{$sColumn}Op$sId\" value=\"{$aTypes[0]}\" />"; + echo "<input type=\"hidden\" name=\"i{$sColumn}Op$sId\" value=\"{$aTypes[0]}\">"; } switch($oColumn->getValueType()) { case FILTER_VALUES_NORMAL: - $shEditor .= "<input type='text' value=\"{$oFilter->getData()}\" name='s{$sColumn}Data$sId' size='30' />"; + $shEditor .= "<input type='text' value=\"{$oFilter->getData()}\" name='s{$sColumn}Data$sId' size='30' class='form-control form-control-inline'>"; break; case FILTER_VALUES_ENUM: case FILTER_VALUES_OPTION_ENUM: @@ -278,7 +278,7 @@ class FilterInterface $sData = $oFilter->getData(); - $shEditor = "<select name=\"s{$sColumn}Data$sId\">"; + $shEditor = "<select name=\"s{$sColumn}Data$sId\" class=\"form-control form-control-inline\">"; if($sData) $shEditor .= "<option value=\"\">-- remove --</option>"; @@ -314,7 +314,7 @@ class FilterInterface $shEditor .= $this->getUrlElement($aCounts[$sColumn], $oFilter); - $shEditor .= '<br />'; + $shEditor .= '<br>'; $aCounts[$sColumn]++; } @@ -337,7 +337,7 @@ class FilterInterface $shEditor .= $this->getHiddenInputTag($aCounts[$sColumn], $oFilter); - $shEditor .= '<br />'; + $shEditor .= '<br>'; $aCounts[$sColumn]++; } @@ -352,7 +352,7 @@ class FilterInterface $aCounts = array(); if(sizeof($this->oFilterSet->getFilters())) - $shCurrentItemsEditor .= '<br /><b>Active filters</b><br />'; + $shCurrentItemsEditor .= '<p><b>Active filters</b></p>'; foreach($this->oFilterSet->getFilters() as $oFilter) { $sColumn = $oFilter->getColumn(); @@ -364,16 +364,14 @@ class FilterInterface $shCurrentItemsEditor .= $this->getOptionBoolEditor($aCounts[$sColumn], $oFilter); else $shCurrentItemsEditor .= $this->getItemEditor($aCounts[$sColumn], $oFilter); - $shCurrentItemsEditor .= '<br />'; + $shCurrentItemsEditor .= '<br>'; $aCounts[$sColumn]++; } - $shNewItemsEditor .= '<b>Add new filter</b> <i>(You don’t have to fill out all rows.)</i><br />'; - /* Show errors, if any */ if($this->sErrors) - $shNewItemsEditor .= "<font color=\"red\">{$this->sErrors}</font>"; + $shNewItemsEditor .= "<span color=\"text-danger\">{$this->sErrors}</span>"; foreach($this->aFilterInfo as $oOption) { @@ -384,14 +382,14 @@ class FilterInterface { if(!array_key_exists($oOption->getColumn(), $aCounts)) $shNewItemsEditor .= $this->getOptionBoolEditor(-1, $oDummyFilter); - $shNewItemsEditor .= '<br />'; + $shNewItemsEditor .= '<br>'; } else { /* Make necessary checks for filters that are only supposed to be shown once */ if($oOption->getValueType() != FILTER_VALUES_OPTION_ENUM || !array_key_exists($oOption->getColumn(), $aCounts)) { $shNewItemsEditor .= $this->getItemEditor(-1, $oDummyFilter); - $shNewItemsEditor .= '<br />'; + $shNewItemsEditor .= '<br>'; } } } @@ -463,7 +461,7 @@ class FilterInterface { /* The user probably meant to add a filter, but forgot to seelect a filter criterion */ - $this->sErrors .= 'You need to select a filter criterion from the drop-down list<br />'; + $this->sErrors .= 'You need to select a filter criterion from the drop-down list<br>'; } }

1 0

Jeremy Newman : cleanup and bootstrapify
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 3576723f460db58de77ccec3483fd7a0b771122d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3576723f460db58de77ccec3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 09:27:26 2016 -0600 cleanup and bootstrapify --- index.php | 62 +++++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/index.php b/index.php index 6fe93e3..e128681 100644 --- a/index.php +++ b/index.php @@ -14,13 +14,17 @@ require(BASE."include/incl.php"); apidb_header("Wine Application Database"); ?> - <img style="float:right;" src="images/appdb_montage.jpg" width=391 height=266 alt="Wine AppDB"> + +<div class="row"> + <div class="col-md-6 col-lg-8"> <h1>Welcome</h1> <p>This is the Wine Application Database (AppDB). Here you can get information on application compatibility with Wine.</p> + <?php + $str_benefits=" <ul> <li>Ability to <a href=\"https://wiki.winehq.org/AppDB_Voting_Help\" title=\"help on voting\">vote</a> on your favorite applications</li> @@ -32,21 +36,22 @@ $str_benefits=" <li>Submit new screenshots</li> </ul> "; -if(!$_SESSION['current']->isLoggedIn()) + +if (!$_SESSION['current']->isLoggedIn()) { - echo " - <p>Most of the features of the Application Database require that you have a user account and - are logged in. Some of the benefits of membership are:<p> + echo "<p>Most of the features of the Application Database require that you have a user account and + are logged in. Some of the benefits of membership are:</p> $str_benefits - <p>So, what are you waiting for? [<a href=\"".login_url()."\">Log in</a>] - or [<a href=\"account.php?sCmd=new\">register</a>] now! Your help in + <p>So, what are you waiting for? <a href=\"".login_url()."\" class=\"btn btn-default btn-sm btn-skinny\"><i class=\"fa fa-sign-in\"></i> Log in</a> + or <a href=\"account.php?sCmd=new\" class=\"btn btn-default btn-sm btn-skinny\"><i class=\"fa fa-user-plus\"></i> register</a> now! Your help in stomping out Wine issues will be greatly appreciated.</p>"; -} else +} +else { echo " - <p>As an Application Database member you enjoy some exclusive benefits like:<p> + <p>As an Application Database member you enjoy some exclusive benefits like:</p> $str_benefits @@ -66,27 +71,34 @@ if(!$_SESSION['current']->isLoggedIn()) $hResult = query_parameters($voteQuery); $oRow = query_fetch_object($hResult); - echo "There are <b>$iNumApps</b> applications currently in the database,"; + echo "<p>There are <b>$iNumApps</b> applications currently in the database,\n"; // don't mention the top application if there are no votes yet - if( !empty($oRow) ) + if (!empty($oRow)) { if($oRow->versionId) { $shVoteAppLink = version::fullNameLink($oRow->versionId); echo " with $shVoteAppLink being the\n"; echo "top <a href='votestats.php'>voted</a> application.\n"; - } else + } + else { echo " please <a href=\"".BASE."help/?sTopic=voting\" title=\"help on voting\"". "style=\"cursor: help\">vote</a> for your favourite application.\n"; } } + + echo "</p>\n"; ?> -<br><br> +</div> + <div class="col-md-6 col-lg-4"> + <img src="images/appdb_montage.jpg" class="fill-width" alt="Wine AppDB"> + </div> +</div> -<div class="topx_style platinum"> +<div class="row topx_style platinum"> <div class="rating_header"> <div class="rating_title"> Top-10 <a href="objectManager.php?sClass=application&sTitle=Browse+Applications&iappVersion-ratingOp0=5&sappVersion-ratingData0=Platinum&sOrderBy=appName&bAscending=true">Platinum</a> List @@ -95,18 +107,22 @@ if(!$_SESSION['current']->isLoggedIn()) </div> <div> <table class="platinum" width="100%"> + <thead> <tr class="rowtitle"> - <th width="10%">Application</th><th width="80%">Description</th><th width="10%">Screenshot</th> + <td width="10%">Application</td><td width="80%">Description</td><td width="10%">Screenshot</td> </tr> + </thead> + <tbody> <?php outputTopXRowAppsFromRating('Platinum', 10); ?> + </tbody> </table> </div> </div> <br> -<div class="topx_style gold"> +<div class="row topx_style gold"> <div class="rating_header"> <div class="rating_title"> Top-10 <a href="objectManager.php?sClass=application&sTitle=Browse+Applications&iappVersion-ratingOp0=5&sappVersion-ratingData0=Gold&sOrderBy=appName&bAscending=true">Gold</a> List @@ -115,18 +131,22 @@ if(!$_SESSION['current']->isLoggedIn()) </div> <div> <table class="gold" width="100%"> + <thead> <tr class="rowtitle"> - <th width="10%">Application</th><th width="80%">Description</th><th width="10%">Screenshot</th> + <td width="10%">Application</td><td width="80%">Description</td><td width="10%">Screenshot</td> </tr> + </thead> + <tbody> <?php outputTopXRowAppsFromRating('Gold', 10); ?> + </tbody> </table> </div> </div> <br> -<div class="topx_style silver"> +<div class="row topx_style silver"> <div class="rating_header"> <div class="rating_title"> Top-10 <a href="objectManager.php?sClass=application&sTitle=Browse+Applications&iappVersion-ratingOp0=5&sappVersion-ratingData0=Silver&sOrderBy=appName&bAscending=true">Silver</a> List @@ -135,12 +155,16 @@ if(!$_SESSION['current']->isLoggedIn()) </div> <div> <table class="silver" width="100%"> + <thead> <tr class="rowtitle"> - <th width="10%">Application</th><th width="80%">Description</th><th width="10%">Screenshot</th> + <td width="10%">Application</td><td width="80%">Description</td><td width="10%">Screenshot</td> </tr> + </thead> + <tbody> <?php outputTopXRowAppsFromRating('Silver', 10); ?> + </tbody> </table> </div> </div>

1 0

Jeremy Newman : clean up table styles, add some bootstrap overrides.
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 2aa8c7b5df8c3cc115fdfe049f6a3acd826e374f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2aa8c7b5df8c3cc115fdfe04… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 09:26:53 2016 -0600 clean up table styles, add some bootstrap overrides. --- styles.css | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 89 insertions(+), 9 deletions(-) diff --git a/styles.css b/styles.css index e895532..d00d51f 100644 --- a/styles.css +++ b/styles.css @@ -9,6 +9,10 @@ ===================================================================================================================== */ +HTML { + height: 100%; +} + /* Body Document Defaults */ BODY { background-color: #000000 !important; @@ -22,7 +26,7 @@ BODY { /* ===================================================================================================================== - bootstrap tweaks + bootstrap tweaks, bs is awesome, but there are a few tweaks needed. ===================================================================================================================== */ @@ -32,6 +36,27 @@ PRE { border: none; border-radius: none; } +/* make a form control inline */ +input.form-control-inline { + display: inline; + width: 100%; +} +select.form-control-inline { + display: inline; + width: auto; +} + +/* thin buttons, good for inline */ +.btn-skinny { + padding-top: 0.15em !important; + padding-bottom: 0.15em !important; +} + +/* fix button text on a tags */ +a.btn, a.btn:visited { + color: inherit; +} + /* ===================================================================================================================== PAGE LAYOUT @@ -300,9 +325,13 @@ P.newstitle A:hover { color: #FF6666; text-decoration: none; } DIV.newsblock { margin: 0 5px 25px 10px; padding: 0; } /* stuff */ -img { border: 0; } .clear { clear: both; } +/* IMG options */ +IMG { border: 0; text-decoration: none !important; } +IMG.absmiddle { vertical-align: top; } +IMG.fill-width { width: 100%; } + /* Link Colors */ A { color: #A50D0D; } A:visited { color: #FF0000; } @@ -458,7 +487,42 @@ table { border-spacing: 0.25em; border-collapse: separate; } -table td { padding: 0.25em; } +table td { + padding: 0.25em; +} + +/* wine hq table style */ +table.whq-table { + border-spacing: 0.25em; + border-collapse: separate; +} +table.whq-table-full { + width: 100%; +} +table.winehq td { + padding: 0.25em; +} +table.whq-table thead tr td { + background-color: #95493A; + border: 1px solid #732010; + font-weight: bold; + color: #ffffff; +} +table.whq-table thead tr td a { + color: #ffffff; +} +table.whq-table thead tr td:first-child { + border-top-left-radius: 5px; +} +table.whq-table thead tr td:last-child { + border-top-right-radius: 5px; +} +table.whq-table tbody tr td { + background-color: #ffffff; +} +table.whq-table tbody tr:nth-child(odd) td { + background-color: #ddd; +} /* box */ .box-title { @@ -503,7 +567,19 @@ TD.button { background-color: #BDDAE5 } TD.button2 { background-color: #ABB2D5; } /* misc table styles */ -.rowtitle { background-color: black; color: white; font-weight: bold; } +table tr.rowtitle td { + background-color: #95493A; + border: 1px solid #732010; + font-weight: bold; + color: #ffffff; + padding: 0.25em; +} +table tr.rowtitle td:first-child { + border-top-left-radius: 5px; +} +table tr.rowtitle td:last-child { + border-top-right-radius: 5px; +} /* misc backgrounds from color name */ .white { background-color: #FFFFFF; } @@ -620,10 +696,14 @@ div.session_note { border: 1px solid; margin-bottom: 5px;} /* classes for the main page */ div.rating_header { padding: 8px; } div.rating_title { padding-bottom: 4px; font-weight: bold; font-size: 160%; } -div.topx_style { padding:7px; margin:6px; border:2px solid; } -div.imgarea { text-align:center; text-align:center; - margin-top:0px; - margin-bottom:0px; - padding:0px;} +div.topx_style { + padding: 7px; + margin: 6px; + border: 2px solid #999999; + border-radius: 5px; +} +div.imgarea { + text-align:center; +} /* done */ \ No newline at end of file

1 0

Jeremy Newman : merge all the stylesheets, clean up the css for tables and frames
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 4fe237e96cb9df7ca88bdebdb8502a2bc053090b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4fe237e96cb9df7ca88bdebd… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Nov 16 10:52:13 2016 -0600 merge all the stylesheets, clean up the css for tables and frames try to repicate the old look for now on tables, as bootstrap really changes things up. add some frame_table classes for the changes in html.php --- apidb.css | 108 ----------------- application.css | 89 -------------- include/header.php | 4 +- styles.css | 340 +++++++++++++++++++++++++++++++++++++++++++---------- 4 files changed, 282 insertions(+), 259 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=4fe237e96cb9df7ca88b…

1 0

Jeremy Newman : small layout tweaks
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 23130b845698e29299242be6f599b45fed865fe6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=23130b845698e29299242be6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Nov 16 10:52:02 2016 -0600 small layout tweaks --- preferences.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/preferences.php b/preferences.php index 103ba72..0319225 100644 --- a/preferences.php +++ b/preferences.php @@ -180,9 +180,7 @@ if(isset($aClean['sSubmit']) && $aClean['sSubmit'] == "Update") } } -apidb_header("User Preferences"); - -echo "<div class='default_container'>\n"; +apidb_header(); echo "<form method=\"post\" action=\"preferences.php\">\n"; @@ -195,7 +193,7 @@ if( isset($aClean['iUserId']) && $oUser->iUserId == $aClean['iUserId']) echo "<input type=\"hidden\" name=\"iUserId\" value=\"".$aClean['iUserId']."\">\n"; } -echo html_frame_start("Preferences for ".$oUser->sRealname, "80%"); +echo html_frame_start("Preferences for ".$oUser->sRealname); // build a table $oTable = new Table(); @@ -226,10 +224,9 @@ if( !isset($aClean['iUserId']) || $oUser->iUserId != $aClean['iUserId']) echo $oTable->GetString(); echo html_frame_end(); -echo "<br> <div align=center> <input type=\"submit\" name='sSubmit' value=\"Update\"> </div> <br>\n"; +echo "<div><input type=\"submit\" name='sSubmit' value=\"Update\" class=\"btn btn-primary\"></div>\n"; echo "</form>\n"; -echo "</div>\n"; apidb_footer(); ?>

1 0

Jeremy Newman : html_frame functions should use divs, remove do_indent
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: a463a34a72d011f4fb83ab213089f6a627bceb89 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a463a34a72d011f4fb83ab21… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Nov 16 10:48:33 2016 -0600 html_frame functions should use divs, remove do_indent using tables for layout is a very very very very old design paradigm it is time to take it out back and send it into the great beyond do_indent is also pointless with modern dom inspectors, making the source pretty is not really needed in this instance --- include/html.php | 136 ++++++++++++------------------------------------------- 1 file changed, 30 insertions(+), 106 deletions(-) diff --git a/include/html.php b/include/html.php index b015f9f..fe46455 100644 --- a/include/html.php +++ b/include/html.php @@ -1,22 +1,8 @@ <?php - -$_indent_level = 0; - -function do_indent($str, $v = 0) -{ - global $_indent_level; - - if($v < 0) - $_indent_level += $v; - - if($_indent_level > 0) - $str = str_repeat(" ", $_indent_level) . $str; - - if($v > 0) - $_indent_level += $v; - - return $str . "\n"; -} +/** + * Basic HTML functions + * FIXME -- get rid of the frame and table functions + */ function do_html_tr($t, $arr, $class, $extra) { @@ -27,7 +13,7 @@ function do_html_tr($t, $arr, $class, $extra) if(strlen($extra)) $extra = " $extra"; - $str = do_indent("<tr$class$extra>", 1); + $str = "<tr$class$extra>"; for($i = 0; $i < sizeof($arr); $i++) { /* If it is not an array, it contains the entire table cell. If it @@ -51,14 +37,14 @@ function do_html_tr($t, $arr, $class, $extra) if(stristr($val, "<$t")) { - $str .= do_indent($val); + $str .= $val; } else { - $str .= do_indent("<$t$class$extra> ".trim($val)." </$t>", 0); + $str .= "<$t$class$extra> ".trim($val)." </$t>"; } } - $str .= do_indent("</tr>", -1); + $str .= "</tr>"; return $str; } @@ -72,50 +58,12 @@ function html_tr($arr, $class = "", $extra = "") // HTML TABLE function html_table_begin($extra = "") { - return do_indent("<table $extra>", 1); + return "<table $extra>"; } function html_table_end() { - return do_indent("</table>", -1); -} - - -// HTML HTML -function html_begin() -{ - return do_indent("<html>", 1); -} - -function html_end() -{ - return do_indent("</html>", -1); -} - - -// HTML HEAD -function html_head($title, $stylesheet = 0) -{ - $str = do_indent("<head>", 1); - $str .= do_indent("<title> $title </title>", 0); - if($stylesheet) - $str .= do_indent("<link rel=\"stylesheet\" ". - "href=\"$stylesheet\" type=\"text/css\">", 0); - $str .= do_indent("</head>", -1); - - return $str; -} - - -// HTML BODY -function html_body_begin() -{ - return do_indent("<body>", 1); -} - -function html_body_end() -{ - return do_indent("</body>", -1); + return "</table>"; } // HTML A HREF @@ -124,15 +72,15 @@ function html_ahref($label, $url, $extra = "") $label = stripslashes($label); if (!$label and $url) { - return do_indent(" <a href=\"$url\" $extra>$url</a> "); + return " <a href=\"$url\" $extra>$url</a> "; } else if (!$label) { - return do_indent("   "); + return "   "; } else { - return do_indent(" <a href=\"$url\" $extra>$label</a> "); + return " <a href=\"$url\" $extra>$label</a> "; } } @@ -153,51 +101,27 @@ function html_imagebutton($text, $url, $extra = "") function html_frame_start($title = "", $width = "", $extra = "", $innerPad = 0) { - - if ($width) { $width = 'width="'.$width.'"'; } - -$str = '<table '.$width.' border="0" class="mainTable" cellpadding="0" cellspacing="0" align="center">'."\n"; - -if ($title) -{ -$str .= ' -<tr><td colspan=3><table width="100%" border=0 cellpadding=0 cellspacing=0> -<tr><td> - <table width="100%" border="0" cellpadding="0" cellspacing="0" class="topMenu"> - <tr> - <td width="100%" rowspan="3" align="center"><span class="menuTitle">'.$title.'</span></td> - </tr> - </table> -</td></tr> -</table></td></tr> -'; -} - -$str .= ' -<tr> -<td><img src="'.BASE.'images/blank.gif" width="5" height="1" alt=""></td> -<td width="100%"><table width="100%" border=0 cellpadding=0 cellspacing=0> - <tr><td class=topMenu> - <table width="100%" border=0 cellpadding="'.$innerPad.'" cellspacing="1" '.$extra.'><tr><td class=white> -'; - + $style = ""; + if ($width or $innerPad) + { + $style .= 'style="'; + if ($width) + $style .= "width:{$width};"; + if ($innerPad) + $style .= "padding:{$innerPad}px;"; + $style .= '"'; + } + $str = "<div class=\"html_frame\" {$style} {$extra}>\n"; + if ($title) + { + $str .= "<div class=\"html_frame_title\">{$title}</div>\n"; + } return $str; } function html_frame_end($text = "") { - -$str = ' - </td></tr></table></td></tr> - </table> -</td> -<td><img src="'.BASE.'images/blank.gif" width="5" height="1" alt=""></td> -</tr> -</table> -<br> -'; - - return $str; + return "</div>\n"; } @@ -226,7 +150,7 @@ function html_back_link($howmany = 1, $url = "") { $url = 'javascript:history.back('.$howmany.');'; } - return '<p>   <a href="'.htmlentities($url).'"><< Back</a></p>'."\n"; + return '<p><a href="'.htmlentities($url).'" class="btn btn-default"><i class="fa fa-arrow-left"></i> Back</a></p>'."\n"; }

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2016