diff --git a/html/inc/prefs.inc b/html/inc/prefs.inc index 7a30e6d8b7..25eccab237 100644 --- a/html/inc/prefs.inc +++ b/html/inc/prefs.inc @@ -69,7 +69,7 @@ include_once("../project/project_specific_prefs.inc"); $app_types = get_app_types(); -$venues = array("home", "school", "work", "mobile"); +$venues = array("home", "school", "work"); $cpu_prefs = array( new PREF_BOOL( @@ -442,7 +442,6 @@ function check_venue($x) { if ($x == "home") return; if ($x == "work") return; if ($x == "school") return; - if ($x == "mobile") return; error_page(tra("bad venue: %1", $x)); } @@ -640,7 +639,6 @@ function row_top($x, $ncols=6, $class="heading") { ".tra("Home")." ".tra("School")." ".tra("Work")." - ".tra("Mobile")." "; echo "
\n"; } @@ -653,14 +651,12 @@ function row_defs($pre, $item, $post, $type, $prefs) { $hom = (isset($prefs->home) && isset($prefs->home->$item)) ? $prefs->home->$item : "--"; $schl = (isset($prefs->school) && isset($prefs->school->$item)) ? $prefs->school->$item : "--"; $wrk = (isset($prefs->work) && isset($prefs->work->$item)) ? $prefs->work->$item : "--"; - $mob = (isset($prefs->mobile) && isset($prefs->mobile->$item)) ? $prefs->mobile->$item : "--"; echo "$pre"; row_field($gen, $type); row_field($hom, $type); row_field($schl, $type); row_field($wrk, $type); - row_field($mob, $type); echo "$post\n"; } @@ -713,27 +709,23 @@ function row_links($subset, $prefs) { $hom = isset($prefs->home) ? $pre_edit."home".$post_edit : $pre_add."home".$post_add; $schl = isset($prefs->school) ? $pre_edit."school".$post_edit : $pre_add."school".$post_add; $wrk = isset($prefs->work) ? $pre_edit."work".$post_edit : $pre_add."work".$post_add; - $mob = isset($prefs->mobile) ? $pre_edit."mobile".$post_edit : $pre_add."mobile".$post_add; echo " "; echo "$gen"; echo "$hom"; echo "$schl"; echo "$wrk"; - echo "$mob"; echo "
\n"; $hom = isset($prefs->home) ? $pre_remove."home".$post_remove : "
"; $schl = isset($prefs->school) ? $pre_remove."school".$post_remove : "
"; $wrk = isset($prefs->work) ? $pre_remove."work".$post_remove : "
"; - $mob = isset($prefs->mobile) ? $pre_remove."mobile".$post_remove : "
"; echo " "; echo " "; echo "$hom"; echo "$schl"; echo "$wrk"; - echo "$mob"; echo "
\n"; } @@ -810,7 +802,6 @@ function prefs_show_project_specific($prefs, $columns=false) { $project_specific_prefs->home = isset($prefs->home) ? project_specific_prefs_parse($prefs->home->project_specific) : ""; $project_specific_prefs->work = isset($prefs->work) ? project_specific_prefs_parse($prefs->work->project_specific) : ""; $project_specific_prefs->school = isset($prefs->school) ? project_specific_prefs_parse($prefs->school->project_specific) : ""; - $project_specific_prefs->mobile = isset($prefs->mobile) ? project_specific_prefs_parse($prefs->mobile->project_specific) : ""; } else { $project_specific_prefs = project_specific_prefs_parse($prefs->project_specific); } @@ -867,7 +858,7 @@ function print_prefs_display_project($user, $columns=false) { end_table(); echo "\n"; } else { - if (isset($project_prefs->home) || isset($project_prefs->work) || isset($project_prefs->school) || isset($project_prefs->mobile)) { + if (isset($project_prefs->home) || isset($project_prefs->work) || isset($project_prefs->school)) { row1(tra("Primary (default) preferences").$switch_link, 2, "heading"); } echo ""; @@ -883,7 +874,6 @@ function print_prefs_display_project($user, $columns=false) { prefs_display_venue($project_prefs, "home", "project"); prefs_display_venue($project_prefs, "school", "project"); prefs_display_venue($project_prefs, "work", "project"); - prefs_display_venue($project_prefs, "mobile", "project"); } end_table(); } @@ -891,10 +881,13 @@ function print_prefs_display_project($user, $columns=false) { function print_prefs_display_global($user, $columns=false) { $global_prefs = prefs_parse_global($user->global_prefs); - echo "". - tra("These apply to all BOINC projects in which you participate.
- On computers participating in multiple projects, the most recently modified preferences will be used."). - "


"; + echo "" + .tra("These apply to all BOINC projects in which you participate.") + ."
" + .tra("On computers participating in multiple projects, the most recently modified preferences will be used.") + ."
" + .tra("These preferences do not apply to Android devices.") + ."


"; if (isset($global_prefs->mod_time)) { echo tra("Preferences last modified:")." ".pretty_time_str($global_prefs->mod_time); } @@ -910,7 +903,7 @@ function print_prefs_display_global($user, $columns=false) { echo "\n"; } else { - if (isset($global_prefs->home) || isset($global_prefs->work) || isset($global_prefs->school) || isset($global_prefs->mobile)) { + if (isset($global_prefs->home) || isset($global_prefs->work) || isset($global_prefs->school)) { row1(tra("Primary (default) preferences").$switch_link, 2, "heading"); } echo ""; @@ -926,7 +919,6 @@ function print_prefs_display_global($user, $columns=false) { prefs_display_venue($global_prefs, "home", "global"); prefs_display_venue($global_prefs, "school", "global"); prefs_display_venue($global_prefs, "work", "global"); - prefs_display_venue($global_prefs, "mobile", "global"); } end_table(); } @@ -1050,14 +1042,12 @@ function venue_form($user) { if ($user->venue == 'home') $h = 'selected'; if ($user->venue == 'work') $w = 'selected'; if ($user->venue == 'school') $s = 'selected'; - if ($user->venue == 'mobile') $m = 'selected'; row2(tra("Default computer location"), "" ); } @@ -1157,9 +1147,6 @@ function global_prefs_make_xml($prefs, $primary=true) { if (isset($prefs->school)) { $xml = $xml."\n".global_prefs_make_xml($prefs->school, false)."\n"; } - if (isset($prefs->mobile)) { - $xml = $xml."\n".global_prefs_make_xml($prefs->mobile, false)."\n"; - } if ($primary) { $xml = $xml."\n"; } @@ -1191,9 +1178,6 @@ function project_prefs_make_xml($prefs, $primary=true) { if (isset($prefs->school)) { $xml = $xml."\n".project_prefs_make_xml($prefs->school, false)."\n"; } - if (isset($prefs->mobile)) { - $xml = $xml."\n".project_prefs_make_xml($prefs->mobile, false)."\n"; - } if ($primary) { $xml = $xml."\n"; }