remove glyphicons

config/lang/de-de.json

@@ -27,8 +27,6 @@
     "overview-hint-dblclick":"Doppelklick um das Projekt [%s] zu öffnen",
     "overview-filter":"Filter",
     "overview-filter-hint":"nur dieses Projekt anzeigen",
-    "overview-simpleview":"zur einfachen Ansicht",
-    "overview-extview":"zur erweiterten Ansicht",
     "overview-textsearch":"Freitext-Filter (Regex)",
     "overview-textsearch-hint":"gesucht wird in Projektnamen, Beschreibungen, Commit-Messages",
     "overview-filterprj":"Projekt-Filter",

config/lang/en-en.json

@@ -26,8 +26,6 @@
     "overview-hint-dblclick":"Double click to open the project [%s]",
     "overview-filter":"Filter",
     "overview-filter-hint":"Show only this project",
-    "overview-simpleview":"Show simple view",
-    "overview-extview":"Show extended view",
     "overview-textsearch":"Text filter (regex)",
     "overview-textsearch-hint":"searches in project names, descripions, commit messages",
     "overview-filterprj":"Project filter",

public_html/deployment/classes/htmlguielements.class.php

@@ -29,85 +29,6 @@
 class htmlguielements{
     
     var $aCfg=array(
-        /*
-        'buttonsOLD'=>array(
-            // bootstrap defaults
-            'primary'=>array('class'=>'btn-primary', 'icon'=>''),
-            'success'=>array('class'=>'btn-success', 'icon'=>''),
-            'info'=>array('class'=>'btn-info', 'icon'=>''),
-            'warning'=>array('class'=>'btn-warning', 'icon'=>''),
-            'danger'=>array('class'=>'btn-danger', 'icon'=>''),
-
-            // custom buttons
-            'close'=>array('class'=>'btn-danger', 'icon'=>'fa-close'),
-            'error'=>array('class'=>'btn-danger', 'icon'=>'fa-bolt'),
-            'ok'=>array('class'=>'btn-primary', 'icon'=>'fa-check'),
-            
-            // deploy actions and buttons
-            'accept'=>array('class'=>''),
-            'build'=>array('class'=>''),
-            'cleanup'=>array('class'=>''),
-            'deploy'=>array('class'=>'', 'icon'=>'glyphicon-forward'),
-            'new'=>array('class'=>'', 'icon'=>'glyphicon-star-empty'),
-            'overview'=>array('class'=>''),
-            'phase'=>array('class'=>'', 'icon'=>'glyphicon-chevron-right'),
-            'rollback'=>array('class'=>'', 'icon'=>'glyphicon-forward'),
-            'setup'=>array('class'=>''),
-            
-        ),
-        'iconsOLD'=>array(
-
-            'menu'=>'fa-chevron-right',
-            'overview'=>'fa-list',
-            'project'=>'fa-book',
-            'project-home'=>'fa-home',
-            'projects'=>'fa-folder-o',
-            'actions'=>'fa-check',
-            
-            'actionlog'=>'fa-list-ul',
-            'accept'=>'glyphicon-forward',
-            'build'=>'glyphicon-equalizer',
-            'cleanup'=>'fa-trash',
-            'checklang'=>'fa-check',
-            'delete'=>'fa-close',
-            'deploy'=>'glyphicon-forward',
-            'filter'=>'glyphicon-filter',
-            'new'=>'glyphicon-star-empty',
-            'phase'=>'glyphicon-chevron-right',
-            'rollback'=>'glyphicon-forward',
-            'setup'=>'fa-cog',
-            'login'=>'fa-lock',
-            'user'=>'fa-user',
-            
-            'workflow'=>'fa-angle-double-right',
-            'repository'=>'fa-database',
-            'phase'=>'fa-flag',
-            'package'=>'fa-cubes',
-            'version'=>'fa-tag',
-            'list'=>'fa-list',
-            'raw-data'=>'fa-file-o',
-
-            'back'=>'fa-chevron-left',
-            
-            'branch'=>'glyphicon-bookmark',
-            'calendar'=>'glyphicon-calendar',
-            'comment'=>'glyphicon-comment',
-            'revision'=>'glyphicon-tag',
-
-            'link-extern'=>'glyphicon-globe',
-            
-            'host'=>'fa-hdd-o',
-            'hostgroup'=>'fa-sitemap',
-            'templatefile'=>'fa-file-code-o',
-            'targetfile'=>'fa-file-o',
-            'replace'=>'fa-random',
-            
-            'sign-info'=>'',
-            'sign-warning'=>'',
-            'sign-error'=>'fa-bolt',
-            'sign-ok'=>'',
-        ),
-         */
         'buttons'=>array(
             // bootstrap defaults
             'primary'=>array('class'=>'btn-primary', 'icon'=>''),
@@ -272,10 +193,7 @@ class htmlguielements{
         if(!$sLabel){
             return '';
         }
-        $sPrefix=(
-                strpos($sLabel, 'glyphicon-')===0 ? 'glyphicon' 
-                : ( strpos($sLabel, 'fa-')===0 ? 'fa' : '')
-                );
+        $sPrefix=( strpos($sLabel, 'fa-')===0 ? 'fa' : '');
         // if(!$sPrefix){
         if(isset($this->aCfg['icons'][$sLabel])){
             return $this->getIconByType($sLabel);
@@ -295,10 +213,7 @@ class htmlguielements{
         if(isset($this->aCfg['icons'][$sLabel])){
             return $this->aCfg['icons'][$sLabel];
         }
-        $sPrefix=(
-                strpos($sLabel, 'glyphicon-')===0 ? 'glyphicon' 
-                : ( strpos($sLabel, 'fa-')===0 ? 'fa' : '')
-                );
+        $sPrefix=( strpos($sLabel, 'fa-')===0 ? 'fa' : '');
         return ($sPrefix ? $sPrefix . ' ' : '').$sLabel;
     }
     

public_html/deployment/classes/project_gui.class.php

@@ -377,7 +377,6 @@ class projectgui extends project {
                 $sRole = 'developer';
                 if ($sNext == "live") {
                     $sRole = 'pl';
-                    // $aLinkdata[$sFunction]['icon']='glyphicon glyphicon-star';
                 }
                 $sOnMouseover = '$(\'.td-phase-' . $sNext . '.td' . $this->_aConfig["id"] . '\').addClass(\'highlight\');';
                 $sOnMouseout = '$(\'.td-phase-' . $sNext . '.td' . $this->_aConfig["id"] . '\').removeClass(\'highlight\');';
@@ -540,7 +539,6 @@ class projectgui extends project {
                         . $this->_oHtml->getIconByType('comment') . t('commitmessage') . ':<br>'
                     )
                     . '<pre>' . $this->transformCommitMessage($aData["message"]) . '</pre>'
-                // . '<i class="glyphicon glyphicon-globe"></i> ' . t('url') . ': <a href="' . $sJsonUrl . '">' . $sJsonUrl . '</a><br>'
                     ;
                 if ($sPlace == "deployed" && array_key_exists("url", $this->_aPrjConfig["phases"][$sPhase])) {
                     $sUrl = $this->_aPrjConfig["phases"][$sPhase]["url"];

public_html/deployment/classes/projectlist.class.php

@@ -210,13 +210,6 @@ class projectlist extends base
                 <div class="filterbar">        
                     <form class="form-inline">                        
 
-                        <!--
-                        <a href="#" class="view viewextended" onclick="setview(\'simple\');"><i class="glyphicon glyphicon-th-large"></i> ' . t("overview-simpleview") . '</a>
-                        <a href="#" class="view viewsimple" onclick="setview(\'extended\');" ><i class="glyphicon glyphicon-th-list"></i> ' . t("overview-extview") . '</a>
-                        |
-                        -->
-                        
-
                         <label for="efilter">
                             ' . $oHtml->getIcon('filter') . '
                             ' . t("overview-textsearch") . ':

public_html/deployment/pages/act_htmltest.php

@@ -67,7 +67,6 @@ $sRows=''
    .  addHtmltestTest("Box zeichnen - OK", "\$oHtml->getBox('success', 'Message')")
         
    .  addHtmltestTest("Icon - Fontawesome", "\$oHtml->getIcon('fa-close');")
-   .  addHtmltestTest("Icon - Glyphicon", "\$oHtml->getIcon('glyphicon-user');")
         
    .  '<tr>'
         . '<td>pre-defined icons</td>'